This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 20952875a3fffa798edf3884e99050eff815374a Author: Gilles Filippini <[email protected]> Date: Sun Nov 3 23:40:08 2013 +0100 Declare classpath in jars. Only the classpath for not yet mavenized dependencies have to be kept into the wrappers. --- debian/patches/add-classpath.patch | 91 +++++++++++++++++++++++ debian/patches/basics-exclude-windows-mac.patch | 6 +- debian/patches/preserve-source-utf-8.patch | 6 +- debian/patches/series | 1 + debian/tmp.poms | 10 +-- debian/wrappers/sikuli | 2 +- debian/wrappers/sikuli-ide | 2 +- 7 files changed, 105 insertions(+), 13 deletions(-) diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch new file mode 100644 index 0000000..8b70493 --- /dev/null +++ b/debian/patches/add-classpath.patch @@ -0,0 +1,91 @@ +Description: Configure maven-jar-plugin to add the classpath to the generated + jar files. +Author: Gilles Filippini <[email protected]> +Index: sikuli/pom.xml +=================================================================== +--- sikuli.orig/pom.xml 2013-11-03 22:14:07.000000000 +0100 ++++ sikuli/pom.xml 2013-11-03 22:14:07.000000000 +0100 +@@ -45,5 +45,23 @@ + + <build> + <finalName>sikulix</finalName> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>2.3.1</version> ++ <configuration> ++ <archive> ++ <manifest> ++ <addClasspath>true</addClasspath> ++ <classpathLayoutType>repository</classpathLayoutType> ++ <classpathPrefix>/usr/share/maven-repo</classpathPrefix> ++ </manifest> ++ </archive> ++ </configuration> ++ </plugin> ++ </plugins> ++ </pluginManagement> + </build> + </project> +Index: sikuli/api/pom.xml +=================================================================== +--- sikuli.orig/api/pom.xml 2013-11-03 22:14:07.000000000 +0100 ++++ sikuli/api/pom.xml 2013-11-03 22:14:07.000000000 +0100 +@@ -80,6 +80,10 @@ + + <plugins> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ </plugin> ++ <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> +Index: sikuli/basics/pom.xml +=================================================================== +--- sikuli.orig/basics/pom.xml 2013-11-03 22:14:07.000000000 +0100 ++++ sikuli/basics/pom.xml 2013-11-03 22:14:07.000000000 +0100 +@@ -113,6 +113,10 @@ + + <plugins> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ </plugin> ++ <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> +Index: sikuli/ide/pom.xml +=================================================================== +--- sikuli.orig/ide/pom.xml 2013-11-03 22:14:07.000000000 +0100 ++++ sikuli/ide/pom.xml 2013-11-03 22:14:07.000000000 +0100 +@@ -153,6 +153,10 @@ + + <plugins> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ </plugin> ++ <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> +Index: sikuli/jython/pom.xml +=================================================================== +--- sikuli.orig/jython/pom.xml 2013-11-03 22:14:07.000000000 +0100 ++++ sikuli/jython/pom.xml 2013-11-03 22:14:07.000000000 +0100 +@@ -73,6 +73,10 @@ + + <plugins> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ </plugin> ++ <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch index 0a5d7a1..b953a8d 100644 --- a/debian/patches/basics-exclude-windows-mac.patch +++ b/debian/patches/basics-exclude-windows-mac.patch @@ -4,9 +4,9 @@ Description: Exclude Windows and Mac specific source file from the build. Author: Gilles Filippini <pini@debian> Index: sikuli/basics/pom.xml =================================================================== ---- sikuli.orig/basics/pom.xml 2013-10-19 01:53:08.000000000 +0200 -+++ sikuli/basics/pom.xml 2013-10-19 01:53:39.000000000 +0200 -@@ -119,6 +119,12 @@ +--- sikuli.orig/basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 ++++ sikuli/basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 +@@ -123,6 +123,12 @@ <source>1.6</source> <target>1.6</target> <encoding>UTF-8</encoding> diff --git a/debian/patches/preserve-source-utf-8.patch b/debian/patches/preserve-source-utf-8.patch index 0660039..f8c06f4 100644 --- a/debian/patches/preserve-source-utf-8.patch +++ b/debian/patches/preserve-source-utf-8.patch @@ -6,9 +6,9 @@ Description: Advertise UTF-8 encoding for Basics subproject's source files. Author: Gilles Filippini <[email protected]> Index: sikuli/basics/pom.xml =================================================================== ---- sikuli.orig/basics/pom.xml 2013-10-19 12:34:23.000000000 +0200 -+++ sikuli/basics/pom.xml 2013-10-19 12:34:23.000000000 +0200 -@@ -118,6 +118,7 @@ +--- sikuli.orig/basics/pom.xml 2013-11-03 21:25:24.000000000 +0100 ++++ sikuli/basics/pom.xml 2013-11-03 21:25:24.000000000 +0100 +@@ -122,6 +122,7 @@ <configuration> <source>1.6</source> <target>1.6</target> diff --git a/debian/patches/series b/debian/patches/series index cc17d63..45e63ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,6 +8,7 @@ printhelp.patch autotoolize-vision-proxy.patch parent-pom.patch +add-classpath.patch preserve-source-utf-8.patch basics-exclude-windows-mac.patch no-maven-repo-dependencies.patch diff --git a/debian/tmp.poms b/debian/tmp.poms index 97b79df..f9f8320 100644 --- a/debian/tmp.poms +++ b/debian/tmp.poms @@ -1,6 +1,6 @@ pom.xml -vision-proxy/pom.xml --no-parent -basics/pom.xml --no-parent --java-lib -jython/pom.xml --no-parent --java-lib -api/pom.xml --no-parent --java-lib -ide/pom.xml --no-parent --java-lib +vision-proxy/pom.xml +basics/pom.xml --java-lib +jython/pom.xml --java-lib +api/pom.xml --java-lib +ide/pom.xml --java-lib diff --git a/debian/wrappers/sikuli b/debian/wrappers/sikuli index 07084f4..c5af3fc 100755 --- a/debian/wrappers/sikuli +++ b/debian/wrappers/sikuli @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/java -cp "/usr/share/java/commons-cli.jar:/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/SikuliX-Basics.jar:/usr/share/java/SikuliX-Jython.jar:/usr/share/java/SikuliX-API.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache -Dsikuli.FromComman [...] +exec /usr/bin/java -cp "/usr/share/java/jython.jar:/usr/share/java/SikuliX-API.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache -Dsikuli.FromCommandLine org.sikuli.basics.SikuliScript "$@" diff --git a/debian/wrappers/sikuli-ide b/debian/wrappers/sikuli-ide index 9881e31..2735504 100755 --- a/debian/wrappers/sikuli-ide +++ b/debian/wrappers/sikuli-ide @@ -1,2 +1,2 @@ #!/bin/sh -LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/jgoodies-common.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/ju [...] +LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jython.jar:/usr/share/java/mac_widgets.jar:/usr/share/sikuli/SikuliX-IDE.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@" -- 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
