build: fixed cmake for windows

* added target for the license lib.
* switched to statically linked version of boost.
* removed boost dlls from bin directories.
* cleaned up CMakeLists.

.gitignore

@@ -12,8 +12,10 @@
 /bin/lib/
 /bin/lib_gui/
 /bin/lib_parser/
+/bin/lib_license/
 
-/bin/gen/
+/bin/license_generator/Debug/
+/bin/license_generator/Release/
 
 /bin/test/Debug/
 /bin/test/Release/

CMakeLists.txt

@@ -17,9 +17,11 @@ set(PROJECT_NAME Coati)
 
 set(APP_PROJECT_NAME "${PROJECT_NAME}")
 set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial")
+set(LIB_LICENSE_PROJECT_NAME "${PROJECT_NAME}_lib_license")
 set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
 set(LIB_PARSER_PROJECT_NAME "${PROJECT_NAME}_lib_parser")
 set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
+set(LICENSE_GENERATOR_PROJECT_NAME "${PROJECT_NAME}_license_generator")
 set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
 
 if (WIN32)
@@ -60,12 +62,12 @@ add_definitions(${CLANG_DEFINITIONS})
 
 set(BOOST_ROOT $ENV{BOOST_159_DIR})
 set(Boost_USE_MULTITHREAD ON)
-set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 Set(Boost_NO_SYSTEM_PATHS ON)
 set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})
 
-find_package(Boost 1.59 COMPONENTS system filesystem date_time REQUIRED)
+find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)
 
 # Eigen ------------------------------------------------------------------------
 
@@ -74,36 +76,7 @@ set(EIGEN_ROOT $ENV{EIGEN_DIR})
 
 # Botan -------------------------------------------------------------------------
 
-# include(cmake/BotanConfig.cmake)
-
-set(BOTAN_ROOT $ENV{BOTAN_DIR})
-
-FIND_PACKAGE ( Threads REQUIRED )
-
-message(STATUS ${BOTAN_ROOT})
-add_library(BOTAN STATIC ${BOTAN_ROOT}/botan_all.cpp)
-
-target_link_libraries(BOTAN ${CMAKE_THREAD_LIBS_INIT})
-target_compile_options(BOTAN PUBLIC "-pthread")
-
-set_property(
-	TARGET BOTAN
-	PROPERTY INCLUDE_DIRECTORIES
-		"${BOTAN_ROOT}"
-)
-
-# set(BOTAN_MODULES "base,ecdsa,emsa1,passhash9,rng,rsa,egd,emsa_pssr,emsa_pkcs1,x509,aes,dev_random")
-
-# ExternalProject_Add(BOTAN
-# 	PREFIX $ENV{COATI_DEPEND_DIR}/botan
-# 	GIT_REPOSITORY https://github.com/randombit/botan.git/
-# 	GIT_TAG 1.11.23
-# 	CONFIGURE_COMMAND ./configure.py --gen-amalgamation --minimized-build --enable-modules=${BOTAN_MODULES}
-
-# 	)
-
-# license/key generator and license class include
-add_subdirectory(src/gen)
+find_library(BOTAN botan $ENV{BOTAN_DIR})
 
 # Lib --------------------------------------------------------------------------
 
@@ -141,7 +114,6 @@ target_include_directories(${LIB_PROJECT_NAME} SYSTEM
 	${Boost_INCLUDE_DIRS}
 	${EIGEN_ROOT}
     "${CMAKE_SOURCE_DIR}/src/external"
-	"${BOTAN_ROOT}"
 )
 
 target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES})
@@ -176,6 +148,32 @@ link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS
 
 target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS})
 
+# Lib License -------------------------------------------------------------------
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+
+add_subdirectory(src/lib_license)
+
+add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
+
+create_source_groups(${LIB_LICENSE_FILES})
+
+set_property(
+		TARGET ${LIB_LICENSE_PROJECT_NAME}
+		PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+)
+
+target_include_directories(${LIB_LICENSE_PROJECT_NAME} SYSTEM
+	PUBLIC "$ENV{BOTAN_DIR}"
+	${Boost_INCLUDE_DIRS}
+)
+
+link_directories("$ENV{BOTAN_DIR}")
+
+target_link_libraries(${LIB_LICENSE_PROJECT_NAME} ${BOTAN})
+
 # Lib Gui ----------------------------------------------------------------------
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
@@ -231,16 +229,16 @@ create_source_groups(${LIB_GUI_FILES})
 set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/src/gen"
