[pkg-java] r11872 - in trunk/processing: . patches
Pablo Duboue
pabloduboue-guest at alioth.debian.org
Mon Mar 15 12:40:36 UTC 2010
Author: pabloduboue-guest
Date: 2010-03-15 12:40:27 +0000 (Mon, 15 Mar 2010)
New Revision: 11872
Modified:
trunk/processing/patches/01_fix_make_script.patch
trunk/processing/rules
Log:
Fixed patch.
Modified: trunk/processing/patches/01_fix_make_script.patch
===================================================================
--- trunk/processing/patches/01_fix_make_script.patch 2010-03-15 08:28:11 UTC (rev 11871)
+++ trunk/processing/patches/01_fix_make_script.patch 2010-03-15 12:40:27 UTC (rev 11872)
@@ -1,149 +1,149 @@
Description: Fix the make.sh script to work with Debian
Author: Pablo Duboue
-diff -Nurwd build/linux/make.sh build/linux/make-old.sh
---- ./build/linux/make.sh 2010-03-15 02:10:48.000000000 -0400
-+++ ./build/linux/make-old.sh 2008-10-11 11:39:23.000000000 -0400
-@@ -1,11 +1,8 @@
--#!/bin/sh -e
-+#!/bin/sh
+diff -up build/linux/make-old.sh build/linux/make.sh
+--- ./build/linux/make-old.sh 2008-10-11 11:39:23.000000000 -0400
++++ ./build/linux/make.sh 2010-03-15 02:10:48.000000000 -0400
+@@ -1,8 +1,11 @@
+-#!/bin/sh
++#!/bin/sh -e
### -- SETUP WORK DIR -------------------------------------------
--JAVA=$JAVA_HOME/bin/java
--JAVAC=$JAVA_HOME/bin/javac
--
++JAVA=$JAVA_HOME/bin/java
++JAVAC=$JAVA_HOME/bin/javac
++
if test -d work
then
BUILD_PREPROC=false
-@@ -15,8 +12,12 @@
+@@ -12,12 +15,8 @@ else
mkdir work
cp -r ../shared/lib work/
-+ cp -r ../shared/libraries work/
+- cp -r ../shared/libraries work/
cp -r ../shared/tools work/
-- mkdir work/libraries/
-+
-+ cp ../../app/lib/antlr.jar work/lib/
-+ cp ../../app/lib/ecj.jar work/lib/
-+ cp ../../app/lib/jna.jar work/lib/
+-
+- cp ../../app/lib/antlr.jar work/lib/
+- cp ../../app/lib/ecj.jar work/lib/
+- cp ../../app/lib/jna.jar work/lib/
++ mkdir work/libraries/
echo Extracting examples...
unzip -q -d work/ ../shared/examples.zip
-@@ -32,6 +33,26 @@
+@@ -33,26 +32,6 @@ else
cp -r ../../dxf work/libraries/
install -m 755 dist/processing work/processing
-+
-+ ARCH=`uname -m`
-+ if [ $ARCH = "i686" ]
-+ then
-+ echo Extracting JRE...
-+ tar --extract --file=jre.tgz --ungzip --directory=work
-+ else
-+# echo This is not my beautiful house.
-+# if [ $ARCH = "x86_64" ]
-+# then
-+# echo You gots the 64.
-+# fi
-+ echo "
-+The Java bundle that is included with Processing supports only i686 by default.
-+To build the code, you will need to install the Java 1.5.0_15 JDK (not a JRE,
-+and not any other version), and create a symlink to the directory where it is
-+installed. Create the symlink in the \"work\" directory, and named it \"java\":
-+ln -s /path/to/jdk1.5.0_15 `pwd`/work/java"
-+ exit
-+ fi
+-
+- ARCH=`uname -m`
+- if [ $ARCH = "i686" ]
+- then
+- echo Extracting JRE...
+- tar --extract --file=jre.tgz --ungzip --directory=work
+- else
+-# echo This is not my beautiful house.
+-# if [ $ARCH = "x86_64" ]
+-# then
+-# echo You gots the 64.
+-# fi
+- echo "
+-The Java bundle that is included with Processing supports only i686 by default.
+-To build the code, you will need to install the Java 1.5.0_15 JDK (not a JRE,
+-and not any other version), and create a symlink to the directory where it is
+-installed. Create the symlink in the \"work\" directory, and named it \"java\":
+-ln -s /path/to/jdk1.5.0_15 `pwd`/work/java"
+- exit
+- fi
fi
cd ../..
-@@ -45,12 +66,12 @@
+@@ -66,12 +45,12 @@ echo Building processing.core
cd core
#CLASSPATH="../build/linux/work/java/lib/rt.jar"
--#export CLASSPATH=
-+#export CLASSPATH
+-#export CLASSPATH
++#export CLASSPATH=
perl preproc.pl
mkdir -p bin
--$JAVA \
-- -cp $JAVA_HOME/lib/tools.jar \
-+../build/linux/work/java/bin/java \
-+ -cp ../build/linux/work/java/lib/tools.jar \
+-../build/linux/work/java/bin/java \
+- -cp ../build/linux/work/java/lib/tools.jar \
++$JAVA \
++ -cp $JAVA_HOME/lib/tools.jar \
com.sun.tools.javac.Main \
-d bin -source 1.5 -target 1.5 \
src/processing/core/*.java src/processing/xml/*.java
-@@ -73,8 +94,8 @@
+@@ -94,8 +73,8 @@ cd app
echo Building antlr grammar code...
# first build the default java goop
--$JAVA \
-- -cp /usr/share/java/antlr.jar antlr.Tool \
-+../build/linux/work/java/bin/java \
-+ -cp ../build/linux/work/lib/antlr.jar antlr.Tool \
+-../build/linux/work/java/bin/java \
+- -cp ../build/linux/work/lib/antlr.jar antlr.Tool \
++$JAVA \
++ -cp /usr/share/java/antlr.jar antlr.Tool \
-o src/antlr/java \
src/antlr/java/java.g
-@@ -87,8 +108,8 @@
+@@ -108,8 +87,8 @@ cd app
# so it's necessary to cd into the antlr/java folder, otherwise
# the JavaTokenTypes.txt file won't be found
cd src/antlr/java
--$JAVA \
-- -cp /usr/share/java/antlr.jar antlr.Tool \
-+../../../../build/linux/work/java/bin/java \
-+ -cp ../../../../build/linux/work/lib/antlr.jar antlr.Tool \
+-../../../../build/linux/work/java/bin/java \
+- -cp ../../../../build/linux/work/lib/antlr.jar antlr.Tool \
++$JAVA \
++ -cp /usr/share/java/antlr.jar antlr.Tool \
-o ../../processing/app/preproc \
-glib java.g \
../../processing/app/preproc/pde.g
-@@ -105,11 +126,11 @@
+@@ -126,11 +105,11 @@ cd app
rm -rf ../build/linux/work/classes
mkdir ../build/linux/work/classes
--$JAVA \
-- -cp $JAVA_HOME/lib/tools.jar \
-+../build/linux/work/java/bin/java \
-+ -cp ../build/linux/work/java/lib/tools.jar \
+-../build/linux/work/java/bin/java \
+- -cp ../build/linux/work/java/lib/tools.jar \
++$JAVA \
++ -cp $JAVA_HOME/lib/tools.jar \
com.sun.tools.javac.Main \
-source 1.5 -target 1.5 \
-- -classpath ../build/linux/work/lib/core.jar:/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar:$JAVA_HOME/lib/tools.jar \
-+ -classpath ../build/linux/work/lib/core.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/ecj.jar:../build/linux/work/lib/jna.jar:../build/linux/work/java/lib/tools.jar \
+- -classpath ../build/linux/work/lib/core.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/ecj.jar:../build/linux/work/lib/jna.jar:../build/linux/work/java/lib/tools.jar \
++ -classpath ../build/linux/work/lib/core.jar:/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar:$JAVA_HOME/lib/tools.jar \
-d ../build/linux/work/classes \
src/processing/app/*.java \
src/processing/app/debug/*.java \
-@@ -132,7 +153,7 @@
+@@ -153,7 +132,7 @@ cd build/linux
PLATFORM=linux
--JAVAC="$JAVA_HOME/bin/java -cp $JAVA_HOME/lib/tools.jar com.sun.tools.javac.Main -source 1.5 -target 1.5"
-+JAVAC="../build/linux/work/java/bin/java -cp ../build/linux/work/java/lib/tools.jar com.sun.tools.javac.Main -source 1.5 -target 1.5"
+-JAVAC="../build/linux/work/java/bin/java -cp ../build/linux/work/java/lib/tools.jar com.sun.tools.javac.Main -source 1.5 -target 1.5"
++JAVAC="$JAVA_HOME/bin/java -cp $JAVA_HOME/lib/tools.jar com.sun.tools.javac.Main -source 1.5 -target 1.5"
CORE=../build/$PLATFORM/work/lib/core.jar
LIBRARIES=../build/$PLATFORM/work/libraries
-@@ -144,7 +165,7 @@
+@@ -165,7 +144,7 @@ echo Building serial library...
cd ../serial
mkdir -p bin
$JAVAC \
-- -classpath "/usr/share/java/RXTXcomm.jar:$CORE" \
-+ -classpath "library/RXTXcomm.jar:$CORE" \
+- -classpath "library/RXTXcomm.jar:$CORE" \
++ -classpath "/usr/share/java/RXTXcomm.jar:$CORE" \
-d bin src/processing/serial/*.java
rm -f library/serial.jar
find bin -name "*~" -exec rm -f {} ';'
-@@ -172,7 +193,7 @@
+@@ -193,7 +172,7 @@ echo Building OpenGL library...
cd ../opengl
mkdir -p bin
$JAVAC \
-- -classpath "/usr/share/java/jogl.jar:$CORE" \
-+ -classpath "library/jogl.jar:$CORE" \
+- -classpath "library/jogl.jar:$CORE" \
++ -classpath "/usr/share/java/jogl.jar:$CORE" \
-d bin src/processing/opengl/*.java
rm -f library/opengl.jar
find bin -name "*~" -exec rm -f {} ';'
-@@ -186,7 +207,7 @@
+@@ -207,7 +186,7 @@ echo Building PDF library...
cd ../pdf
mkdir -p bin
$JAVAC \
-- -classpath "/usr/share/java/itext.jar:$CORE" \
-+ -classpath "library/itext.jar:$CORE" \
+- -classpath "library/itext.jar:$CORE" \
++ -classpath "/usr/share/java/itext.jar:$CORE" \
-d bin src/processing/pdf/*.java
rm -f library/pdf.jar
find bin -name "*~" -exec rm -f {} ';'
Modified: trunk/processing/rules
===================================================================
--- trunk/processing/rules 2010-03-15 08:28:11 UTC (rev 11871)
+++ trunk/processing/rules 2010-03-15 12:40:27 UTC (rev 11872)
@@ -19,7 +19,7 @@
#export CLASSPATH=
-binary:
+binary: patch-stamp
dh_testdir
dh_testroot
chmod +x ./build/linux/make.sh
@@ -40,7 +40,14 @@
dh_md5sums
dh_builddeb
+patch:
+ QUILT_PATCHES=debian/patches quilt push -a
+ touch patch-stamp
+unpatch: patch-stamp
+ QUILT_PATCHES=debian/patches quilt pop -a
+ rm patch-stamp
+
clean:
find . -name "*.class" -exec rm -f {} ';'
rm -Rf build/linux/work
More information about the pkg-java-commits
mailing list