Author: pabloduboue-guest
Date: 2010-03-15 06:37:26 +0000 (Mon, 15 Mar 2010)
New Revision: 11869
Added:
trunk/processing/TODO
trunk/processing/files
trunk/processing/processing-binary
trunk/processing/processing-doc.install
trunk/processing/processing-doc.substvars
trunk/processing/processing.substvars
Removed:
trunk/processing/javabuild
trunk/processing/processing.links
trunk/processing/processing.manifest
Modified:
trunk/processing/control
trunk/processing/orig-tar.sh
trunk/processing/patches/01_fix_make_script.patch
trunk/processing/processing.install
trunk/processing/rules
Log:
Fixed orig.tar.sh to avoid downloaded unlicensed files (e.g., JRE)
Finished fixing the make.sh script
This version produces two .deb, but more work is needed.
Added: trunk/processing/TODO
===================================================================
--- trunk/processing/TODO (rev 0)
+++ trunk/processing/TODO 2010-03-15 06:37:26 UTC (rev 11869)
@@ -0,0 +1,2 @@
+Man page
+Desktop icon
Modified: trunk/processing/control
===================================================================
--- trunk/processing/control 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/control 2010-03-15 06:37:26 UTC (rev 11869)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Pablo Duboue <pablo.dub...@gmail.com>
-Build-Depends: debhelper (>> 7), javahelper (>= 0.24)
+Build-Depends: debhelper (>> 7), javahelper (>= 0.24), librxtx-java,
libjna-java, libantlr-java, libjogl-java, libitext-java, liblog4j1.2-java, perl
Build-Depends-Indep: openjdk-6-jdk
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/processing
@@ -21,4 +21,19 @@
fundamentals of computer programming within a visual context and to
serve as a software sketchbook and professional production tool.
Processing is developed by artists and designers as an alternative to
- proprietary software tools in the same domain.
\ No newline at end of file
+ proprietary software tools in the same domain.
+
+Package: processing-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: A programming language for images, animations, and interactions
+ Processing is a programming language and environment for people who
+ want to program images, animation, and interactions. It is used by
+ students, artists, designers, researchers, and hobbyists for
+ learning, prototyping, and production. It is created to teach
+ fundamentals of computer programming within a visual context and to
+ serve as a software sketchbook and professional production tool.
+ Processing is developed by artists and designers as an alternative to
+ proprietary software tools in the same domain.
+ .
+ This package contains the documentation.
\ No newline at end of file
Added: trunk/processing/files
===================================================================
--- trunk/processing/files (rev 0)
+++ trunk/processing/files 2010-03-15 06:37:26 UTC (rev 11869)
@@ -0,0 +1,2 @@
+processing_1.0.9-1_all.deb java optional
+processing-doc_1.0.9-1_all.deb java optional
Deleted: trunk/processing/javabuild
===================================================================
--- trunk/processing/javabuild 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/javabuild 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1 +0,0 @@
-processing.jar src
Modified: trunk/processing/orig-tar.sh
===================================================================
--- trunk/processing/orig-tar.sh 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/orig-tar.sh 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1,27 +1,44 @@
-#!/bin/sh -e
+#!/bin/bash -e
TAR=../processing_$2.orig.tar.gz
DIR=processing-$2
TAG=processing-$2
-svn export svn://processing.org/tags/$TAG/ $DIR
-rm -rf $DIR/build/windows
-rm -rf $DIR/build/macosx
-rm -rf $DIR/app/lib
-rm $DIR/build/linux/jre.tgz
-rm $DIR/*/library/*
-rm $DIR/app/src/processing/app/tools/format/tool/log4j.jar
-rm $DIR/app/src/processing/app/tools/format/tool/jalopy.jar
-rm $DIR/core/preproc/preproc.jar
-rm $DIR/dxf/dxfviewer.jar
-# netscape.javascript now in /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar
-rm -rf $DIR/build/shared/libraries/
-rm $DIR/app/src/processing/app/tools/android/processing-core.zip
-rm $DIR/video/QTJava.zip
-rm $DIR/opengl/jogl-src.zip
-rm $DIR/pdf/itext-src.zip
+# their SVN is full of non-distributable files, so extra care is needed to
fetch it
+# the list of files might need to be moved to /tmp if there are problems with
the
+# buildd
+# get list
+svn --recursive list svn://processing.org/tags/$TAG/ > list
+# remove unwanted bits
+grep -v ^build/windows < list > list.filtered; mv list.filtered list
+grep -v ^build/macosx < list > list.filtered; mv list.filtered list
+grep -v ^app/lib < list > list.filtered; mv list.filtered list
+grep -v ^build/linux/jre.tgz < list > list.filtered; mv list.filtered list
+grep -v /library/ < list > list.filtered; mv list.filtered list
+grep -v app/src/processing/app/tools/format/tool/log4j.jar < list >
list.filtered; mv list.filtered list
+grep -v app/src/processing/app/tools/format/tool/jalopy.jar < list >
list.filtered; mv list.filtered list
+grep -v core/preproc/preproc.jar < list > list.filtered; mv list.filtered list
+grep -v dxf/dxfviewer.jar < list > list.filtered; mv list.filtered list
+grep -v build/shared/libraries/ < list > list.filtered; mv list.filtered list
+grep -v app/src/processing/app/tools/android/processing-core.zip < list >
list.filtered; mv list.filtered list
+grep -v video/QTJava.zip < list > list.filtered; mv list.filtered list
+grep -v opengl/jogl-src.zip < list > list.filtered; mv list.filtered list
+grep -v pdf/itext-src.zip < list > list.filtered; mv list.filtered list
+grep -E -v "/$" < list > list.filtered; mv list.filtered list
+
+for i in `cat ./list`
+do
+ echo $i
+ export i
+ #f=`echo "$i" | perl -ne '@d=split(/\//,$_);@d...@d[0..($#d-1)];print
join("/",@d)'`
+ f=`dirname $i`
+ mkdir -p $DIR/$f || true
+ svn cat svn://processing.org/tags/$TAG/$i > $DIR/$i
+done
+
tar -c -z -f $TAR $DIR
rm -rf $DIR
+rm ./list
Modified: trunk/processing/patches/01_fix_make_script.patch
===================================================================
--- trunk/processing/patches/01_fix_make_script.patch 2010-03-15 00:50:08 UTC
(rev 11868)
+++ trunk/processing/patches/01_fix_make_script.patch 2010-03-15 06:37:26 UTC
(rev 11869)
@@ -1,47 +1,82 @@
Description: Fix the make.sh script to work with Debian
-Note: WIP
+Author: Pablo Duboue
-diff -up build/linux/make-debian.sh build/linux/make.sh
---- build/linux/make-debian.sh 2010-01-04 04:03:01.000000000 -0500
-+++ build/linux/make.sh 2008-10-11 11:39:23.000000000 -0400
-@@ -1,11 +1,8 @@
--#!/bin/sh -e
-+#!/bin/sh
-
-
- ### -- SETUP WORK DIR -------------------------------------------
-
--JAVA=$JAVA_HOME/bin/java
--JAVAC=$JAVA_HOME/bin/javac
--
- if test -d work
- then
- BUILD_PREPROC=false
-@@ -18,6 +15,10 @@ else
- cp -r ../shared/libraries work/
- cp -r ../shared/tools work/
-
-+ cp ../../app/lib/antlr.jar work/lib/
-+ cp ../../app/lib/ecj.jar work/lib/
-+ cp ../../app/lib/jna.jar work/lib/
-+
- echo Extracting examples...
- unzip -q -d work/ ../shared/examples.zip
-
-@@ -69,8 +70,8 @@ cd core
-
- 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 \
+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
+
+
+ ### -- SETUP WORK DIR -------------------------------------------
+
+-JAVA=$JAVA_HOME/bin/java
+-JAVAC=$JAVA_HOME/bin/javac
+-
+ if test -d work
+ then
+ BUILD_PREPROC=false
+@@ -15,8 +12,12 @@
+
+ mkdir work
+ cp -r ../shared/lib 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/
+
+ echo Extracting examples...
+ unzip -q -d work/ ../shared/examples.zip
+@@ -32,6 +33,26 @@
+ 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
+ fi
+
+ cd ../..
+@@ -45,12 +66,12 @@
+ cd core
+
+ #CLASSPATH="../build/linux/work/java/lib/rt.jar"
+-#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 \
com.sun.tools.javac.Main \
-d bin -source 1.5 -target 1.5 \
src/processing/core/*.java src/processing/xml/*.java
-@@ -93,8 +94,8 @@ cd app
+@@ -73,8 +94,8 @@
echo Building antlr grammar code...
-
+
# first build the default java goop
-$JAVA \
- -cp /usr/share/java/antlr.jar antlr.Tool \
@@ -49,22 +84,66 @@
+ -cp ../build/linux/work/lib/antlr.jar antlr.Tool \
-o src/antlr/java \
src/antlr/java/java.g
-
-@@ -107,7 +108,7 @@ $JAVA \
+
+@@ -87,8 +108,8 @@
# 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 \
++ -cp ../../../../build/linux/work/lib/antlr.jar antlr.Tool \
-o ../../processing/app/preproc \
-glib java.g \
-@@ -125,7 +126,7 @@ cd app
+ ../../processing/app/preproc/pde.g
+@@ -105,11 +126,11 @@
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 \
++ -cp ../build/linux/work/java/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
\
+ -d ../build/linux/work/classes \
+ src/processing/app/*.java \
+ src/processing/app/debug/*.java \
+@@ -132,7 +153,7 @@
+
+ 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"
+ CORE=../build/$PLATFORM/work/lib/core.jar
+ LIBRARIES=../build/$PLATFORM/work/libraries
+
+@@ -144,7 +165,7 @@
+ cd ../serial
+ mkdir -p bin
+ $JAVAC \
+- -classpath "/usr/share/java/RXTXcomm.jar:$CORE" \
++ -classpath "library/RXTXcomm.jar:$CORE" \
+ -d bin src/processing/serial/*.java
+ rm -f library/serial.jar
+ find bin -name "*~" -exec rm -f {} ';'
+@@ -172,7 +193,7 @@
+ cd ../opengl
+ mkdir -p bin
+ $JAVAC \
+- -classpath "/usr/share/java/jogl.jar:$CORE" \
++ -classpath "library/jogl.jar:$CORE" \
+ -d bin src/processing/opengl/*.java
+ rm -f library/opengl.jar
+ find bin -name "*~" -exec rm -f {} ';'
+@@ -186,7 +207,7 @@
+ cd ../pdf
+ mkdir -p bin
+ $JAVAC \
+- -classpath "/usr/share/java/itext.jar:$CORE" \
++ -classpath "library/itext.jar:$CORE" \
+ -d bin src/processing/pdf/*.java
+ rm -f library/pdf.jar
+ find bin -name "*~" -exec rm -f {} ';'
Added: trunk/processing/processing-binary
===================================================================
--- trunk/processing/processing-binary (rev 0)
+++ trunk/processing/processing-binary 2010-03-15 06:37:26 UTC (rev 11869)
@@ -0,0 +1,7 @@
+#!/usr/bin/sh -e
+
+CLASSPATH=/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar:/usr/share/java/RXTXcomm.jar:/usr/share/java/jogl.jar:/usr/share/java/itext.jar:/usr/share/processing/lib/core.jar:/usr/share/processing/lib/pde.jar:/usr/lib/jvm/java-6-openjdk/lib/rt.jar:/usr/lib/jvm/java-6-openjdk/lib/tools.jar
+
+cd /usr/share/processing
+
+/usr/lib/jvm/java-6-openjdk -classpath $CLASSPATH processing.app.Base &
\ No newline at end of file
Added: trunk/processing/processing-doc.install
===================================================================
--- trunk/processing/processing-doc.install (rev 0)
+++ trunk/processing/processing-doc.install 2010-03-15 06:37:26 UTC (rev
11869)
@@ -0,0 +1 @@
+build/linux/work/reference usr/share/doc/processing/api
\ No newline at end of file
Added: trunk/processing/processing-doc.substvars
===================================================================
--- trunk/processing/processing-doc.substvars (rev 0)
+++ trunk/processing/processing-doc.substvars 2010-03-15 06:37:26 UTC (rev
11869)
@@ -0,0 +1 @@
+misc:Depends=
Modified: trunk/processing/processing.install
===================================================================
--- trunk/processing/processing.install 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/processing.install 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1 +1,11 @@
-processing.jar usr/share/processing
+build/shared/lib/* usr/share/processing/lib/
+build/shared/tools/* usr/share/processing/tools/
+build/linux/work/examples usr/share/doc/processing/
+build/linux/work/lib/pde.jar usr/share/processing/lib/
+build/linux/work/lib/core.jar usr/share/processing/lib/
+net usr/share/processing/libraries/
+opengl usr/share/processing/libraries/
+serial usr/share/processing/libraries/
+pdf usr/share/processing/libraries/
+dxf usr/share/processing/libraries/
+debian/processing-binary usr/bin/processing
Deleted: trunk/processing/processing.links
===================================================================
--- trunk/processing/processing.links 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/processing.links 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1 +0,0 @@
-usr/share/processing/processing.jar usr/bin/processing
Deleted: trunk/processing/processing.manifest
===================================================================
--- trunk/processing/processing.manifest 2010-03-15 00:50:08 UTC (rev
11868)
+++ trunk/processing/processing.manifest 2010-03-15 06:37:26 UTC (rev
11869)
@@ -1,3 +0,0 @@
-usr/share/processing/processing.jar:
- Main-Class: <Main Class>
- Debian-Java-Home: /usr/lib/jvm/java-6-openjdk
Added: trunk/processing/processing.substvars
===================================================================
--- trunk/processing/processing.substvars (rev 0)
+++ trunk/processing/processing.substvars 2010-03-15 06:37:26 UTC (rev
11869)
@@ -0,0 +1 @@
+misc:Depends=
Modified: trunk/processing/rules
===================================================================
--- trunk/processing/rules 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/rules 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1,10 +1,46 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/ant.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+#ANT_HOME := /usr/share/ant
+DEB_JARS := RXTXcomm jna antlr ecj jogl log4j pdf
+#DEB_ANT_BUILD_TARGET := build
+#DEB_ANT_BUILDFILE := ./debian/build.xml
+#DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
+#DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt
+
# Put depended upon jars in here
-# export CLASSPATH=
+#export CLASSPATH=
-%:
- dh --with javahelper $@
+#%:
+# dh --with javahelper $@
+binary:
+ dh_testdir
+ dh_testroot
+ cd ./build/linux; JAVA_HOME=$(JAVA_HOME) ./make.sh
+ dh_install
+ dh_installchangelogs build/shared/revisions.txt
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+clean:
+ find . -name "*.class" -exec rm -f {} ';'
+ rm -Rf build/linux/work
+ dh_clean
+# more to come
+
+
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