-		"${BOTAN_ROOT}"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
 )
 
 # include external header without warnings
 target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
 		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
+		PUBLIC "$ENV{BOTAN_DIR}"
 		PUBLIC ${Boost_INCLUDE_DIRS}
 )
 
@@ -301,7 +299,7 @@ endif ()
 
 create_source_groups(${APP_FILES})
 
-target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} BOTAN)
+target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
 
 set_property(
 	TARGET ${APP_PROJECT_NAME}
@@ -309,10 +307,10 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/app"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_parser"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/build/src/app"
-		"${CMAKE_SOURCE_DIR}/src/gen"
 )
 
 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -365,7 +363,7 @@ endif ()
 
 create_source_groups(${TRIAL_FILES})
 
-target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME} BOTAN)
+target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} )
 
 set_property(
 	TARGET ${TRIAL_PROJECT_NAME}
@@ -435,46 +433,31 @@ if (APPLE)
 
 endif ()
 
-# Key/LicenseGenerator  --------------------------------------------------------
+# License Generator  --------------------------------------------------------
 
-set(BOOST_ROOT $ENV{BOOST_159_DIR})
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_STATIC_RUNTIME ON)
-Set(Boost_NO_SYSTEM_PATHS ON)
-
-find_package(Boost 1.59 COMPONENTS system program_options filesystem REQUIRED)
-
-set(GEN_PROJECT_NAME "${PROJECT_NAME}_keygen")
-
-create_source_groups(${GEN_FILES})
+add_subdirectory(src/license_generator)
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/gen/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/${CMAKE_BUILD_TYPE})
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/gen/)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/)
 endif ()
 
-add_executable(${GEN_PROJECT_NAME} "${CMAKE_SOURCE_DIR}/src/gen/gen.cpp" ${GEN_FILES})
+add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES})
 
-set_target_properties(
-		${GEN_PROJECT_NAME}
-		PROPERTIES
-		DEBUG_OUTPUT_NAME ${GEN_PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${GEN_PROJECT_NAME}
-)
+create_source_groups(${LICENSE_GENERATOR_FILES})
 
 set_property(
-		TARGET ${GEN_PROJECT_NAME}
+		TARGET ${LICENSE_GENERATOR_PROJECT_NAME}
 		PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/gen"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
 )
 
-target_include_directories(${GEN_PROJECT_NAME} SYSTEM
-		PUBLIC "${BOTAN_ROOT}"
-		${Boost_INCLUDE_DIRS}
+target_include_directories(${LICENSE_GENERATOR_PROJECT_NAME} SYSTEM
+		PUBLIC ${Boost_INCLUDE_DIRS}
 )
 
-target_link_libraries(${GEN_PROJECT_NAME} BOTAN ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} )
+target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES} )
 
 # CxxTest ----------------------------------------------------------------------
 
@@ -492,23 +475,22 @@ set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)
 
 find_package(PythonInterp REQUIRED)
 
-add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} ${GEN_FILES})
+add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )
 
 create_source_groups(${TEST_FILES})
 
-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} BOTAN)
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
 
 find_package(CxxTest)
 if (CXXTEST_FOUND)
 	set_property(
 		TARGET ${TEST_PROJECT_NAME}
 		PROPERTY INCLUDE_DIRECTORIES
+			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
 			"${CMAKE_SOURCE_DIR}/src/lib_parser"
-            "${CMAKE_SOURCE_DIR}/src/gen"
-            "${BOTAN_ROOT}"
-			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/external"
+			"${CMAKE_SOURCE_DIR}/src/lib_license"
 			${Boost_INCLUDE_DIRS}
 	)
 endif (CXXTEST_FOUND)

README.md

