Merge pull request #103 from evolvedbinary/6.x.x/hotfix/simple-build-script

[6.x.x] Improvements to the Simple Build Script

Author: adamretter

build.bat

@@ -28,19 +28,24 @@
 setlocal enabledelayedexpansion
 
 set "TARGET=useage"
+set "DEBUG=false"
 set "OFFLINE=false"
 set "CONCURRENCY=-T2C"
 
 :: Process arguments
 :parse_args
 if "%~1"=="" goto done_parsing
 
-if /I "%~1"=="--offline" (
+if /I "%~1"=="--debug" (
+    set "DEBUG=true"
+) else if /I "%~1"=="--offline" (
     set "OFFLINE=true"
 ) else if /I "%~1"=="--help" (
     set "TARGET=useage"
 ) else if /I "%~1"=="-h" (
     set "TARGET=useage"
+) else if /I "%~1"=="clean" (
+    set "TARGET=clean"
 ) else if /I "%~1"=="quick" (
     set "TARGET=quick"
 ) else if /I "%~1"=="quick-archives" (
@@ -69,6 +74,10 @@ goto parse_args
 
 :done_parsing
 
+if "%DEBUG%"=="true" (
+    set "BASE_CMD=%BASE_CMD% --debug"
+)
+
 if "%OFFLINE%"=="true" (
     set "BASE_CMD=%BASE_CMD% --offline"
 )
@@ -82,10 +91,12 @@ set "SCRIPT_DIR=%~dp0"
 set "BASE_CMD=%SCRIPT_DIR%\mvnw.cmd -V"
 
 :: Set CMD based on TARGET
-if "%TARGET%"=="quick" (
+if "%TARGET%"=="clean" (
+    set "CMD=%BASE_CMD% %CONCURRENCY% clean -Pinstaller,docker,concurrency-stress-tests,micro-benchmarks"
+) else if "%TARGET%"=="quick" (
     set "CMD=%BASE_CMD% %CONCURRENCY% clean package -DskipTests -Ddependency-check.skip=true -Dappbundler.skip=true -Ddocker=false -P !mac-dmg-on-mac,!codesign-mac-app,!codesign-mac-dmg,!mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives"
 ) else if "%TARGET%"=="quick-archives" (
-    set "CMD=%BASE_CMD% %CONCURRENCY% clean package -DskipTests -Ddependency-check.skip=true -Ddocker=true -P installer,!concurrency-stress-tests,!micro-benchmarks"
+    set "CMD=%BASE_CMD% %CONCURRENCY% clean package -DskipTests -Ddependency-check.skip=true -Ddocker=false -P installer,!concurrency-stress-tests,!micro-benchmarks"
 ) else if "%TARGET%"=="quick-docker" (
     set "CMD=%BASE_CMD% %CONCURRENCY% clean package -DskipTests -Ddependency-check.skip=true -Dappbundler.skip=true -Ddocker=true -P docker,!mac-dmg-on-mac,!codesign-mac-app,!codesign-mac-dmg,!mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives"
 ) else if "%TARGET%"=="quick-archives-docker" (
@@ -115,9 +126,10 @@ goto end
 
 :show_useage
 echo.
-echo Usage: build.bat [--offline] ^<target^> ^| --help
+echo Usage: build.bat [--debug] [--offline] ^<target^> ^| --help
 echo.
 echo Available build targets:
+echo    clean                       - Remove all built artifacts
 echo    quick                       - Build distribution directory
 echo    quick-archives              - Build and archive distribution
 echo    quick-docker                - Build distribution + Docker image

build.sh

@@ -99,7 +99,7 @@ if [ "${OFFLINE}" == "true" ]; then
 fi
 
 if [ "${TARGET}" == "clean" ]; then
-  CMD="${BASE_CMD} ${CONCURRENCY} clean"
+  CMD="${BASE_CMD} ${CONCURRENCY} clean -Pinstaller,docker,concurrency-stress-tests,micro-benchmarks"
   $CMD
   exit 0;
 fi
@@ -111,7 +111,7 @@ if [ "${TARGET}" == "quick" ]; then
 fi
 
 if [ "${TARGET}" == "quick-archives" ]; then
-  CMD="${BASE_CMD} ${CONCURRENCY} clean package -DskipTests -Ddependency-check.skip=true -Ddocker=true -P installer,!concurrency-stress-tests,!micro-benchmarks"
+  CMD="${BASE_CMD} ${CONCURRENCY} clean package -DskipTests -Ddependency-check.skip=true -Ddocker=false -P installer,!concurrency-stress-tests,!micro-benchmarks"
   $CMD
   exit 0;
 fi