diff --git a/build/linux/dist.sh b/build/linux/dist.sh index 2c8597f9e..1ee1efcc2 100755 --- a/build/linux/dist.sh +++ b/build/linux/dist.sh @@ -19,6 +19,8 @@ cp -r ../../opengl processing/libraries/ cp -r ../../serial processing/libraries/ cp -r ../../pdf processing/libraries/ cp -r ../../dxf processing/libraries/ +cp -r ../../xml processing/libraries/ +cp -r ../../svg processing/libraries/ # new style examples thing ala reas cd processing diff --git a/build/linux/make.sh b/build/linux/make.sh index b2ddff84a..b1fd59cc8 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -23,6 +23,8 @@ else cp -r ../../video work/libraries/ cp -r ../../pdf work/libraries/ cp -r ../../dxf work/libraries/ + cp -r ../../xml work/libraries/ + cp -r ../../svg work/libraries/ echo Extracting examples... cd work @@ -195,5 +197,29 @@ mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ +# XML LIBRARY +echo Building XML library... +cd ../xml +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/xml/*.java +rm -f library/xml.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/xml.jar processing/xml/*.class && cd .. +mkdir -p $LIBRARIES/xml/library/ +cp library/xml.jar $LIBRARIES/xml/library/ + + +# SVG LIBRARY +echo Building SVG library... +cd ../svg +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/svg/*.java +rm -f library/svg.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/svg.jar processing/svg/*.class && cd .. +mkdir -p $LIBRARIES/svg/library/ +cp library/svg.jar $LIBRARIES/svg/library/ + + echo echo Done. diff --git a/build/macosx/dist.sh b/build/macosx/dist.sh index fa9af6935..839fd6087 100755 --- a/build/macosx/dist.sh +++ b/build/macosx/dist.sh @@ -32,6 +32,8 @@ cp -r ../../serial processing/libraries/ cp -r ../../video processing/libraries/ cp -r ../../pdf processing/libraries/ cp -r ../../dxf processing/libraries/ +cp -r ../../xml processing/libraries/ +cp -r ../../svg processing/libraries/ # new style examples thing ala reas cd processing diff --git a/build/macosx/make.sh b/build/macosx/make.sh index f7cbe15c3..b98f89a6f 100755 --- a/build/macosx/make.sh +++ b/build/macosx/make.sh @@ -32,6 +32,8 @@ else cp -r ../../video work/libraries/ cp -r ../../pdf work/libraries/ cp -r ../../dxf work/libraries/ + cp -r ../../xml work/libraries/ + cp -r ../../svg work/libraries/ echo Extracting examples... cd work @@ -237,5 +239,29 @@ mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ +# XML LIBRARY +echo Building XML library... +cd ../xml +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/xml/*.java +rm -f library/xml.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/xml.jar processing/xml/*.class && cd .. +mkdir -p $LIBRARIES/xml/library/ +cp library/xml.jar $LIBRARIES/xml/library/ + + +# SVG LIBRARY +echo Building SVG Import library... +cd ../svg +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/svg/*.java +rm -f library/svg.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/svg.jar processing/svg/*.class && cd .. +mkdir -p $LIBRARIES/svg/library/ +cp library/svg.jar $LIBRARIES/svg/library/ + + echo echo Done. \ No newline at end of file diff --git a/build/windows/dist.sh b/build/windows/dist.sh index 0a253b25b..2d0bfd798 100755 --- a/build/windows/dist.sh +++ b/build/windows/dist.sh @@ -30,6 +30,8 @@ cp -r ../../serial processing/libraries/ cp -r ../../video processing/libraries/ cp -r ../../pdf processing/libraries/ cp -r ../../dxf processing/libraries/ +cp -r ../../xml processing/libraries/ +cp -r ../../svg processing/libraries/ # new style examples thing ala reas cd processing diff --git a/build/windows/make.sh b/build/windows/make.sh index 5d0eb14fe..bb87d0cd5 100755 --- a/build/windows/make.sh +++ b/build/windows/make.sh @@ -25,6 +25,8 @@ else cp -r ../../video work/libraries/ cp -r ../../pdf work/libraries/ cp -r ../../dxf work/libraries/ + cp -r ../../xml work/libraries/ + cp -r ../../svg work/libraries/ echo Extracting examples... cd work @@ -266,6 +268,30 @@ mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ +# XML LIBRARY +echo Building XML library... +cd ../xml +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/xml/*.java +rm -f library/xml.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/xml.jar processing/xml/*.class && cd .. +mkdir -p $LIBRARIES/xml/library/ +cp library/xml.jar $LIBRARIES/xml/library/ + + +# SVG LIBRARY +echo Building SVG library... +cd ../svg +mkdir -p bin +$JIKES -target 1.1 +D -d bin src/processing/svg/*.java +rm -f library/svg.jar +find bin -name "*~" -exec rm -f {} ';' +cd bin && zip -r0q ../library/svg.jar processing/svg/*.class && cd .. +mkdir -p $LIBRARIES/svg/library/ +cp library/svg.jar $LIBRARIES/svg/library/ + + echo echo Done. diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 4d58b722f..0f649c4ac 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -3825,9 +3825,9 @@ public class PApplet extends Applet } catch (Exception e) { if (filename == null) { - die("Filename passed to reader() was null", e); + System.err.println("Filename passed to reader() was null"); } else { - die("Couldn't create a reader for " + filename, e); + System.err.println("Couldn't create a reader for " + filename); } } return null;