@@ -19,7 +19,7 @@
 * CLANG_DIR - .../clang-llvm/
 * BOOST_159_DIR - .../boost_1_59_0
 * EIGEN_DIR - .../eigen
-* BOTAN_DIR -
+* BOTAN_DIR - .../Botan-1.11.24
 
 For Win32:
 * VLD_DIR - .../Visual Leak Detector
@@ -27,7 +27,11 @@ For Win32:
 
 ###### Botan setup
 
-$ ./configure.py --via-amalgamation --minimized-build --enable-modules="base,ecdsa,emsa1,passhash9,rng,rsa,egd,emsa_pssr,emsa_pkcs1,x509,aes,dev_random"
+for Windows:
+$ python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared
+
+for other:
+$ python configure.py --via-amalgamation --disable-shared
 
 ##### Settings
 

bin/gen/Release/license.txt

@@ -0,0 +1,13 @@
+-----BEGIN LICENSE-----
+asdf;lkjas;ldkfj;alsdkfj;alskdfasdflkjlksjlkdfasdfoiupqwernkljoviopizpoxcuivojqwoenr;soidfooiaupoiay
+Single User License
+Coati 0
+$9$AQAKZ6/FMxHq850YPk5GfWSYRWZv+x1mgB5B6/OPz7D7mOfCvowH
+hctPm+tJfoiFhSamiyBuTe4jbtIvvyZShK1B1OKfG1C+lOboSZh2HJn
+6cBdiKE6ZfrymDngPUE23lm/JPIJwlZjvPTcd/N3YusUs0aqiTEXfHu
+G/c34NYI5AIbute6xQjY6Q0cLdZcOHqSBfGxZrZTl9q6yVcM6B2mwDE
+YsFzrOmXsIyYLX4+lf0eEFl5Dmw437IZN8z5yZFOZ3xp91Mpz6nMU79
+9X6ATP6RRVC58zYYznasbvqgz1xoOIivYZr6WG/+3ia4/A5Zn9r+Mt9
+5AjHqWOZtMqQAHqeHgOzsKHqbu0xduH8HsPXBF8fPD6EnLVz6GbjBET
+KuDWka14AHzA==
+-----END LICENSE-----

bin/gen/Release/private-0.pem

