[sikuli] 289/385: collectjars: added option to skip step 1 (BUILD) and step 2 (PACK)

[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 577bc4aec090e9ebd8205f3ddeb3c5836e09a269
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Feb 24 11:22:15 2014 +0100

    collectjars: added option to skip step 1 (BUILD) and step 2 (PACK)
---
 collectJars     | 22 +++++++++++++---------
 collectJars.bat |  7 ++++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/collectJars b/collectJars
index f1c06a9..b804e69 100755
--- a/collectJars
+++ b/collectJars
@@ -22,16 +22,20 @@ echo --- version --- $version >>$log
 echo --- major version --- $mversion >>$log
 
 echo ----------------- SourceBase $base >>$log
-echo ----------------- running Maven clean install --- takes some time ...
-mvn clean install >>$log
+if [ "$1" != "2" -a "$1" != "3" ]; then
+  echo ----------------- running Maven clean install --- takes some time ...
+  mvn clean install >>$log
+fi
 
-# ----------- Setup
-echo --- collecting jars
-echo --- collecting jars >>$log
-cd $source >>$log
-java -jar sikulixsetup-$version-plain.jar noSetup >>$log
-cd $base
-ls -l $source >>$log
+if [ "$1" != "3" ]; then
+  # ----------- Setup
+  echo --- collecting jars
+  echo --- collecting jars >>$log
+  cd $source >>$log
+  java -jar sikulixsetup-$version-plain.jar noSetup >>$log
+  cd $base
+  ls -l $source >>$log
+fi
 
 # ----------- Setup
 echo --- copy Setup
diff --git a/collectJars.bat b/collectJars.bat
index 13c8697..8db2807 100644
--- a/collectJars.bat
+++ b/collectJars.bat
@@ -24,9 +24,13 @@ echo --- version --- %version% >%log%
 echo --- major version --- %mversion% >>%log%
 
 echo ----------------- SourceBase %base% >>%log%
+
+if "%1" == "2" goto :NOBUILD
+if "%1" == "3" goto :NOPACK
 echo ----------------- running Maven clean install --- takes some time ...
 call mvn clean install >>%log%
 
+:NOBUILD
 REM ----------- Setup
 echo --- collecting jars
 echo --- collecting jars >>%log%
@@ -35,10 +39,11 @@ java -jar sikulixsetup-%version%-plain.jar noSetup >>%log%
 cd %base%
 dir %source% >>%log%
 
+:NOPACK
 REM ----------- Setup
 echo --- copy Setup
 echo --- copy Setup >>%log%
-copy %source%\sikulixsetup*.jar %dist%\sikulixsetup-%mversion%.jar >>%log%
+copy %source%\sikulixsetup-%version%-plain.jar %dist%\sikulixsetup-%mversion%.jar >>%log%
 dir %dist% >>%log%
 
 REM ----------- Jars

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