[sikuli] 292/385: added detection of build failure in Maven run

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 104d7c3944aea4ec349bfac27e8720672e198dae
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Feb 24 15:06:42 2014 +0100

    added detection of build failure in Maven run
---
 collectJars.bat | 30 +++++++++++++++++++++++-------
 ide-fat.xml     | 16 ++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/collectJars.bat b/collectJars.bat
index 8db2807..bfbd6ac 100644
--- a/collectJars.bat
+++ b/collectJars.bat
@@ -5,7 +5,9 @@ set version=%mversion%.0
 
 set base=%~dp0
 
-echo ----------------- SikuliX collecting jars in %base% 
+echo -
+echo ---
+echo ----- SikuliX collecting jars in %base% 
 
 set source=%base%Setup\target
 
@@ -18,19 +20,33 @@ md %dist%\Downloads
 
 set log=%dist%\collectjars-log.txt
 
-echo --- version --- %version%
-echo --- major version --- %mversion%
+echo --- version %version%
+echo --- major   %mversion%
 echo --- version --- %version% >%log%
 echo --- major version --- %mversion% >>%log%
 
 echo ----------------- SourceBase %base% >>%log%
 
-if "%1" == "2" goto :NOBUILD
-if "%1" == "3" goto :NOPACK
+if "%1" == "2" goto :RUNPACK
+if "%1" == "3" goto :RUNSETUP
 echo ----------------- running Maven clean install --- takes some time ...
 call mvn clean install >>%log%
 
-:NOBUILD
+find "BUILD FAILURE" %log% | findstr /C:"BUILD FAILURE" >nul
+if %ERRORLEVEL% GEQ 1 goto RUNPACK
+  echo -
+  echo --
+  echo ----
+  echo ------
+  echo -------- BUILD ERROR -----------
+  echo at least one module had problems
+  echo check the logfile
+  echo %log%
+  echo correct the problems and run again
+  echo ----------------------------------
+  goto FINALLY
+
+:RUNPACK
 REM ----------- Setup
 echo --- collecting jars
 echo --- collecting jars >>%log%
@@ -39,7 +55,7 @@ java -jar sikulixsetup-%version%-plain.jar noSetup >>%log%
 cd %base%
 dir %source% >>%log%
 
-:NOPACK
+:RUNSETUP
 REM ----------- Setup
 echo --- copy Setup
 echo --- copy Setup >>%log%
diff --git a/ide-fat.xml b/ide-fat.xml
index 88a26e5..a685546 100644
--- a/ide-fat.xml
+++ b/ide-fat.xml
@@ -14,7 +14,23 @@
       </excludes>
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
+      <unpackOptions>
+        <excludes>
+          <exclude>**/idesupport/*</exclude>
+          <exclude>**/scriptrunner/*</exclude>
+        </excludes>
+      </unpackOptions>
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>
+<!-- does not work on Windows
+  <fileSets>
+    <fileSet>
+      <excludes>
+        <exclude>**/idesupport/*</exclude>
+        <exclude>**/scriptrunner/*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+-->
 </assembly>
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git