From fb0b523d8836403ff8cf4212a31e59e277af5ccf Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Fri, 17 Jul 2015 06:20:39 +0000 Subject: [PATCH] automated build for Kinniburgh git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10004 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- vs2010-32.cmake | 39 +++++++++++++++++++++++++++++++++++++++ vs2010-64.cmake | 39 +++++++++++++++++++++++++++++++++++++++ vs2010.bat | 17 +++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 vs2010-32.cmake create mode 100644 vs2010-64.cmake create mode 100644 vs2010.bat diff --git a/vs2010-32.cmake b/vs2010-32.cmake new file mode 100644 index 00000000..d6d83959 --- /dev/null +++ b/vs2010-32.cmake @@ -0,0 +1,39 @@ +set(CTEST_BUILD_NAME "VS2010-x64-fortran") +set(CTEST_SITE "IGSKAHHWWSCHARL") + +set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}") +set(CTEST_BINARY_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/_vs2010-32") +set(CTEST_CMAKE_GENERATOR "Visual Studio 10 2010") + +# Build Fortran test (First build option can't have any beginning whitespace) +set(ADD_BUILD_OPTIONS "-DIPHREEQC_FORTRAN_TESTING:BOOL=ON") + +# Build Shared Libraries +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF") + +# Build the testing tree +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON") + +# Enable Fortran module +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DIPHREEQC_ENABLE_MODULE:BOOL=ON") + +# CMAKE_INSTALL_PREFIX +set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${CTEST_SCRIPT_DIRECTORY}/_vs2010-64/INSTALL") + +set(BUILD_OPTIONS -DCMAKE_INSTALL_PREFIX:PATH=${CTEST_SCRIPT_DIRECTORY}/vs2010 + -DIPHREEQC_FORTRAN_TESTING:BOOL=ON + -DIPHREEQC_STATIC_RUNTIME:BOOL=ON) + +CTEST_START("Experimental") +CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" + OPTIONS "${BUILD_OPTIONS}") +CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}") +CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}") +CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET INSTALL) +###CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET PACKAGE) + +##set (EXECUTE_COMMAND C:\\Program Files\\7-Zip\\7z a ..\\..\\${CPACK_PACKAGE_NAME}-$ENV{CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}.7z) +##set (EXECUTE_COMMAND C:\\Program Files\\7-Zip\\7z a ..\\..\\${CPACK_PACKAGE_NAME}-$ENV{CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}.7z) +##execute_process(COMMAND ${EXECUTE_COMMAND} +## WORKING_DIRECTORY ${CTEST_SCRIPT_DIRECTORY}/_vs2010-64/INSTALL) +###CTEST_SUBMIT() \ No newline at end of file diff --git a/vs2010-64.cmake b/vs2010-64.cmake new file mode 100644 index 00000000..75491871 --- /dev/null +++ b/vs2010-64.cmake @@ -0,0 +1,39 @@ +set(CTEST_BUILD_NAME "VS2010-x64-fortran") +set(CTEST_SITE "IGSKAHHWWSCHARL") + +set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}") +set(CTEST_BINARY_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/_vs2010-64") +set(CTEST_CMAKE_GENERATOR "Visual Studio 10 2010 Win64") + +# Build Fortran test (First build option can't have any beginning whitespace) +set(ADD_BUILD_OPTIONS "-DIPHREEQC_FORTRAN_TESTING:BOOL=ON") + +# Build Shared Libraries +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF") + +# Build the testing tree +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON") + +# Enable Fortran module +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DIPHREEQC_ENABLE_MODULE:BOOL=ON") + +# CMAKE_INSTALL_PREFIX +set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${CTEST_SCRIPT_DIRECTORY}/_vs2010-64/INSTALL") + +set(BUILD_OPTIONS -DCMAKE_INSTALL_PREFIX:PATH=${CTEST_SCRIPT_DIRECTORY}/vs2010 + -DIPHREEQC_FORTRAN_TESTING:BOOL=ON + -DIPHREEQC_STATIC_RUNTIME:BOOL=ON) + +CTEST_START("Experimental") +CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" + OPTIONS "${BUILD_OPTIONS}") +CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}") +CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}") +CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET INSTALL) +###CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET PACKAGE) + +##set (EXECUTE_COMMAND C:\\Program Files\\7-Zip\\7z a ..\\..\\${CPACK_PACKAGE_NAME}-$ENV{CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}.7z) +##set (EXECUTE_COMMAND C:\\Program Files\\7-Zip\\7z a ..\\..\\${CPACK_PACKAGE_NAME}-$ENV{CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}.7z) +##execute_process(COMMAND ${EXECUTE_COMMAND} +## WORKING_DIRECTORY ${CTEST_SCRIPT_DIRECTORY}/_vs2010-64/INSTALL) +###CTEST_SUBMIT() \ No newline at end of file diff --git a/vs2010.bat b/vs2010.bat new file mode 100644 index 00000000..1a7ae57d --- /dev/null +++ b/vs2010.bat @@ -0,0 +1,17 @@ +@echo off + +REM 64-bit +rd /s /q _vs2010-64 +ctest -S vs2010-64.cmake -C Release -VV -O vs2010-Release-64.log +ctest -S vs2010-64.cmake -C Debug -VV -O vs2010-Debug-64.log + +REM 32-bit +rd /s /q _vs2010-32 +ctest -S vs2010-32.cmake -C Release -VV -O vs2010-Release-32.log +ctest -S vs2010-32.cmake -C Debug -VV -O vs2010-Debug-32.log + +REM 7zip +set NAME=%cd% +for %%f in (%NAME%) do set NAME=%%~nxf-vs2010 +ren vs2010 %NAME% +"C:\Program Files\7-Zip\7z" a %NAME%.7z %NAME%