Menu
▾
▴
dsim-svn
|
From: <den...@us...> - 2010-07-20 23:08:59
|
Revision: 103
http://dsim.svn.sourceforge.net/dsim/?rev=103&view=rev
Author: denis_arnaud
Date: 2010-07-20 23:08:53 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Prefixed the source file variables with stdair.
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/basic/Makefile.am
trunk/dsim/dsim/basic/sources.mk
trunk/dsim/dsim/batches/Makefile.am
trunk/dsim/dsim/batches/sources.mk
trunk/dsim/dsim/bom/Makefile.am
trunk/dsim/dsim/bom/sources.mk
trunk/dsim/dsim/command/Makefile.am
trunk/dsim/dsim/command/sources.mk
trunk/dsim/dsim/config/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/dsim/core/sources.mk
trunk/dsim/dsim/factory/Makefile.am
trunk/dsim/dsim/factory/sources.mk
trunk/dsim/dsim/service/Makefile.am
trunk/dsim/dsim/service/sources.mk
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/doc/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
-#include $(top_srcdir)/stdair/basic/sources.mk
-#include $(top_srcdir)/stdair/bom/sources.mk
-#include $(top_srcdir)/stdair/factory/sources.mk
-#include $(top_srcdir)/stdair/command/sources.mk
-#include $(top_srcdir)/stdair/service/sources.mk
-#include $(top_srcdir)/stdair/core/sources.mk
-#include $(top_srcdir)/stdair/batches/sources.mk
+include $(top_srcdir)/stdair/basic/sources.mk
+include $(top_srcdir)/stdair/bom/sources.mk
+include $(top_srcdir)/stdair/factory/sources.mk
+include $(top_srcdir)/stdair/dbadaptor/sources.mk
+include $(top_srcdir)/stdair/command/sources.mk
+include $(top_srcdir)/stdair/service/sources.mk
+include $(top_srcdir)/stdair/core/sources.mk
+include $(top_srcdir)/stdair/batches/sources.mk
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
#include $(top_srcdir)/trademgen/factory/sources.mk
@@ -94,11 +95,18 @@
html/index.html: doxygen_html.cfg \
$(doc_local_sources) $(html_local_sources) \
$(doc_tutorial_sources) $(cpp_tutorial_sources) \
- $(bas_h_sources) $(bas_cc_sources) \
- $(bom_h_sources) $(bom_cc_sources) \
- $(fac_h_sources) $(fac_cc_sources) \
- $(cmd_h_sources) $(cmd_cc_sources) \
- $(svc_h_sources) $(svc_cc_sources)
+ $(stdair_service_h_sources) $(stdair_service_cc_sources) \
+ $(stdair_bas_h_sources) $(stdair_bas_cc_sources) \
+ $(stdair_bom_h_sources) $(stdair_bom_cc_sources) \
+ $(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
+ $(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
+ $(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(dsim_service_h_sources) $(dsim_service_cc_sources) \
+ $(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
+ $(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
+ $(dsim_fac_h_sources) $(dsim_fac_cc_sources) \
+ $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources) \
+ $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
doxygen $<; \
if test -d html; then \
cp $(srcdir)/images/dsim_logo.png html; \
Modified: trunk/dsim/dsim/basic/Makefile.am
===================================================================
--- trunk/dsim/dsim/basic/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## basic sub-directory
+## dsim/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libdsimbas.la
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS =
+libdsimbas_la_SOURCES = $(dsim_bas_h_sources) $(dsim_bas_cc_sources)
+libdsim_bas_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/basic
#pkginclude_HEADERS = $(bas_h_sources)
Modified: trunk/dsim/dsim/basic/sources.mk
===================================================================
--- trunk/dsim/dsim/basic/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,3 +1,5 @@
-bas_h_sources = $(top_srcdir)/dsim/basic/BasConst_General.hpp \
- $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
-bas_cc_sources = $(top_srcdir)/dsim/basic/BasConst.cpp
+dsim_bas_h_sources = \
+ $(top_srcdir)/dsim/basic/BasConst_General.hpp \
+ $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
+dsim_bas_cc_sources = \
+ $(top_srcdir)/dsim/basic/BasConst.cpp
Modified: trunk/dsim/dsim/batches/Makefile.am
===================================================================
--- trunk/dsim/dsim/batches/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# batches
+# dsim/batches
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -10,7 +10,7 @@
# Binaries (batches)
bin_PROGRAMS = simulate
-simulate_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+simulate_SOURCES = $(dsim_batches_h_sources) $(dsim_batches_cc_sources)
simulate_CXXFLAGS = $(BOOST_CFLAGS)
simulate_LDADD =
simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) \
Modified: trunk/dsim/dsim/batches/sources.mk
===================================================================
--- trunk/dsim/dsim/batches/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,2 +1,2 @@
-batches_h_sources =
-batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
+dsim_batches_h_sources =
+dsim_batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,12 +1,14 @@
-## bom sub-directory
+## dsim/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES= libdsimbom.la
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS =
-libbom_la_LDFLAGS =
+libdsimbom_la_SOURCES= $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
+libdsimbom_la_CXXFLAGS =
+libdsimbom_la_LDFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/bom
#pkginclude_HEADERS = $(bom_h_sources)
Modified: trunk/dsim/dsim/bom/sources.mk
===================================================================
--- trunk/dsim/dsim/bom/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,7 +1,9 @@
-bom_h_sources = $(top_srcdir)/dsim/bom/BomAbstract.hpp \
- $(top_srcdir)/dsim/bom/StructAbstract.hpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
- $(top_srcdir)/dsim/bom/RDSParameters.hpp
-bom_cc_sources = $(top_srcdir)/dsim/bom/BomAbstract.cpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
- $(top_srcdir)/dsim/bom/RDSParameters.cpp
+dsim_bom_h_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.hpp \
+ $(top_srcdir)/dsim/bom/StructAbstract.hpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.hpp
+dsim_bom_cc_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.cpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.cpp
Modified: trunk/dsim/dsim/command/Makefile.am
===================================================================
--- trunk/dsim/dsim/command/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libdsimcmd.la
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
-libcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
-libcmd_la_LIBADD =
-libcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
+libdsimcmd_la_SOURCES = $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources)
+libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libdsimcmd_la_LIBADD =
+libdsimcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la
Modified: trunk/dsim/dsim/command/sources.mk
===================================================================
--- trunk/dsim/dsim/command/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,8 +1,8 @@
-cmd_h_sources = \
+dsim_cmd_h_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.hpp \
$(top_srcdir)/dsim/command/DBManager.hpp \
$(top_srcdir)/dsim/command/Simulator.hpp
-cmd_cc_sources = \
+dsim_cmd_cc_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.cpp \
$(top_srcdir)/dsim/command/DBManager.cpp \
$(top_srcdir)/dsim/command/Simulator.cpp
\ No newline at end of file
Modified: trunk/dsim/dsim/config/Makefile.am
===================================================================
--- trunk/dsim/dsim/config/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/config/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# config
+# dsim/config
include $(top_srcdir)/Makefile.common
## Source directory
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# core
+# dsim/core
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -12,15 +12,16 @@
# Library
lib_LTLIBRARIES = libdsim.la
-libdsim_la_SOURCES = $(service_h_sources) $(service_cc_sources)
+libdsim_la_SOURCES = $(dsim_service_h_sources) $(dsim_service_cc_sources)
libdsim_la_LIBADD = \
- $(top_builddir)/dsim/basic/libbas.la \
- $(top_builddir)/dsim/bom/libbom.la \
- $(top_builddir)/dsim/factory/libfac.la \
- $(top_builddir)/dsim/command/libcmd.la \
- $(top_builddir)/dsim/service/libsvc.la
+ $(top_builddir)/dsim/basic/libdsimbas.la \
+ $(top_builddir)/dsim/bom/libdsimbom.la \
+ $(top_builddir)/dsim/factory/libdsimfac.la \
+ $(top_builddir)/dsim/command/libdsimcmd.la \
+ $(top_builddir)/dsim/service/libdsimsvc.la
libdsim_la_LDFLAGS = \
- $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) \
+ $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_FILESYSTEM_LIB) \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
Modified: trunk/dsim/dsim/core/sources.mk
===================================================================
--- trunk/dsim/dsim/core/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-service_h_sources = \
- $(top_srcdir)/dsim/DSIM_Types.hpp \
- $(top_srcdir)/dsim/DSIM_Service.hpp
-service_cc_sources =
+dsim_service_h_sources = \
+ $(top_srcdir)/dsim/DSIM_Types.hpp \
+ $(top_srcdir)/dsim/DSIM_Service.hpp
+dsim_service_cc_sources =
Modified: trunk/dsim/dsim/factory/Makefile.am
===================================================================
--- trunk/dsim/dsim/factory/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## factory sub-directory
+## dsim/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES= libdsimfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libdsimfac_la_SOURCES= $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
+libdsimfac_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/factory
#pkginclude_HEADERS = $(fac_h_sources)
Modified: trunk/dsim/dsim/factory/sources.mk
===================================================================
--- trunk/dsim/dsim/factory/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,9 +1,9 @@
-fac_h_sources = \
+dsim_fac_h_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.hpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.hpp \
$(top_srcdir)/dsim/factory/FacSupervisor.hpp \
$(top_srcdir)/dsim/factory/FacDsimServiceContext.hpp
-fac_cc_sources = \
+dsim_fac_cc_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.cpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.cpp \
$(top_srcdir)/dsim/factory/FacSupervisor.cpp \
Modified: trunk/dsim/dsim/service/Makefile.am
===================================================================
--- trunk/dsim/dsim/service/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libdsimsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libdsimsvc_la_SOURCES = $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
+libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+
#pkgincludedir = $(includedir)/@PACKAGE@/service
#pkginclude_HEADERS = $(svc_h_sources)
Modified: trunk/dsim/dsim/service/sources.mk
===================================================================
--- trunk/dsim/dsim/service/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,5 +1,7 @@
-svc_h_sources = $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
-svc_cc_sources = $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
- $(top_srcdir)/dsim/service/DSIM_Service.cpp
+dsim_svc_h_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
+dsim_svc_cc_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
+ $(top_srcdir)/dsim/service/DSIM_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 16:15:36
|
Revision: 108
http://dsim.svn.sourceforge.net/dsim/?rev=108&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:15:30 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
Property Changed:
----------------
trunk/dsim/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
+ autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
latex
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/Makefile.am 2010-07-24 16:15:30 UTC (rev 108)
@@ -45,18 +45,24 @@
dist-html:
$(MAKE) -C doc dist-html
+dist-tex:
+ $(MAKE) -C doc dist-tex
-snapshot: snapshot-src snapshot-html
+snapshot: snapshot-src snapshot-html snapshot-tex
+
snapshot-src:
$(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-`date +"%Y%m%d"`
-upload: upload-src upload-html
+snapshot-tex:
+ $(MAKE) -C doc dist-tex tex_tarname=@PACKAGE_TARNAME@-tex-`date +"%Y%m%d"`
+upload: upload-src upload-html upload-tex
+
upload-src: dist
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-@VERSION@.tar.bz2
@@ -65,3 +71,7 @@
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-doc-@VERSION@.tar.bz2
+upload-tex: dist-tex
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-tex-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-tex-@VERSION@.tar.bz2
+
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 16:15:30 UTC (rev 108)
@@ -1,6 +1,8 @@
+# dsim doc sub-directory
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
+#
include $(top_srcdir)/stdair/basic/sources.mk
include $(top_srcdir)/stdair/bom/sources.mk
include $(top_srcdir)/stdair/factory/sources.mk
@@ -84,6 +86,7 @@
docdir = @docdir@
html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
+tex_tarname = @PACKAGE_TARNAME@-tex-@PACKAGE_VERSION@
noinst_DATA = sourceforge/howto_release_dsim.html.in
EXTRA_DIST = $(noinst_DATA)
@@ -139,7 +142,15 @@
bzip2 -9 -c > $(top_builddir)/$(html_tarname).tar.bz2
rm -rf $(top_builddir)/$(html_tarname)
-install-data-local: html-local
+dist-tex: html-local
+ cp -a $(top_builddir)/doc/latex $(top_builddir)/$(tex_tarname)
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ gzip --best -c > $(top_builddir)/$(tex_tarname).tar.gz
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ bzip2 -9 -c > $(top_builddir)/$(tex_tarname).tar.bz2
+ rm -rf $(top_builddir)/$(tex_tarname)
+
+install-data-local: html-local tex-local
$(mkinstalldirs) $(DESTDIR)$(docdir)
if test -d html; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/html; \
@@ -152,4 +163,4 @@
rm -rf $(DESTDIR)$(docdir)
clean-local:
- rm -rf html *.log *.tag
+ rm -rf html latex *.log *.tag
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 16:15:30 UTC (rev 108)
@@ -955,7 +955,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = NO
+GENERATE_LATEX = YES
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -978,7 +978,7 @@
# LaTeX documents. This may be useful for small projects and may help to
# save some trees in general.
-COMPACT_LATEX = NO
+COMPACT_LATEX = YES
# The PAPER_TYPE tag can be used to set the paper type that is used
# by the printer. Possible values are: a4, a4wide, letter, legal and
@@ -1003,13 +1003,13 @@
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
-PDF_HYPERLINKS = NO
+PDF_HYPERLINKS = YES
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
-USE_PDFLATEX = NO
+USE_PDFLATEX = YES
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
# command to the generated LaTeX files. This will instruct LaTeX to keep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 18:27:31
|
Revision: 113
http://dsim.svn.sourceforge.net/dsim/?rev=113&view=rev
Author: denis_arnaud
Date: 2010-07-24 18:27:24 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
Property Changed:
----------------
trunk/dsim/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
latex
+ autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-*.tar.*
dsim.m4
build
latex
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/Makefile.am 2010-07-24 18:27:24 UTC (rev 113)
@@ -1,4 +1,4 @@
-## top directory
+## dsim top directory
include $(top_srcdir)/Makefile.common
ACLOCAL_AMFLAGS = -I config
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 18:27:24 UTC (rev 113)
@@ -2,7 +2,7 @@
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
-#
+# StdAir
include $(top_srcdir)/stdair/basic/sources.mk
include $(top_srcdir)/stdair/bom/sources.mk
include $(top_srcdir)/stdair/factory/sources.mk
@@ -11,6 +11,7 @@
include $(top_srcdir)/stdair/service/sources.mk
include $(top_srcdir)/stdair/core/sources.mk
include $(top_srcdir)/stdair/batches/sources.mk
+# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
#include $(top_srcdir)/trademgen/factory/sources.mk
@@ -18,6 +19,7 @@
#include $(top_srcdir)/trademgen/service/sources.mk
#include $(top_srcdir)/trademgen/core/sources.mk
#include $(top_srcdir)/trademgen/batches/sources.mk
+# AirSched
include $(top_srcdir)/airsched/basic/sources.mk
include $(top_srcdir)/airsched/bom/sources.mk
include $(top_srcdir)/airsched/factory/sources.mk
@@ -25,12 +27,14 @@
include $(top_srcdir)/airsched/service/sources.mk
include $(top_srcdir)/airsched/core/sources.mk
include $(top_srcdir)/airsched/batches/sources.mk
+# AirRAC
#include $(top_srcdir)/airrac/basic/sources.mk
#include $(top_srcdir)/airrac/bom/sources.mk
#include $(top_srcdir)/airrac/factory/sources.mk
#include $(top_srcdir)/airrac/command/sources.mk
#include $(top_srcdir)/airrac/service/sources.mk
#include $(top_srcdir)/airrac/core/sources.mk
+# RMOL
include $(top_srcdir)/rmol/basic/sources.mk
include $(top_srcdir)/rmol/field/sources.mk
include $(top_srcdir)/rmol/bom/sources.mk
@@ -39,12 +43,16 @@
include $(top_srcdir)/rmol/service/sources.mk
include $(top_srcdir)/rmol/core/sources.mk
include $(top_srcdir)/rmol/batches/sources.mk
-#include $(top_srcdir)/airinv/basic/sources.mk
-#include $(top_srcdir)/airinv/bom/sources.mk
-#include $(top_srcdir)/airinv/factory/sources.mk
-#include $(top_srcdir)/airinv/command/sources.mk
-#include $(top_srcdir)/airinv/service/sources.mk
-#include $(top_srcdir)/airinv/core/sources.mk
+# AirInv
+include $(top_srcdir)/airinv/basic/sources.mk
+include $(top_srcdir)/airinv/bom/sources.mk
+include $(top_srcdir)/airinv/factory/sources.mk
+include $(top_srcdir)/airinv/command/sources.mk
+include $(top_srcdir)/airinv/service/sources.mk
+include $(top_srcdir)/airinv/core/sources.mk
+include $(top_srcdir)/airinv/batches/sources.mk
+include $(top_srcdir)/airinv/server/sources.mk
+# AvlCal
#include $(top_srcdir)/avlcal/basic/sources.mk
#include $(top_srcdir)/avlcal/bom/sources.mk
#include $(top_srcdir)/avlcal/factory/sources.mk
@@ -52,6 +60,7 @@
#include $(top_srcdir)/avlcal/service/sources.mk
#include $(top_srcdir)/avlcal/core/sources.mk
#include $(top_srcdir)/avlcal/batches/sources.mk
+# SimFQT
#include $(top_srcdir)/simfqt/basic/sources.mk
#include $(top_srcdir)/simfqt/bom/sources.mk
#include $(top_srcdir)/simfqt/factory/sources.mk
@@ -59,6 +68,7 @@
#include $(top_srcdir)/simfqt/service/sources.mk
#include $(top_srcdir)/simfqt/core/sources.mk
#include $(top_srcdir)/simfqt/batches/sources.mk
+# SimCRS
#include $(top_srcdir)/simcrs/basic/sources.mk
#include $(top_srcdir)/simcrs/bom/sources.mk
#include $(top_srcdir)/simcrs/factory/sources.mk
@@ -66,13 +76,15 @@
#include $(top_srcdir)/simcrs/service/sources.mk
#include $(top_srcdir)/simcrs/core/sources.mk
#include $(top_srcdir)/simcrs/batches/sources.mk
-#include $(top_srcdir)/travelccm/basic/sources.mk
-#include $(top_srcdir)/travelccm/bom/sources.mk
-#include $(top_srcdir)/travelccm/factory/sources.mk
-#include $(top_srcdir)/travelccm/command/sources.mk
-#include $(top_srcdir)/travelccm/service/sources.mk
-#include $(top_srcdir)/travelccm/core/sources.mk
-#include $(top_srcdir)/travelccm/batches/sources.mk
+# TravelCCM
+include $(top_srcdir)/travelccm/basic/sources.mk
+include $(top_srcdir)/travelccm/bom/sources.mk
+include $(top_srcdir)/travelccm/factory/sources.mk
+include $(top_srcdir)/travelccm/command/sources.mk
+include $(top_srcdir)/travelccm/service/sources.mk
+include $(top_srcdir)/travelccm/core/sources.mk
+include $(top_srcdir)/travelccm/batches/sources.mk
+# DSim
include $(top_srcdir)/dsim/basic/sources.mk
include $(top_srcdir)/dsim/bom/sources.mk
include $(top_srcdir)/dsim/factory/sources.mk
@@ -121,6 +133,23 @@
$(rmol_fac_h_sources) $(rmol_fac_cc_sources) \
$(rmol_cmd_h_sources) $(rmol_cmd_cc_sources) \
$(rmol_svc_h_sources) $(rmol_svc_cc_sources) \
+ $(airinv_batches_h_sources) $(airinv_batches_cc_sources) \
+ $(airinv_service_h_sources) $(airinv_service_cc_sources) \
+ $(airinv_bas_h_sources) $(airinv_bas_cc_sources) \
+ $(airinv_bom_h_sources) $(airinv_bom_cc_sources) \
+ $(airinv_fac_h_sources) $(airinv_fac_cc_sources) \
+ $(airinv_dba_h_sources) $(airinv_dba_cc_sources) \
+ $(airinv_cmd_h_sources) $(airinv_cmd_cc_sources) \
+ $(airinv_svc_h_sources) $(airinv_svc_cc_sources) \
+ $(airinv_svr_h_sources) $(airinv_svr_cc_sources) \
+ $(airinv_clt_h_sources) $(airinv_clt_cc_sources) \
+ $(travelccm_service_h_sources) $(travelccm_service_cc_sources) \
+ $(travelccm_batches_h_sources) $(travelccm_batches_cc_sources) \
+ $(travelccm_bas_h_sources) $(travelccm_bas_cc_sources) \
+ $(travelccm_bom_h_sources) $(travelccm_bom_cc_sources) \
+ $(travelccm_fac_h_sources) $(travelccm_fac_cc_sources) \
+ $(travelccm_cmd_h_sources) $(travelccm_cmd_cc_sources) \
+ $(travelccm_svc_h_sources) $(travelccm_svc_cc_sources) \
$(dsim_service_h_sources) $(dsim_service_cc_sources) \
$(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
$(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 18:27:24 UTC (rev 113)
@@ -575,7 +575,9 @@
# with spaces.
INPUT = @top_srcdir@/stdair \
+ @top_srcdir@/airsched \
@top_srcdir@/rmol \
+ @top_srcdir@/airinv \
@top_srcdir@/dsim \
@top_srcdir@/doc/local \
@top_builddir@/doc/local \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2010-09-06 15:56:25
|
Revision: 122
http://dsim.svn.sourceforge.net/dsim/?rev=122&view=rev
Author: clacombe
Date: 2010-09-06 15:56:17 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
[Config] keep stdair directory for the lib creation only
Modified Paths:
--------------
trunk/dsim/configure.ac
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/test/boost/mpi/log_server/Makefile.am
trunk/dsim/test/dsim/Makefile.am
trunk/dsim/test/master_slave/Makefile.am
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/configure.ac 2010-09-06 15:56:17 UTC (rev 122)
@@ -388,7 +388,6 @@
stdair/command/Makefile
stdair/config/Makefile
stdair/service/Makefile
- stdair/core/Makefile
stdair/batches/Makefile
trademgen/Makefile
trademgen/basic/Makefile
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/doc/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -9,7 +9,7 @@
include $(top_srcdir)/stdair/dbadaptor/sources.mk
include $(top_srcdir)/stdair/command/sources.mk
include $(top_srcdir)/stdair/service/sources.mk
-include $(top_srcdir)/stdair/core/sources.mk
+include $(top_srcdir)/stdair/sources.mk
include $(top_srcdir)/stdair/batches/sources.mk
# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
Modified: trunk/dsim/dsim/Makefile.am
===================================================================
--- trunk/dsim/dsim/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/dsim/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -6,7 +6,7 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = basic bom factory command service core config batches
+SUBDIRS = basic bom factory command service config batches
EXTRA_DIST = config_msvc.h
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/dsim/core/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -22,7 +22,7 @@
libdsim_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_FILESYSTEM_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la \
Modified: trunk/dsim/test/boost/mpi/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -15,7 +15,7 @@
log_server_SOURCES = log_server.cpp
log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
log_server_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la
#
Modified: trunk/dsim/test/dsim/Makefile.am
===================================================================
--- trunk/dsim/test/dsim/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/dsim/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -19,5 +19,5 @@
SimulationTestSuite_LDFLAGS = \
$(BOOST_LIBS) $(CPPUNIT_LIBS) \
$(top_builddir)/extracppunit/libextracppunit.la \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/dsim/core/libdsim.la
Modified: trunk/dsim/test/master_slave/Makefile.am
===================================================================
--- trunk/dsim/test/master_slave/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/master_slave/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
@@ -13,7 +13,7 @@
master_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
master_LDADD =
master_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la
@@ -21,7 +21,7 @@
slave_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
slave_LDADD =
slave_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la
@@ -29,5 +29,5 @@
log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
log_server_LDADD =
log_server_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/stdair/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2010-09-06 16:05:57
|
Revision: 123
http://dsim.svn.sourceforge.net/dsim/?rev=123&view=rev
Author: clacombe
Date: 2010-09-06 16:05:51 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
[Config] keep stdair directory for the lib creation only
Modified Paths:
--------------
trunk/dsim/configure.ac
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/Makefile.am
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-09-06 15:56:17 UTC (rev 122)
+++ trunk/dsim/configure.ac 2010-09-06 16:05:51 UTC (rev 123)
@@ -388,7 +388,6 @@
stdair/command/Makefile
stdair/config/Makefile
stdair/service/Makefile
- stdair/batches/Makefile
trademgen/Makefile
trademgen/basic/Makefile
trademgen/bom/Makefile
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
+++ trunk/dsim/doc/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
@@ -10,7 +10,6 @@
include $(top_srcdir)/stdair/command/sources.mk
include $(top_srcdir)/stdair/service/sources.mk
include $(top_srcdir)/stdair/sources.mk
-include $(top_srcdir)/stdair/batches/sources.mk
# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
Modified: trunk/dsim/dsim/Makefile.am
===================================================================
--- trunk/dsim/dsim/Makefile.am 2010-09-06 15:56:17 UTC (rev 122)
+++ trunk/dsim/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
@@ -6,7 +6,7 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = basic bom factory command service config batches
+SUBDIRS = basic bom factory command service config
EXTRA_DIST = config_msvc.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-07 11:30:47
|
Revision: 124
http://dsim.svn.sourceforge.net/dsim/?rev=124&view=rev
Author: denis_arnaud
Date: 2010-09-07 11:30:40 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
[Build] The StdAir and ExtraCC projects are no longer Subversion external references.
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/configure.ac
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/DSIM_Service.hpp
trunk/dsim/dsim/Makefile.am
trunk/dsim/dsim/basic/Makefile.am
trunk/dsim/dsim/batches/Makefile.am
trunk/dsim/dsim/bom/Makefile.am
trunk/dsim/dsim/command/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/dsim/factory/Makefile.am
trunk/dsim/dsim/service/Makefile.am
trunk/dsim/test/Makefile.am
trunk/dsim/test/dsim/Makefile.am
Property Changed:
----------------
trunk/dsim/
trunk/dsim/test/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:externals
- config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
db https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/db
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
db https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/db
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -21,12 +21,17 @@
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
config-h.in sic/stamp-h.in autogen.sh bootstrap
-#EXTRA_DIST = @PACKAGE@.spec @PACKAGE@.m4 @PACKAGE@.pc Makefile.common
+# Note 1: the RPM specification file (@PACKAGE@.spec) must not be distributed
+# with the rest of the source code. The tar-ball will be used by the packaging
+# process, from an external RPM specification file: duplicating it in the
+# tar-ball may only confuse things.
+# Note 2: Both @PACKAGE@.m4 and @PACKAGE@.pc must not be distributed, as they
+# will be generated by the configure script.
EXTRA_DIST =
# Build in these directories:
-SUBDIRS = stdair trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
- travelccm dsim $(HTML_DOC_DIR) extracppunit $(TEST_DIR)
+SUBDIRS = trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
+ travelccm dsim $(HTML_DOC_DIR) $(TEST_DIR)
# Configuration helpers
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/configure.ac 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,18 +3,14 @@
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
AC_INIT([DSIM],[99.99.99],[den...@us...],[dsim])
-AC_CONFIG_HEADER([stdair/config.h])
-AC_CONFIG_SRCDIR([stdair/basic/BasConst.cpp])
+AC_CONFIG_HEADER([dsim/DSIM_Service.hpp])
+AC_CONFIG_SRCDIR([dsim])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
AM_INIT_AUTOMAKE
AM_PATH_CPPUNIT(1.10)
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
-# RPM release number
-RPM_RELEASE="1"
-AC_SUBST(RPM_RELEASE)
-
# Shared library versioning for the main library
GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
@@ -123,10 +119,10 @@
# thus directly accessible within the extracppunit directory.
# When that library will be widely avaible on Linux distributions,
# the external reference can be removed and the following line uncommented.
-#AM_PATH_EXTRACC
-#AC_SUBST(EXTRACC_VERSION)
-#AC_SUBST(EXTRACC_CFLAGS)
-#AC_SUBST(EXTRACC_LIBS)
+AM_PATH_EXTRACC
+AC_SUBST(EXTRACC_VERSION)
+AC_SUBST(EXTRACC_CFLAGS)
+AC_SUBST(EXTRACC_LIBS)
# -----------------------------------------------------------------------------
# Support for the GSL (GNU Scientific Library): http://www.gnu.org/software/gsl
@@ -198,6 +194,14 @@
AC_SUBST(SOCI_CFLAGS)
AC_SUBST(SOCI_LIBS)
+# -----------------------------------------------------------------------------
+# Support for StdAir (): http://sf.net/projects/stdair
+# -----------------------------------------------------------------------------
+AM_PATH_STDAIR
+AC_SUBST(STDAIR_VERSION)
+AC_SUBST(STDAIR_CFLAGS)
+AC_SUBST(STDAIR_LIBS)
+
# --------------------------------------------------------------------
# Support for TRAVEL-CCM (CCM Open Library): http://sf.net/projects/travel-ccm
# --------------------------------------------------------------------
@@ -379,15 +383,6 @@
dsim-config
dsim.m4
dsim.pc
- dsim.spec
- stdair/Makefile
- stdair/basic/Makefile
- stdair/bom/Makefile
- stdair/dbadaptor/Makefile
- stdair/factory/Makefile
- stdair/command/Makefile
- stdair/config/Makefile
- stdair/service/Makefile
trademgen/Makefile
trademgen/basic/Makefile
trademgen/bom/Makefile
@@ -482,7 +477,6 @@
dsim/config/Makefile
dsim/core/Makefile
dsim/batches/Makefile
- extracppunit/Makefile
doc/Makefile
doc/images/Makefile
doc/tutorial/Makefile
@@ -511,7 +505,6 @@
test/boost/serialization/Makefile
test/boost/signals/Makefile
test/boost/smart_pointers/Makefile
- test/stdair/Makefile
test/trademgen/Makefile
test/airsched/Makefile
test/airrac/Makefile
@@ -633,6 +626,11 @@
o XERCES_CFLAGS ... : ${XERCES_CFLAGS}
o XERCES_LIBS ..... : ${XERCES_LIBS}
+ - StdAir ........... :
+ o STDAIR_VERSION .. : ${STDAIR_VERSION}
+ o STDAIR_CFLAGS ... : ${STDAIR_CFLAGS}
+ o STDAIR_LIBS ..... : ${STDAIR_LIBS}
+
- ExtraCC ........... :
o EXTRACC_VERSION . : ${EXTRACC_VERSION}
o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS}
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/doc/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,13 +3,13 @@
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
# StdAir
-include $(top_srcdir)/stdair/basic/sources.mk
-include $(top_srcdir)/stdair/bom/sources.mk
-include $(top_srcdir)/stdair/factory/sources.mk
-include $(top_srcdir)/stdair/dbadaptor/sources.mk
-include $(top_srcdir)/stdair/command/sources.mk
-include $(top_srcdir)/stdair/service/sources.mk
-include $(top_srcdir)/stdair/sources.mk
+#include $(top_srcdir)/stdair/basic/sources.mk
+#include $(top_srcdir)/stdair/bom/sources.mk
+#include $(top_srcdir)/stdair/factory/sources.mk
+#include $(top_srcdir)/stdair/dbadaptor/sources.mk
+#include $(top_srcdir)/stdair/command/sources.mk
+#include $(top_srcdir)/stdair/service/sources.mk
+#include $(top_srcdir)/stdair/sources.mk
# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
Modified: trunk/dsim/dsim/DSIM_Service.hpp
===================================================================
--- trunk/dsim/dsim/DSIM_Service.hpp 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/DSIM_Service.hpp 2010-09-07 11:30:40 UTC (rev 124)
@@ -1,113 +1,242 @@
-#ifndef __DSIM_SVC_DSIM_SERVICE_HPP
-#define __DSIM_SVC_DSIM_SERVICE_HPP
+/* dsim/DSIM_Service.hpp. Generated from DSIM_Service.hpp.in by configure. */
+/* dsim/DSIM_Service.hpp.in. Generated from configure.ac by autoheader. */
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// StdAir
-#include <stdair/STDAIR_Types.hpp>
-// Dsim
-#include <dsim/DSIM_Types.hpp>
-// Forward declarations.
-namespace stdair {
- class AirlineFeatureSet;
- class STDAIR_Service;
- struct BasLogParams;
- struct BasDBParams;
-}
+#ifndef CONFIG_H
+#define CONFIG_H
-namespace DSIM {
- // Forward declaration
- class DSIM_ServiceContext;
- struct RDSParameters;
-
- /** Interface for the DSIM Services. */
- class DSIM_Service {
- public:
- // ////////// Constructors and destructors //////////
- /** Constructor.
- <br>The init() method is called; see the corresponding documentation
- for more details.
- <br>A reference on an output stream is given, so that log
- outputs can be directed onto that stream.
- <br>Moreover, database connection parameters are given, so that a
- session can be created on the corresponding database.
- @param const stdair::BasLogParams& Parameters for the output log stream.
- @param const stdair::BasDBParams& Parameters for the database access.
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- DSIM_Service (const stdair::BasLogParams&, const stdair::BasDBParams&,
- const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilenames);
+/* Define if you want exceptions handling */
+/* #undef DSIM_EXCEPTIONS */
- /** Constructor.
- <br>The init() method is called; see the corresponding documentation
- for more details.
- <br>Moreover, as no reference on any output stream is given,
- neither any database access parameter is given, it is assumed
- that the StdAir log service has already been initialised with
- the proper log output stream by some other methods in the
- calling chain (for instance, when the DSIM_Service is
- itself being initialised by another library service).
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- DSIM_Service (stdair::STDAIR_ServicePtr_T,
- const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilenames);
+/* define if the Boost library is available */
+#define HAVE_BOOST /**/
- /** Destructor. */
- ~DSIM_Service();
+/* define if the Boost::Asio library is available */
+#define HAVE_BOOST_ASIO /**/
-
- public:
- // /////////// Business Methods /////////////
- /** Perform a simulation. */
- void simulate();
-
- /** Display the list of airlines. */
- void displayAirlineListFromDB() const;
+/* define if the Boost::Date_Time library is available */
+#define HAVE_BOOST_DATE_TIME /**/
-
- private:
- // /////// Construction and Destruction helper methods ///////
- /** Default constructor. */
- DSIM_Service ();
- /** Default copy constructor. */
- DSIM_Service (const DSIM_Service&);
+/* define if the Boost::FILESYSTEM library is available */
+#define HAVE_BOOST_FILESYSTEM /**/
- /** Initialise the (DSIM) service context (i.e., the
- DSIM_ServiceContext object). */
- void initServiceContext ();
+/* define if the Boost::IOStreams library is available */
+#define HAVE_BOOST_IOSTREAMS /**/
- /** Initialise the STDAIR service (including the log service).
- <br>A reference on the root of the BOM tree, namely the BomRoot object,
- is stored within the service context for later use.
- @param const stdair::BasLogParams& Parameters for the output log stream.
- @param const stdair::BasDBParams& Parameters for the database access.
- @param const stdair::AirlineFeatureSet& Set of airline features. */
- void initStdAirService (const stdair::BasLogParams&,
- const stdair::BasDBParams&);
-
- /** Initialise.
- <br>The CSV file, describing the airline schedules for the
- simulator, is parsed and the inventories are generated accordingly.
- @param const stdair::AirlineFeatureSet& Set of airline features.
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- void init (const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilename);
-
- /** Finalise. */
- void finalise ();
+/* define if the Boost::Mpi library is available */
+#define HAVE_BOOST_MPI /**/
-
- private:
- // ///////// Service Context /////////
- /** Dsim context. */
- DSIM_ServiceContext* _dsimServiceContext;
+/* define if the Boost::Mpi_Python library is available */
+#define HAVE_BOOST_MPI_PYTHON /**/
- };
-}
-#endif // __DSIM_SVC_DSIM_SERVICE_HPP
+/* define if the Boost::PROGRAM_OPTIONS library is available */
+#define HAVE_BOOST_PROGRAM_OPTIONS /**/
+
+/* define if the Boost::Regex library is available */
+#define HAVE_BOOST_REGEX /**/
+
+/* define if the Boost::Serialization library is available */
+#define HAVE_BOOST_SERIALIZATION /**/
+
+/* define if the Boost::Signals library is available */
+#define HAVE_BOOST_SIGNALS /**/
+
+/* define if the Boost::SYSTEM library is available */
+#define HAVE_BOOST_SYSTEM /**/
+
+/* define if the Boost::THREAD library is available */
+#define HAVE_BOOST_THREAD /**/
+
+/* define if the Boost::Unit_test_framework library is available */
+#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/
+
+/* Define to 1 if you have the <cmath> header file. */
+#define HAVE_CMATH 1
+
+/* Define to 1 if you have the declaration of `signgam', and to 0 if you
+ don't. */
+#define HAVE_DECL_SIGNGAM 1
+
+/* Define to 1 if you have the <deque> header file. */
+#define HAVE_DEQUE 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `erf' function. */
+#define HAVE_ERF 1
+
+/* Define to 1 if you have the `erfc' function. */
+#define HAVE_ERFC 1
+
+/* Define to 1 if you have the `finite' function. */
+#define HAVE_FINITE 1
+
+/* Define to 1 if you have the `fpclass' function. */
+/* #undef HAVE_FPCLASS */
+
+/* Define to 1 if you have the <fstream> header file. */
+#define HAVE_FSTREAM 1
+
+/* Define to 1 if you have the <ieeefp.h> header file. */
+/* #undef HAVE_IEEEFP_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <iomanip> header file. */
+#define HAVE_IOMANIP 1
+
+/* Define to 1 if you have the <iostream> header file. */
+#define HAVE_IOSTREAM 1
+
+/* Define to 1 if you have the `isfinite' function. */
+/* #undef HAVE_ISFINITE */
+
+/* Define to 1 if you have the `isinf' function. */
+#define HAVE_ISINF 1
+
+/* Define to 1 if you have the `isnan' function. */
+#define HAVE_ISNAN 1
+
+/* Define to 1 if you have the `lgamma' function. */
+#define HAVE_LGAMMA 1
+
+/* Define to 1 if you have the <limits> header file. */
+#define HAVE_LIMITS 1
+
+/* Define to 1 if you have the <list> header file. */
+#define HAVE_LIST 1
+
+/* Define to 1 if you have the `log1p' function. */
+#define HAVE_LOG1P 1
+
+/* Define to 1 if you have the <map> header file. */
+#define HAVE_MAP 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <queue> header file. */
+#define HAVE_QUEUE 1
+
+/* Define to 1 if you have the `rint' function. */
+#define HAVE_RINT 1
+
+/* Define to 1 if you have the <sstream> header file. */
+#define HAVE_SSTREAM 1
+
+/* Define to 1 if you have the <stdexcept> header file. */
+#define HAVE_STDEXCEPT 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string> header file. */
+#define HAVE_STRING 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the `tgamma' function. */
+#define HAVE_TGAMMA 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <vector> header file. */
+#define HAVE_VECTOR 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "dsim"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "den...@us..."
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "DSIM"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "DSIM 99.99.99"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "dsim"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "99.99.99"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define VERSION "99.99.99"
+
+
+#if HAVE_CMATH
+# include <cmath>
+#endif
+
+/* Solaris uses <ieeefp.h> for declaring isnan() and finite() functions */
+#if HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+/* Microsoft Visual C++ .NET underscore prefixed functions */
+#if _MSC_VER
+# include <cfloat>
+# define HAVE_FINITE 1
+# define finite(x) _finite(x)
+# define HAVE_ISNAN 1
+# define isnan(x) _isnan(x)
+# define HAVE_FPCLASS 1
+# define fpclass(x) _fpclass(x)
+# define HAVE_JN 1
+# define jn(a, b) _jn(a, b)
+# define HAVE_YN 1
+# define yn(a, b) _yn(a, b)
+# define HAVE_J0 1
+# define j0(a) _j0(a)
+# define HAVE_J1 1
+# define j1(a) _j1(a)
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#if (! defined (HAVE_FINITE) && defined (HAVE_ISFINITE))
+# define HAVE_FINITE 1
+# define finite(a) isfinite(a)
+#endif
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#endif /* #ifndef CONFIG_H */
+
Modified: trunk/dsim/dsim/Makefile.am
===================================================================
--- trunk/dsim/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -12,5 +12,5 @@
# Header files
-nobase_pkginclude_HEADERS = $(service_h_sources)
+nobase_pkginclude_HEADERS = $(dsim_service_h_sources)
#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
Modified: trunk/dsim/dsim/basic/Makefile.am
===================================================================
--- trunk/dsim/dsim/basic/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/basic/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -6,8 +6,9 @@
noinst_LTLIBRARIES = libdsimbas.la
libdsimbas_la_SOURCES = $(dsim_bas_h_sources) $(dsim_bas_cc_sources)
-libdsim_bas_la_CXXFLAGS =
+libdsimbas_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libdsimbas_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/basic
-#pkginclude_HEADERS = $(bas_h_sources)
+#pkginclude_HEADERS = $(dsim_bas_h_sources)
Modified: trunk/dsim/dsim/batches/Makefile.am
===================================================================
--- trunk/dsim/dsim/batches/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/batches/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -11,7 +11,7 @@
bin_PROGRAMS = simulate
simulate_SOURCES = $(dsim_batches_h_sources) $(dsim_batches_cc_sources)
-simulate_CXXFLAGS = $(BOOST_CFLAGS)
+simulate_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
simulate_LDADD =
-simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) \
+simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) $(STDAIR_LIBS) \
$(top_builddir)/dsim/core/libdsim.la
Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/bom/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,12 +3,12 @@
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libdsimbom.la
+noinst_LTLIBRARIES = libdsimbom.la
-libdsimbom_la_SOURCES= $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
-libdsimbom_la_CXXFLAGS =
+libdsimbom_la_SOURCES = $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
+libdsimbom_la_CXXFLAGS = $(STDAIR_CFLAGS)
libdsimbom_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/bom
-#pkginclude_HEADERS = $(bom_h_sources)
+#pkginclude_HEADERS = $(dsim_bom_h_sources)
Modified: trunk/dsim/dsim/command/Makefile.am
===================================================================
--- trunk/dsim/dsim/command/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/command/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -6,12 +6,10 @@
noinst_LTLIBRARIES = libdsimcmd.la
libdsimcmd_la_SOURCES = $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources)
-libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS) $(STDAIR_CFLAGS)
libdsimcmd_la_LIBADD =
-libdsimcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
- $(top_builddir)/simcrs/core/libsimcrs.la \
- $(top_builddir)/trademgen/core/libtrademgen.la
+libdsimcmd_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/command
-#pkginclude_HEADERS = $(cmd_h_sources)
+#pkginclude_HEADERS = $(dsim_cmd_h_sources)
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/core/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -21,8 +21,7 @@
$(top_builddir)/dsim/service/libdsimsvc.la
libdsim_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_FILESYSTEM_LIB) \
- $(top_builddir)/stdair/libstdair.la \
+ $(BOOST_FILESYSTEM_LIB) $(STDAIR_LIBS) \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la \
Modified: trunk/dsim/dsim/factory/Makefile.am
===================================================================
--- trunk/dsim/dsim/factory/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/factory/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,11 +3,12 @@
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libdsimfac.la
+noinst_LTLIBRARIES = libdsimfac.la
-libdsimfac_la_SOURCES= $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
-libdsimfac_la_CXXFLAGS =
+libdsimfac_la_SOURCES = $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
+libdsimfac_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libdsimfac_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/factory
-#pkginclude_HEADERS = $(fac_h_sources)
+#pkginclude_HEADERS = $(dsim_fac_h_sources)
Modified: trunk/dsim/dsim/service/Makefile.am
===================================================================
--- trunk/dsim/dsim/service/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/service/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -1,4 +1,4 @@
-## dsim/command sub-directory
+## dsim/service sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -6,8 +6,9 @@
noinst_LTLIBRARIES = libdsimsvc.la
libdsimsvc_la_SOURCES = $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
-libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libdsimsvc_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/service
-#pkginclude_HEADERS = $(svc_h_sources)
+#pkginclude_HEADERS = $(dsim_svc_h_sources)
Property changes on: trunk/dsim/test
___________________________________________________________________
Modified: svn:externals
- samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/stdair
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/test/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/test/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/test/avlcal
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/test/simfqt
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/test/airinv
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/test/rmol
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/test/simcrs
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/test/trademgen
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/test/travelccm
+ samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/test/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/test/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/test/avlcal
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/test/simfqt
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/test/airinv
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/test/rmol
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/test/simcrs
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/test/trademgen
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/test/travelccm
Modified: trunk/dsim/test/Makefile.am
===================================================================
--- trunk/dsim/test/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/test/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -5,7 +5,7 @@
##
SUBDIRS = boost samples \
- stdair trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
+ trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
travelccm dsim
EXTRA_DIST =
Modified: trunk/dsim/test/dsim/Makefile.am
===================================================================
--- trunk/dsim/test/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/test/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -14,10 +14,8 @@
XFAIL_TESTS = #
SimulationTestSuite_SOURCES = SimulationTestSuite.hpp SimulationTestSuite.cpp
-SimulationTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
+SimulationTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
SimulationTestSuite_LDADD =
SimulationTestSuite_LDFLAGS = \
- $(BOOST_LIBS) $(CPPUNIT_LIBS) \
- $(top_builddir)/extracppunit/libextracppunit.la \
- $(top_builddir)/stdair/libstdair.la \
- $(top_builddir)/dsim/core/libdsim.la
+ $(BOOST_LIBS) $(CPPUNIT_LIBS) $(STDAIR_LIBS) $(EXTRACC_LIBS) \
+ $(top_builddir)/dsim/core/libdsim.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-07 11:54:27
|
Revision: 125
http://dsim.svn.sourceforge.net/dsim/?rev=125&view=rev
Author: denis_arnaud
Date: 2010-09-07 11:54:20 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
[Conf] Fixed wrong config header specification.
Modified Paths:
--------------
trunk/dsim/configure.ac
trunk/dsim/dsim/DSIM_Service.hpp
Property Changed:
----------------
trunk/dsim/dsim/
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-09-07 11:30:40 UTC (rev 124)
+++ trunk/dsim/configure.ac 2010-09-07 11:54:20 UTC (rev 125)
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
AC_INIT([DSIM],[99.99.99],[den...@us...],[dsim])
-AC_CONFIG_HEADER([dsim/DSIM_Service.hpp])
+AC_CONFIG_HEADER([dsim/config.h])
AC_CONFIG_SRCDIR([dsim])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
Property changes on: trunk/dsim/dsim
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
+ .deps
.libs
stamp-h1
config.h
config.h.in
Makefile.in
Makefile
Modified: trunk/dsim/dsim/DSIM_Service.hpp
===================================================================
--- trunk/dsim/dsim/DSIM_Service.hpp 2010-09-07 11:30:40 UTC (rev 124)
+++ trunk/dsim/dsim/DSIM_Service.hpp 2010-09-07 11:54:20 UTC (rev 125)
@@ -1,242 +1,113 @@
-/* dsim/DSIM_Service.hpp. Generated from DSIM_Service.hpp.in by configure. */
-/* dsim/DSIM_Service.hpp.in. Generated from configure.ac by autoheader. */
+#ifndef __DSIM_SVC_DSIM_SERVICE_HPP
+#define __DSIM_SVC_DSIM_SERVICE_HPP
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// StdAir
+#include <stdair/STDAIR_Types.hpp>
+// Dsim
+#include <dsim/DSIM_Types.hpp>
-#ifndef CONFIG_H
-#define CONFIG_H
+// Forward declarations.
+namespace stdair {
+ class AirlineFeatureSet;
+ class STDAIR_Service;
+ struct BasLogParams;
+ struct BasDBParams;
+}
+namespace DSIM {
-/* Define if you want exceptions handling */
-/* #undef DSIM_EXCEPTIONS */
+ // Forward declaration
+ class DSIM_ServiceContext;
+ struct RDSParameters;
+
+ /** Interface for the DSIM Services. */
+ class DSIM_Service {
+ public:
+ // ////////// Constructors and destructors //////////
+ /** Constructor.
+ <br>The init() method is called; see the corresponding documentation
+ for more details.
+ <br>A reference on an output stream is given, so that log
+ outputs can be directed onto that stream.
+ <br>Moreover, database connection parameters are given, so that a
+ session can be created on the corresponding database.
+ @param const stdair::BasLogParams& Parameters for the output log stream.
+ @param const stdair::BasDBParams& Parameters for the database access.
+ @param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input demand file. */
+ DSIM_Service (const stdair::BasLogParams&, const stdair::BasDBParams&,
+ const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iDemandInputFilenames);
-/* define if the Boost library is available */
-#define HAVE_BOOST /**/
+ /** Constructor.
+ <br>The init() method is called; see the corresponding documentation
+ for more details.
+ <br>Moreover, as no reference on any output stream is given,
+ neither any database access parameter is given, it is assumed
+ that the StdAir log service has already been initialised with
+ the proper log output stream by some other methods in the
+ calling chain (for instance, when the DSIM_Service is
+ itself being initialised by another library service).
+ @param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input demand file. */
+ DSIM_Service (stdair::STDAIR_ServicePtr_T,
+ const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iDemandInputFilenames);
-/* define if the Boost::Asio library is available */
-#define HAVE_BOOST_ASIO /**/
+ /** Destructor. */
+ ~DSIM_Service();
-/* define if the Boost::Date_Time library is available */
-#define HAVE_BOOST_DATE_TIME /**/
+
+ public:
+ // /////////// Business Methods /////////////
+ /** Perform a simulation. */
+ void simulate();
+
+ /** Display the list of airlines. */
+ void displayAirlineListFromDB() const;
-/* define if the Boost::FILESYSTEM library is available */
-#define HAVE_BOOST_FILESYSTEM /**/
+
+ private:
+ // /////// Construction and Destruction helper methods ///////
+ /** Default constructor. */
+ DSIM_Service ();
+ /** Default copy constructor. */
+ DSIM_Service (const DSIM_Service&);
-/* define if the Boost::IOStreams library is available */
-#define HAVE_BOOST_IOSTREAMS /**/
+ /** Initialise the (DSIM) service context (i.e., the
+ DSIM_ServiceContext object). */
+ void initServiceContext ();
-/* define if the Boost::Mpi library is available */
-#define HAVE_BOOST_MPI /**/
+ /** Initialise the STDAIR service (including the log service).
+ <br>A reference on the root of the BOM tree, namely the BomRoot object,
+ is stored within the service context for later use.
+ @param const stdair::BasLogParams& Parameters for the output log stream.
+ @param const stdair::BasDBParams& Parameters for the database access.
+ @param const stdair::AirlineFeatureSet& Set of airline features. */
+ void initStdAirService (const stdair::BasLogParams&,
+ const stdair::BasDBParams&);
+
+ /** Initialise.
+ <br>The CSV file, describing the airline schedules for the
+ simulator, is parsed and the inventories are generated accordingly.
+ @param const stdair::AirlineFeatureSet& Set of airline features.
+ @param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input demand file. */
+ void init (const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iDemandInputFilename);
+
+ /** Finalise. */
+ void finalise ();
-/* define if the Boost::Mpi_Python library is available */
-#define HAVE_BOOST_MPI_PYTHON /**/
+
+ private:
+ // ///////// Service Context /////////
+ /** Dsim context. */
+ DSIM_ServiceContext* _dsimServiceContext;
-/* define if the Boost::PROGRAM_OPTIONS library is available */
-#define HAVE_BOOST_PROGRAM_OPTIONS /**/
-
-/* define if the Boost::Regex library is available */
-#define HAVE_BOOST_REGEX /**/
-
-/* define if the Boost::Serialization library is available */
-#define HAVE_BOOST_SERIALIZATION /**/
-
-/* define if the Boost::Signals library is available */
-#define HAVE_BOOST_SIGNALS /**/
-
-/* define if the Boost::SYSTEM library is available */
-#define HAVE_BOOST_SYSTEM /**/
-
-/* define if the Boost::THREAD library is available */
-#define HAVE_BOOST_THREAD /**/
-
-/* define if the Boost::Unit_test_framework library is available */
-#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/
-
-/* Define to 1 if you have the <cmath> header file. */
-#define HAVE_CMATH 1
-
-/* Define to 1 if you have the declaration of `signgam', and to 0 if you
- don't. */
-#define HAVE_DECL_SIGNGAM 1
-
-/* Define to 1 if you have the <deque> header file. */
-#define HAVE_DEQUE 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `erf' function. */
-#define HAVE_ERF 1
-
-/* Define to 1 if you have the `erfc' function. */
-#define HAVE_ERFC 1
-
-/* Define to 1 if you have the `finite' function. */
-#define HAVE_FINITE 1
-
-/* Define to 1 if you have the `fpclass' function. */
-/* #undef HAVE_FPCLASS */
-
-/* Define to 1 if you have the <fstream> header file. */
-#define HAVE_FSTREAM 1
-
-/* Define to 1 if you have the <ieeefp.h> header file. */
-/* #undef HAVE_IEEEFP_H */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <iomanip> header file. */
-#define HAVE_IOMANIP 1
-
-/* Define to 1 if you have the <iostream> header file. */
-#define HAVE_IOSTREAM 1
-
-/* Define to 1 if you have the `isfinite' function. */
-/* #undef HAVE_ISFINITE */
-
-/* Define to 1 if you have the `isinf' function. */
-#define HAVE_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_ISNAN 1
-
-/* Define to 1 if you have the `lgamma' function. */
-#define HAVE_LGAMMA 1
-
-/* Define to 1 if you have the <limits> header file. */
-#define HAVE_LIMITS 1
-
-/* Define to 1 if you have the <list> header file. */
-#define HAVE_LIST 1
-
-/* Define to 1 if you have the `log1p' function. */
-#define HAVE_LOG1P 1
-
-/* Define to 1 if you have the <map> header file. */
-#define HAVE_MAP 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <queue> header file. */
-#define HAVE_QUEUE 1
-
-/* Define to 1 if you have the `rint' function. */
-#define HAVE_RINT 1
-
-/* Define to 1 if you have the <sstream> header file. */
-#define HAVE_SSTREAM 1
-
-/* Define to 1 if you have the <stdexcept> header file. */
-#define HAVE_STDEXCEPT 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <string> header file. */
-#define HAVE_STRING 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `tgamma' function. */
-#define HAVE_TGAMMA 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <vector> header file. */
-#define HAVE_VECTOR 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "dsim"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "den...@us..."
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "DSIM"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "DSIM 99.99.99"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "dsim"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "99.99.99"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "99.99.99"
-
-
-#if HAVE_CMATH
-# include <cmath>
-#endif
-
-/* Solaris uses <ieeefp.h> for declaring isnan() and finite() functions */
-#if HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-/* Microsoft Visual C++ .NET underscore prefixed functions */
-#if _MSC_VER
-# include <cfloat>
-# define HAVE_FINITE 1
-# define finite(x) _finite(x)
-# define HAVE_ISNAN 1
-# define isnan(x) _isnan(x)
-# define HAVE_FPCLASS 1
-# define fpclass(x) _fpclass(x)
-# define HAVE_JN 1
-# define jn(a, b) _jn(a, b)
-# define HAVE_YN 1
-# define yn(a, b) _yn(a, b)
-# define HAVE_J0 1
-# define j0(a) _j0(a)
-# define HAVE_J1 1
-# define j1(a) _j1(a)
-#endif
-
-#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
-# define HAVE_ISINF 1
-# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
-#endif
-
-#if (! defined (HAVE_FINITE) && defined (HAVE_ISFINITE))
-# define HAVE_FINITE 1
-# define finite(a) isfinite(a)
-#endif
-
-#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
-# define HAVE_FINITE 1
-# define finite(a) (! isnan(a) && ! isinf(a))
-#endif
-
-#endif /* #ifndef CONFIG_H */
-
+ };
+}
+#endif // __DSIM_SVC_DSIM_SERVICE_HPP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-11 15:42:55
|
Revision: 129
http://dsim.svn.sourceforge.net/dsim/?rev=129&view=rev
Author: denis_arnaud
Date: 2010-09-11 15:42:49 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
[Test] Added a sub-directory for Boost.Intrusive.
Modified Paths:
--------------
trunk/dsim/configure.ac
trunk/dsim/test/boost/Makefile.am
Added Paths:
-----------
trunk/dsim/test/boost/intrusive/
trunk/dsim/test/boost/intrusive/Makefile.am
trunk/dsim/test/boost/intrusive/intrusive.cpp
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-09-11 00:48:16 UTC (rev 128)
+++ trunk/dsim/configure.ac 2010-09-11 15:42:49 UTC (rev 129)
@@ -496,6 +496,7 @@
test/boost/asio/logger/Makefile
test/boost/asio/chat/Makefile
test/boost/filesystem/Makefile
+ test/boost/intrusive/Makefile
test/boost/iostreams/Makefile
test/boost/mpi/Makefile
test/boost/mpi/master_slave/Makefile
Modified: trunk/dsim/test/boost/Makefile.am
===================================================================
--- trunk/dsim/test/boost/Makefile.am 2010-09-11 00:48:16 UTC (rev 128)
+++ trunk/dsim/test/boost/Makefile.am 2010-09-11 15:42:49 UTC (rev 129)
@@ -5,7 +5,7 @@
MAINTAINERCLEANFILES = Makefile.in
##
-SUBDIRS = accumulators asio filesystem mpi mpl serialization signals spirit \
- smart_pointers
+SUBDIRS = accumulators asio filesystem intrusive mpi mpl \
+ serialization signals spirit smart_pointers
EXTRA_DIST =
Property changes on: trunk/dsim/test/boost/intrusive
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
intrusive
Added: trunk/dsim/test/boost/intrusive/Makefile.am
===================================================================
--- trunk/dsim/test/boost/intrusive/Makefile.am (rev 0)
+++ trunk/dsim/test/boost/intrusive/Makefile.am 2010-09-11 15:42:49 UTC (rev 129)
@@ -0,0 +1,20 @@
+## test/boost/intrusive sub-directory
+include $(top_srcdir)/Makefile.common
+
+MAINTAINERCLEANFILES = Makefile.in
+
+##
+SUBDIRS =
+
+EXTRA_DIST =
+##
+
+check_PROGRAMS = intrusive
+#TESTS = $(check_PROGRAMS)
+TESTS =
+XFAIL_TESTS = #IndexBuildingTestSuite
+
+intrusive_SOURCES = intrusive.cpp
+intrusive_CXXFLAGS= $(BOOST_CFLAGS)
+intrusive_LDFLAGS = $(BOOST_LIBS)
+intrusive_LDADD =
Added: trunk/dsim/test/boost/intrusive/intrusive.cpp
===================================================================
--- trunk/dsim/test/boost/intrusive/intrusive.cpp (rev 0)
+++ trunk/dsim/test/boost/intrusive/intrusive.cpp 2010-09-11 15:42:49 UTC (rev 129)
@@ -0,0 +1,71 @@
+#include <boost/intrusive/list.hpp>
+#include <vector>
+
+using namespace boost::intrusive;
+
+/** Object to be inserted in the intrusive list. */
+class MyClass : public list_base_hook<> {
+ int _int;
+public:
+ list_member_hook<> member_hook_;
+
+ MyClass (int i) : _int (i) {}
+};
+
+//Define a list that will store MyClass using the base hook
+typedef list<MyClass> BaseList;
+
+//Define a list that will store MyClass using the member hook
+typedef member_hook
+<MyClass, list_member_hook<>, &MyClass::member_hook_> MemberOption;
+typedef list<MyClass, MemberOption> MemberList;
+
+
+// /////////////////////// M A I N /////////////////////
+int main() {
+
+ typedef std::vector<MyClass>::iterator VectIt;
+ typedef std::vector<MyClass>::reverse_iterator VectRit;
+
+ //Create several MyClass objects, each one with a different value
+ std::vector<MyClass> values;
+ for (int i = 0; i < 100; ++i) {
+ values.push_back (MyClass(i));
+ }
+
+ BaseList baselist;
+ MemberList memberlist;
+
+ //Now insert them in the reverse order in the base hook list
+ for (VectIt it(values.begin()), itend(values.end()); it != itend; ++it) {
+ baselist.push_front (*it);
+ }
+
+ //Now insert them in the same order as in vector in the member hook list
+ for (VectIt it(values.begin()), itend(values.end()); it != itend; ++it) {
+ memberlist.push_back (*it);
+ }
+
+ //Now test lists
+ {
+ BaseList::reverse_iterator rbit(baselist.rbegin()), rbitend(baselist.rend());
+ MemberList::iterator mit (memberlist.begin()), mitend(memberlist.end());
+ VectIt it (values.begin()), itend (values.end());
+
+ //Test the objects inserted in the base hook list
+ for (; it != itend; ++it, ++rbit) {
+ if (&*rbit != &*it) {
+ return 1;
+ }
+ }
+
+ //Test the objects inserted in the member hook list
+ for (it = values.begin(); it != itend; ++it, ++mit) {
+ if (&*mit != &*it) {
+ return 1;
+ }
+ }
+ }
+
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X