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 fe9bffdbb741a9ef81869af9ae549fc03ab9eac8 Author: Raimund Hocke <[email protected]> Date: Sun Feb 23 15:27:30 2014 +0100 revised collectJars and added Windows version (not yet tested) --- collectJars | 2 +- collectJars.bat | 85 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/collectJars b/collectJars index a77d3cc..f1c06a9 100755 --- a/collectJars +++ b/collectJars @@ -1,6 +1,6 @@ #!/bin/sh -version=1.1.0 mversion=1.1 +version=$mversion.0 base=`pwd` echo ----------------- SikuliX collecting jars in $base diff --git a/collectJars.bat b/collectJars.bat index e2faa12..e75eda7 100644 --- a/collectJars.bat +++ b/collectJars.bat @@ -1,54 +1,57 @@ @echo off setlocal +set mversion=1.1 +set sversion=%mversion%.0 + set base=%~dp0 echo SourceBase %base% -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") -set setup=Basics -set jython=Jython -set api=API -set ide=IDE +echo ----------------- SikuliX collecting jars in $base -set mversion=1.1 -set sversion=%mversion%.0 -set version=%sversion%-Beta1 +set source=%base%/Setup/target + +set dist=%base%/../SikuliX-Setup +REM if [ -e $dist ]; then +REM rm -f -R $dist +REM fi +REM mkdir $dist +REM mkdir $dist/Downloads -set dist=%base%\..\Build -if not exist %dist% (mkdir %dist%) +set log=%dist%/collectjars-log.txt + +echo --- version --- %version% +echo --- major version --- %mversion% +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% REM ----------- Setup -echo --- make Setup +echo --- collecting jars +echo --- collecting jars >>%log% +cd %source% >>%log% +java -jar sikulixsetup-%version%-plain.jar noSetup >>%log% cd %base% -call mvn -f Basics\setup* -copy Basics\target-setup\sikulixsetup-%version%-plain.jar %dist%\sikulixsetup-%mversion%.jar - -if "%1%" == "setup" (goto FINALLY) - REM ----------- API - echo --- make API - cd %base% - call mvn -f API\api* - copy API\target-api\%version%-api-plain.jar %dist%\%version%-2.jar - - REM ----------- SikuliX - echo --- make SikuliX - cd %base% - call mvn -f IDE\ide* - copy IDE\target-ide\%version%-ide-plain.jar %dist%\%version%-1.jar - - REM ----------- MacApp - echo --- make MacApp - cd %base% - copy MacApp\target\*.jar %dist% - - REM ----------- Tesseract - echo --- make Tesseract - cd %base% - copy Tesseract\target\*.jar %dist% - - REM ----------- Remote - echo --- make Remote - cd %base% - copy Remote\target\SikuliX-Remote-%sversion%.jar %dist%\%version%-3.jar +dir %source% >>%log% + +REM ----------- Setup +echo --- copy Setup +echo --- copy Setup >>%log% +cp %source%/sikulixsetup*.jar %dist%/sikulixsetup-%mversion%.jar +dir $dist >>$log + +REM ----------- Jars +echo --- copy Jars +echo --- copy Jars >>%log% +cp %source%/Downloads/* %dist%/Downloads +dir %dist%/Downloads >>%log% + +echo ----------- final content of %dist% +dir $dist +dir $dist/Downloads +echo ----------- SikuliX collectjars end ----------- :FINALLY endlocal \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