@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQMDAB5IuntKywoJmry
+AgMDDUACASAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEA7JwOuCMu6xUJ+c
+0NBKZZsEggTQC82I8AHltLbPCAIkTZoJv68aOV/cVXDcxZ7Mn1hOiob7nO4RuteW
+mwTX3JZFd7Jlw5h706xAdRjbSsJXGgTMXECciqrfZ9c21+tYbKV4JpPBQMEhTLpa
+IXUTWonQ9wh7vis3bcwBPaRCsfDtYaz872vDpf1X5BVOppoffKCiKFi2y5C+e3HG
+CPcg+BTgZg+SRJB9yvSDqdDO5/s9Y6+otePt4Gr+wSOJRwYkdZ67f9uq4BaFcw2z
+wIRKA0C1oClu7TAo5onjv1rvw/66migcMHRw1zjIk6oQv44caJvqca1eM9dniZo7
+ccbq11PWpeBdKvEkAWuW1PoI7uuLQNdzs3UDO7LJttWwVNAKtO3o8LOL8x9Q7Jns
+tvQqUrf0VNB8eBfmsD2I3zVMu2X4rNEDYlAbrL3f1vNkt949ib4eG7+lo3wrCt6J
+6UFA791HGVJUvFI0NHdtT32+LdKyTJ+bIlz663LkNU2+mBs6UL7qe6XIBoXCNcg8
++VDKDDVSIyckSVxV7WuGeX9n3igRuvt88T2pCVlY+HEBWDgFoXxc5vx8LdD9EVaQ
+OAmuXABLNTqUTCGms9KAa3WJ/QW6++NAt4uf+37LKzM9zyUrDZMTs5M2ZJ/otwgK
+ZqIbDcVyfsX79ATs0UeJ7bdrMduXuKhFIVsjlJCGXlyKa7h+JmEpPkqnELGiThvi
+hvWogpYt6S6/ofw13MAAgkDqgsfhUGH8tmPu8ufYQn2QQTjB7y1X+s+DUPBUYlic
+Ds29YvGMp3wesMFppfwygtGtBFxxs7zvuz3aq9Putu1xC9q3dtHOPdxZYyLvz/aJ
+F6BfOqk3NP0a6/S9TphgxE9CqYz2RIqRQg91IbPPrEiC8Sm3fLgX0fO1kfVN7x0E
+Pg5+3M56UVflcWLsIcjDVYK4EId4XLHBTjFn8xhkEj56UJQsjb9fFbdQQBBI5pWM
+G2nxoGdHD/GCOjZi2f393OMIDFbfoIaoz4L4osIFYaIg4sMrIy2oUOEwnqyLEVf2
+tQ58ysC7SDVZza4jai5QXuTCHyMcHYf9BxuzIHEViquI0y19QvlMW17effUctfow
+8a0sqCYr0KczggsaOR9BdAgHpSeoCM7SxkQd+j55iX/w7Det8JUvHoCSHRPwM0ar
+QiAncEtdKYyU/vz25feTh/crDH1OB4umZIatPVJFr7samb1McocSI5/AxQ5YSkRT
+BYyFj6Yi5D0jgmob4+t96Ub0UnWinXk+V6CeTEzgSE6/FYlEb+PqibWAhDfEWG+7
+0oG58ajt2vOzbGytDE9RV48HzLoUoWEaNDoa51viuJhpSmRii4CrBj+ENvber2GR
+qOM7bMcmicqUvegN9cB+9ZiIzWVePVvI/1NRvypqjXJVE99AD3GyRd5fuC0Vo4VQ
+xdaZuk6ysWBldUcFVUCDzr32FWaxKe6cGZbjRtS/u6rDJ8DEJzvm7FcgcLj80qrd
+mGrAMUafAfe+FrHSiMits/pUjzwiZqjsQeVIlULUgxQGeLVoERV7InkooBqxVOpI
+R63O9zMjEZgkf7yhD8nOrw1fLO08D/eOud2yL5EhXUMWQmjnmBYDog/M1IRu13ba
+L4qeddYh0cgHID8DjhjaY+g8VKiikgRO0d59xAkzHrMk4MS1l27xOz8=
+-----END ENCRYPTED PRIVATE KEY-----

bin/gen/Release/public-0.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsop6ceQNJeWYjourIu2Z
+QydUFJwm3kwqXvoAiYP+NeLEyR9OET0eBRwowKDbFzdfDyCXcfJAbsRBoQ1he8Bw
+dXcGZqs+QNcnoBz0Vl/uaxOXpVSN5RYj6wo0IFQ/nrR+gMTmzHut8ohtXI4n4a0C
+7OVMfwoR2uJyLMLTQiHekEsLvraMnRcS5FbqIq2yUuVYCfGvU3Y2xo1jsvIkko7W
+uF/Lw7LFCeruZ1hRYDLGa/HnKepdLhGXoh7lDQuagsUg510PVRGru4G50ATqKVTa
+IwcvWNeF0BWjC78uBIhk5G65ZI/HRsS4MQvu3UwrTvtp6d9tTNOT9wixpfD1UtBr
+qwIDAQAB
+-----END PUBLIC KEY-----

script/setup.sh

@@ -45,9 +45,6 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r setup/dynamic_libraries/windows/app/Debug/* bin/app/Debug
 	cp -u -r setup/dynamic_libraries/windows/app/Release/* bin/app/Release
 
-	cp -u -r setup/dynamic_libraries/windows/test/Debug/* bin/test/Debug
-	cp -u -r setup/dynamic_libraries/windows/test/Release/* bin/test/Release
-
 	echo -e $INFO "copy test_main file"
 	cp -u setup/cxx_test/windows/test_main.cpp build
 

src/lib_license/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_files(
-	GEN_FILES
+	LIB_LICENSE_FILES
 
 	Generator.cpp
 	Generator.h

src/license_generator/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_files(
+	LICENSE_GENERATOR_FILES
+
+	main.cpp
+)