[sikuli] 33/53: Assign VisonProxy build to phase generate-sources
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 20:38:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 384574025029f7c32d695dfa3fbc3205391fff2e
Author: Gilles Filippini <pini at debian.org>
Date: Mon May 12 18:25:25 2014 +0200
Assign VisonProxy build to phase generate-sources
so that SWIG java files are generated before the compile phase.
---
debian/patches/autotoolize-vision-proxy.patch | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch
index 893c7cc..7107cb5 100644
--- a/debian/patches/autotoolize-vision-proxy.patch
+++ b/debian/patches/autotoolize-vision-proxy.patch
@@ -3,8 +3,8 @@ Description: Use autotools to build the VisionProxy JNI
Author: Gilles Filippini <pini at debian.org>
Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac 2014-05-10 17:20:11.826984324 +0000
+--- /dev/null
++++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac
@@ -0,0 +1,29 @@
+AC_INIT(sikuli-vision-proxy,1.0.1)
+
@@ -37,8 +37,8 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac
+AC_OUTPUT
Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am 2014-05-11 10:59:45.485020800 +0000
+--- /dev/null
++++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
@@ -0,0 +1,31 @@
+ACLOCAL_AMFLAGS = -I m4
+
@@ -73,8 +73,8 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
+ rm -f *.cxx
Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure 2014-05-10 17:45:00.204177227 +0000
+--- /dev/null
++++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
@@ -86,8 +86,8 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/runConfigure
+exec ./configure $VP_CONFIGURE_FLAGS
Index: sikuli-1.1.0~beta1/Natives/pom.xml
===================================================================
---- sikuli-1.1.0~beta1.orig/Natives/pom.xml 2014-05-10 17:20:11.834984374 +0000
-+++ sikuli-1.1.0~beta1/Natives/pom.xml 2014-05-11 10:25:33.847549891 +0000
+--- sikuli-1.1.0~beta1.orig/Natives/pom.xml
++++ sikuli-1.1.0~beta1/Natives/pom.xml
@@ -33,5 +33,63 @@
<build>
@@ -110,7 +110,7 @@ Index: sikuli-1.1.0~beta1/Natives/pom.xml
+ </execution>
+ <execution>
+ <id>make-all</id>
-+ <phase>compile</phase>
++ <phase>generate-sources</phase>
+ <goals><goal>exec</goal></goals>
+ <configuration>
+ <executable>/usr/bin/make</executable>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list