3rd Test Travis

APN-Pucky · Feb 19, 2018 · 79a4b5b · 79a4b5b
1 parent 69a7a88
commit 79a4b5b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,9 +30,9 @@ deploy:
     secure: vKTCOsNwCpSzB2buiNSroCvhAR5xHv86L7YDa09A3Y4oZ/grFmcARQKFkjG/zJif+4gpHmrscUJIC4Ru9900QQSVP/mUh5NizPFpoQHHQBbRPOFoor0W0lSXhsFMA154sHICDQ7ZZhZbF8s804VL+JsmAblFqJ0XWNtLD9f0ElklEIELYdhVGDipXhWnIqA3TfG6ztm9KjMXZ3pfPRMf/l4D0t7ISHfzfX07O257ppH83DAEs1aJElG3kxDJiEWoi6k9fq7SIYXbFhmwj6aM3K//qj9ZxIhFwRLaEb8l2zOXj3hNtDGGg99P5Dz7UeDy7l/+eWOgIMBJLe1Ck9AbIYivnOychYxVn/wp56SbbaT1ZsNbgLQxygqc0/btfi2lrT9c0T6db+A9LSGOWvGk3n1pOPOMNE3wvOk7dhLfbA2azFDMoPswW7Hvad0ZQYkBg1TJK7gmChb5FYQtypZzA0CzJaw+r1z7d4a7mF7cAkZmGuM+/BbdmsX9AxYcazJAvsxgHmLnFSunKsw0B3kQ6l9DJmli7w4qi4kdjHGpxQCQ6ocqHmDMvFa85ejhvPjJDvYdyxltC1d5Jq+jxFL91d+2ZMGYdgptR05I0Dc9ApUcItv7NNbY8fNPWJT7AXAlY999bRt9Rz//JvSHUHstn5cc1s0ee6NGRTmiD5oAkuc=
   file:
     - "${TUO_FILE_32}"
-      #- "${TUO_FILE_32_DEBUG}"
+    - "${TUO_FILE_32_DEBUG}"
     - "${TUO_FILE_64}"
-      #- "${TUO_FILE_64_DEBUG}"
+    - "${TUO_FILE_64_DEBUG}"
     - "${TUO_FILE_ZIP}"
   skip_cleanup: true
   on:

diff --git a/build/windows/build.sh b/build/windows/build.sh
@@ -6,26 +6,26 @@ MXE_DIR=/usr/lib/mxe
 
 MXE_TARGET=i686-w64-mingw32.static
 
-${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir32-debug -DVERSION:STRING="${TRAVIS_TAG}--debug" -DDEBUG:STRING=""
+${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir32-debug -DVERSION:STRING="${TRAVIS_TAG}--debug"
+sed -i -e 's/-DNDEBUG//g' build-dir32-debug/CMakeCache.txt
 cmake --build build-dir32-debug 
-#mv build-dir32-debug/tuo.exe $TUO_FILE_32_DEBUG
-mv build-dir32-debug/tuo.exe $TUO_FILE_32
+mv build-dir32-debug/tuo.exe $TUO_FILE_32_DEBUG
 
-#${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir32 -DVERSION:STRING="${TRAVIS_TAG}" -DDEBUG:STRING="-DNDEBUG"
-#cmake --build build-dir32 
-#mv build-dir32/tuo.exe $TUO_FILE_32
+${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir32 -DVERSION:STRING="${TRAVIS_TAG}"
+cmake --build build-dir32 
+mv build-dir32/tuo.exe $TUO_FILE_32
 
 
 
 MXE_TARGET=x86_64-w64-mingw32.static
 
-${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir64-debug -DVERSION:STRING="${TRAVIS_TAG}--debug" -DDEBUG:STRING=""
+${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir64-debug -DVERSION:STRING="${TRAVIS_TAG}--debug"
+sed -i -e 's/-DNDEBUG//g' build-dir64-debug/CMakeCache.txt
 cmake --build build-dir64-debug 
-#mv build-dir64-debug/tuo.exe $TUO_FILE_64_DEBUG
-mv build-dir64-debug/tuo.exe $TUO_FILE_64
+mv build-dir64-debug/tuo.exe $TUO_FILE_64_DEBUG
 
-#${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir64 -DVERSION:STRING="${TRAVIS_TAG}" -DDEBUG:STRING="-DNDEBUG"
-#cmake --build build-dir64 
-#mv build-dir64/tuo.exe $TUO_FILE_64
+${MXE_DIR}/usr/bin/${MXE_TARGET}-cmake . -Bbuild-dir64 -DVERSION:STRING="${TRAVIS_TAG}"
+cmake --build build-dir64 
+mv build-dir64/tuo.exe $TUO_FILE_64
 
 set +xue
diff --git a/build/windows/package.sh b/build/windows/package.sh
@@ -11,7 +11,7 @@ export TUO_FILE_ZIP="tuo.${TRAVIS_TAG}_32+64_bit.zip"
 
 #ls -la
 
-zip -r "$TUO_FILE_ZIP" data/ SimpleTUOptimizeStarter.ahk SimpleTUOptimizeStarter.exe "$TUO_FILE_32" "$TUO_FILE_64" #"$TUO_FILE_32_DEBUG" "$TUO_FILE_64_DEBUG" 
+zip -r "$TUO_FILE_ZIP" data/ SimpleTUOptimizeStarter.ahk SimpleTUOptimizeStarter.exe "$TUO_FILE_32" "$TUO_FILE_64" "$TUO_FILE_32_DEBUG" "$TUO_FILE_64_DEBUG"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,7 @@ export TUO_FILE_ZIP="tuo.${TRAVIS_TAG}_32+64_bit.zip"

		#ls -la

		zip -r "$TUO_FILE_ZIP" data/ SimpleTUOptimizeStarter.ahk SimpleTUOptimizeStarter.exe "$TUO_FILE_32" "$TUO_FILE_64" #"$TUO_FILE_32_DEBUG" "$TUO_FILE_64_DEBUG"
		zip -r "$TUO_FILE_ZIP" data/ SimpleTUOptimizeStarter.ahk SimpleTUOptimizeStarter.exe "$TUO_FILE_32" "$TUO_FILE_64" "$TUO_FILE_32_DEBUG" "$TUO_FILE_64_DEBUG"



Expand Down