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 16339392b9b2ddcb93e7a45981112eb8d07715ce Author: Raimund Hocke <[email protected]> Date: Sun Feb 23 14:56:29 2014 +0100 the top-level script to produce the stuff that is ready for upload to launchpad (can directly be used to setup stuff locally) --- .../src/main/java/org/sikuli/basics/RunSetup.java | 13 ++- collectJars | 93 ++++++++-------------- 2 files changed, 43 insertions(+), 63 deletions(-) diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java index 967a5a5..2abd541 100644 --- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java +++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java @@ -33,6 +33,7 @@ public class RunSetup { private static boolean runningUpdate = false; private static boolean isUpdateSetup = false; private static boolean runningfromJar = true; + private static boolean noSetup = false; private static String workDir; private static String uhome; private static String logfile; @@ -166,6 +167,11 @@ public class RunSetup { options.remove(0); } + if (args.length > 0 && "noSetup".equals(args[0])) { + noSetup = true; + options.remove(0); + } + if (args.length == 1 && "keyboardsetup".equals(args[0].toLowerCase())) { String dir = System.getProperty("user.dir"); String jar = "sikulixapi.jar"; @@ -325,13 +331,13 @@ public class RunSetup { if (runningJar.endsWith("-plain.jar")) { localSetup = runningJar; projectDir = new File(workDir).getParentFile().getParentFile().getAbsolutePath(); - if (!popAsk("Setup seems to be running in Maven project structure\n" + if (!noSetup && !popAsk("Setup seems to be running in Maven project structure\n" + projectDir + " --- Continue?")) { System.exit(0); } File fDownloads = new File(workDir, "Downloads"); Debug.log(3, "projectDir: " + projectDir); - String ideFat = downloadIDE.replace(".jar", "-plain.jar"); + String ideFat = downloadIDE.replace(".jar", "-ide-fat.jar"); String apiFat = downloadJava.replace(".jar", "-plain.jar"); String jythonFat = downloadJython.replace(".jar", "-plain.jar"); String jrubyFat = downloadJRuby.replace(".jar", "-plain.jar"); @@ -399,6 +405,9 @@ public class RunSetup { doit = false; } } + if (noSetup) { + System.exit(0); + } if (!doit) { popError("Some artifacts are missing or could not be copied.\n" + "Check folder " + fDownloads + "\n" diff --git a/collectJars b/collectJars index 444a3a9..a77d3cc 100755 --- a/collectJars +++ b/collectJars @@ -1,79 +1,50 @@ #!/bin/sh -base=`pwd` -echo SourceBase $base +version=1.1.0 +mversion=1.1 -mrepo=~/.m2/repository/org/sikuli +base=`pwd` +echo ----------------- SikuliX collecting jars in $base -setup=Basics -jython=Jython -api=API -ide=IDE +source=$base/Setup/target -dist=$base/../Build +dist=$base/../SikuliX-Setup if [ -e $dist ]; then rm -f -R $dist fi mkdir $dist +mkdir $dist/Downloads -log=$dist/log.txt - -echo "--- creating version info" -echo "--- creating version info" >$log -cd $base/$setup -mvn clean compile >>$log -version=`java -cp $base/$setup/target/classes org.sikuli.basics.RunSetup version` -mversion=`java -cp $base/$setup/target/classes org.sikuli.basics.RunSetup majorversion` -uversion=`java -cp $base/$setup/target/classes org.sikuli.basics.RunSetup updateversion` +log=$dist/collectjars-log.txt echo --- version --- $version echo --- major version --- $mversion -echo --- update version --- $uversion echo --- version --- $version >>$log echo --- major version --- $mversion >>$log -echo --- update version --- $uversion >>$log -# ----------- Basics -echo --- Basics timestamp -echo --- BUILD Basics timestamp >>$log -cd $base/$setup -src=$base/$setup/src/main/java/org/sikuli/basics/RunSetup.java -out=$base/$setup/src/main/java/org/sikuli/basics/RunSetupX.java -xdd=`date` -sed "s/##--##.*##--##/##--##$xdd##--##/" $src >$out -mv -f $out $src -mvn install >>$log +echo ----------------- SourceBase $base >>$log +echo ----------------- running Maven clean install --- takes some time ... +mvn clean install >>$log + # ----------- Setup -echo --- make Setup +echo --- collecting jars +echo --- collecting jars >>$log +cd $source >>$log +java -jar sikulixsetup-$version-plain.jar noSetup >>$log cd $base -mvn -f Basics/setup* >>$log -cp Basics/target-setup/sikulixsetup*.jar $dist/sikulixsetup-$mversion.jar +ls -l $source >>$log -if [ "$1" != "setup" ]; then - # ----------- API - echo --- make API - cd $base - mvn -f API/api* >>$log - cp API/target-api/*api-plain.jar $dist/$version-2.jar - - # ----------- SikuliX - echo --- make SikuliX - cd $base - mvn -f IDE/ide* >>$log - cp IDE/target-ide/*ide-plain.jar $dist/$version-1.jar - - # ----------- MacApp - echo --- make MacApp - cd $base - cp MacApp/target/*.jar $dist - - # ----------- Tesseract - echo --- make Tesseract - cd $base - cp Tesseract/target/*.jar $dist - - # ----------- Remote - echo --- make Remote - cd $base - cp Remote/target/*.jar $dist/$version-3.jar -fi -grep -i BUILD $log +# ----------- Setup +echo --- copy Setup +echo --- copy Setup >>$log +cp $source/sikulixsetup*.jar $dist/sikulixsetup-$mversion.jar +ls -l $dist >>$log + +# ----------- Jars +echo --- copy Jars +echo --- copy Jars >>$log +cp $source/Downloads/* $dist/Downloads +ls -l $dist/Downloads >>$log + +echo ----------- final content of $dist +ls -lR $dist +echo ----------- SikuliX collectjars end ----------- -- 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
