WIP automatic deployment

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index f8c50e5bed7fa213b2f13d49818319c3729df373..76a97f1c7fe69487c7bf50a9cd961905c4e64b4b 100644 (file)
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -123,6 +123,12 @@ endif()
 set( CTEST_SOURCE_DIRECTORY    "$ENV{OPJ_SOURCE_DIR}")
 set( CTEST_BINARY_DIRECTORY    "${CTEST_DASHBOARD_ROOT}")
 
+#----------------------
+# Package parameters in case of deployment
+# Might add more parameters later on
+set( CPACK_GENERATOR "ZIP" )
+
+
 #---------------------
 # Files to submit to the dashboard
 set (CTEST_NOTES_FILES
@@ -147,5 +153,9 @@ endif()
 if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1")
        ctest_submit()
 endif()
+# # Generate package if deployment
+# if( "$ENV{OPJ_CI_DEPLOY}" STREQUAL "1")
+#      ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET "package")
+# endif()
 # Do not clean, we'll parse the log for known failure
 #ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" )

diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index 7c325ce10ffd5da8da0dad66ca873fa8aeec89e3..0e77c965808d17a177451e8350504ae803c8f753 100755 (executable)
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -193,7 +193,7 @@ set +x
 #if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ [ "${TRAVIS_TAG:-}" != "" ] || [ "${APPVEYOR_REPO_TAG:-}" == "true" ] ]; then
 if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ]; then
        OPJ_CI_DEPLOY=1
-       cmake --build ${OPJ_BINARY_DIR} --target package -D CPACK_GENERATOR:STRING="ZIP"
+       cmake --build ${OPJ_BINARY_DIR} --target package
        echo "ready to deploy $(ls ${OPJ_BINARY_DIR}/openjpeg*.zip) to GitHub releases"
        if [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then
                appveyor PushArtifact "${OPJ_BINARY_DIR}/openjpeg-*.zip"