This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit c7c01ef4af38b46e3104bafaec1ecc05e67e24a6 Author: Gilles Filippini <[email protected]> Date: Mon May 12 20:49:23 2014 +0200 Improve the clean target for the VisionProxy JNI And script directly into the pom file instead of creating yet another file. --- debian/patches/autotoolize-vision-proxy.patch | 43 ++++++++++++++------------- debian/rules | 3 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch index 7107cb5..dcbc447 100644 --- a/debian/patches/autotoolize-vision-proxy.patch +++ b/debian/patches/autotoolize-vision-proxy.patch @@ -39,7 +39,7 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am =================================================================== --- /dev/null +++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am -@@ -0,0 +1,31 @@ +@@ -0,0 +1,32 @@ +ACLOCAL_AMFLAGS = -I m4 + +JAVAHOME ?= "$(shell dirname "$$(dirname "$$(readlink -f "$$(which javac)")")")" @@ -67,28 +67,16 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am + rm $(jnidir)/*.la + +clean-local: cleanswig ++ rm -fr dist + +cleanswig: + cd $(SWIGOUT) && rm -f $(SWIGJAVAFILES) + rm -f *.cxx -Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure -=================================================================== ---- /dev/null -+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure -@@ -0,0 +1,8 @@ -+#!/bin/sh -+set -e -+set -x -+cd "$(dirname "$0")" -+mkdir -p m4 -+autoreconf -i -+automake -+exec ./configure $VP_CONFIGURE_FLAGS Index: sikuli-1.1.0~beta1/Natives/pom.xml =================================================================== --- sikuli-1.1.0~beta1.orig/Natives/pom.xml +++ sikuli-1.1.0~beta1/Natives/pom.xml -@@ -33,5 +33,63 @@ +@@ -33,5 +33,78 @@ <build> <defaultGoal>clean install</defaultGoal> @@ -105,7 +93,18 @@ Index: sikuli-1.1.0~beta1/Natives/pom.xml + <phase>validate</phase> + <goals><goal>exec</goal></goals> + <configuration> -+ <executable>./src/main/native/Vision/runConfigure</executable> ++ <executable>/bin/sh</executable> ++ <arguments> ++ <argument>-c</argument> ++ <argument> ++set -e ++cd src/main/native/Vision ++mkdir -p m4 ++autoreconf -i ++automake ++./configure $VP_CONFIGURE_FLAGS ++ </argument> ++ </arguments> + </configuration> + </execution> + <execution> @@ -139,11 +138,15 @@ Index: sikuli-1.1.0~beta1/Natives/pom.xml + <phase>clean</phase> + <goals><goal>exec</goal></goals> + <configuration> -+ <executable>/usr/bin/make</executable> ++ <executable>/bin/sh</executable> + <arguments> -+ <argument>-C</argument> -+ <argument>src/main/native/Vision</argument> -+ <argument>clean</argument> ++ <argument>-c</argument> ++ <argument> ++set -e ++cd src/main/native/Vision ++[ ! -f Makefile ] || /usr/bin/make clean ++rm -fr configure Makefile Makefile.in aclocal.m4 m4 config.* compile missing libtool ltmain.sh install-sh depcomp ++ </argument> + </arguments> + </configuration> + </execution> diff --git a/debian/rules b/debian/rules index 3443b33..973f2c1 100755 --- a/debian/rules +++ b/debian/rules @@ -48,9 +48,8 @@ configure/libsikuli-script-jni:: sed "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g;s/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g" debian/libsikuli-script-jni.install.in > debian/libsikuli-script-jni.install clean:: - -cd Natives/src/main/native/Vision && chmod a+x runConfigure rm -f debian/libsikuli-script-jni.install - # This ugly part because of #638001 and #723919 + # This ugly line because of #638001 and #723919 grep -vwE '(debian|^org\.sikuli)' debian/maven.ignoreRules.full >debian/maven.ignoreRules # We don't want our maven.rules file changed with broken published rules cp debian/maven.rules.ours debian/maven.rules -- 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
