Skip to content

Commit

Permalink
[Release 1.00.5] Release of the 1.00.5 version of TraDemGen
Browse files Browse the repository at this point in the history
  • Loading branch information
da115115 committed Nov 11, 2019
1 parent c8934c3 commit 20bafd2
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
project (trademgen)
set_project_names (trademgen TraDemGen)
set_project_brief ("C++ Simulated Travel Demand Generation Library")
set_project_versions (1 00 4)
set_project_versions (1 00 5)

##
# Project options
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Mon Nov 11 2019 Denis Arnaud <denis_arnaud at users dot sourceforge dot net> - 1.00.5
- CMake helper files for newer versions of Boost

* Thu Jul 11 2019 Denis Arnaud <denis_arnaud at users dot sourceforge dot net> - 1.00.4
- CMake support files updated for Python 3.8

Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* 2019-11-11:
- Version 1.00.5
- CMake helper files for newer versions of Boost

* 2019-07-11:
- Version 1.00.4
- CMake support files updated for Python 3.8
Expand Down
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Summary:
---------
TraDemGen aims at providing a clean API, and the corresponding C++
implementation, able to generate demand for travel solutions (e.g.,
from JFK to PEK on 25-05-2009) according to characteristics (e.g.,
from JFK to PEK on 25-05-2019) according to characteristics (e.g.,
Willingness-To-Pay, preferred airline, etc).

TraDemGen makes an extensive use of existing open-source libraries for
Expand Down Expand Up @@ -64,10 +64,10 @@ found on GitHub: http://github.com/airsim/trademgen/releases
To customise the following to your environment, you can alter the path
to the installation directory:
```bash
export INSTALL_BASEDIR=/home/user/dev/deliveries
export TDG_VER=1.00.4
if [ -d /usr/lib64 ]; then LIBSUFFIX=64; fi
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
export INSTALL_BASEDIR="/home/user/dev/deliveries"
export TDG_VER="1.00.4"
if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=${LIBSUFFIX}"
```
Then, as usual:
* To configure the project, type something like:
Expand All @@ -87,7 +87,7 @@ Then, as usual:
```bash
make check
```
* To install the library (libtrademgen*.so*) and the binary (trademgen),
* To install the library (`libtrademgen*.so*`) and the binary (trademgen),
just type:
```bash
make install
Expand Down Expand Up @@ -117,8 +117,12 @@ Then, as usual:
```
* To run the installed version:
```bash
${INSTALL_BASEDIR}/trademgen-$TDG_VER/bin/trademgen -b
${INSTALL_BASEDIR}/trademgen-$TDG_VER/bin/trademgen_generateDemand
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen -b
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/pytrademgen
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_generateDemand
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_extractBookingRequests
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_drawBookingArrivals
${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_with_db
```

Denis Arnaud (June 2015)
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
#
VERSION_MAJOR=1
VERSION_MINOR=00
VERSION_PATCH=4
VERSION_PATCH=5
VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`

Expand Down
10 changes: 5 additions & 5 deletions config/FindBoost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1487,13 +1487,13 @@ if(WIN32)
INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
endif()

if(POLICY CMP0074)
if (POLICY CMP0074)
cmake_policy(GET CMP0074 _Boost_CMP0074)
if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx")
_Boost_CHECK_SPELLING(Boost_ROOT)
endif()
unset(_Boost_CMP0074)
endif(POLICY CMP0074)
if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx")
_Boost_CHECK_SPELLING(Boost_ROOT)
endif()
unset(_Boost_CMP0074)
_Boost_CHECK_SPELLING(Boost_LIBRARYDIR)
_Boost_CHECK_SPELLING(Boost_INCLUDEDIR)

Expand Down
1 change: 1 addition & 0 deletions config/project_config_embeddable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2978,6 +2978,7 @@ macro (display_status)
message (STATUS)
message (STATUS "BUILD_SHARED_LIBS ................. : ${BUILD_SHARED_LIBS}")
message (STATUS "CMAKE_BUILD_TYPE .................. : ${CMAKE_BUILD_TYPE}")
message (STATUS " * CMAKE_VERSION .................. : ${CMAKE_VERSION}")
message (STATUS " * CMAKE_C_FLAGS .................. : ${CMAKE_C_FLAGS}")
message (STATUS " * CMAKE_CXX_FLAGS ................ : ${CMAKE_CXX_FLAGS}")
message (STATUS " * BUILD_FLAGS .................... : ${BUILD_FLAGS}")
Expand Down

0 comments on commit 20bafd2

Please sign in to comment.