Author: helder
Date: Mon Aug 13 00:49:54 2012
New Revision: 1372226
URL: http://svn.apache.org/viewvc?rev=1372226&view=rev
Log:
Bug fix:
Rasterizer task scripts were broken
(was not building at all in Linux/Mac);
(update the class path so it points to the current Ant libraries);
(remove "jaxp.jar" reference as it doesn't exist anymore);
(resolves bug #46227).
Fix Rasterizer task compilation using Cygwin
(build.sh CR/LF EOL was breaking Cygwin bash with "'\r': command not found"
messages);
General:
Few documentation improvements
(fix SVN Id property);
(add tip for executing using Linux and similar platforms).
Coherency with main build process was improved
(square brackets around Ant tasks removed);
(echo messages);
(XML encoding);
(SVN excludes reworked from CVS to SVN).
Adjust few SVN properties to Rasterizer task files
(add executable and remove native line ending from build.sh for consistency
with main build.sh).
Modified:
xmlgraphics/batik/trunk/CHANGES
xmlgraphics/batik/trunk/contrib/rasterizertask/README
xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh (contents, props
changed)
xmlgraphics/batik/trunk/contrib/rasterizertask/build.xml
Modified: xmlgraphics/batik/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/CHANGES?rev=1372226&r1=1372225&r2=1372226&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/CHANGES (original)
+++ xmlgraphics/batik/trunk/CHANGES Mon Aug 13 00:49:54 2012
@@ -12,8 +12,8 @@ Bug fixing is an ongoing task, so it is
42408, 43411, 43847, 43950, 44553, 44590, 44919, 44936, 44966,
45112, 45114, 45117, 45397, 45520, 45883, 45958, 46072, 46124,
- 46202, 46430, 46431, 46513, 46855, 46871, 47201, 47202, 48182,
- 48411, 49889, 49968, 50006, 50100, 51908
+ 46202, 46227, 46430, 46431, 46513, 46855, 46871, 47201, 47202,
+ 48182, 48411, 49889, 49968, 50006, 50100, 51908
2. New features
@@ -86,6 +86,8 @@ Bug fixing is an ongoing task, so it is
the system drive root to a Java folder inside Program Files).
* Fixed a manifest issue affecting several Jars which prevented proper
integration with NetBeans and other third-party IDEs and tools.
+ * Several fixes for Rasterizer Task contribution (which was not building
+ in Linux nor Cygwin and more).
5. Misc
Modified: xmlgraphics/batik/trunk/contrib/rasterizertask/README
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/contrib/rasterizertask/README?rev=1372226&r1=1372225&r2=1372226&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/contrib/rasterizertask/README (original)
+++ xmlgraphics/batik/trunk/contrib/rasterizertask/README Mon Aug 13 00:49:54
2012
@@ -15,7 +15,8 @@ you need to compile Batik first and then
.\build.bat compile
in this directory. Type
.\build.bat help
-to display other available targets. These commands work only in Windows.
+to display other available targets. In Linux and similar, replace ".\" with
+"./" and ".bat" with ".sh" (without the quotes).
NOTE: Due the internal changes in Ant itself the rasterizer task may not
work if the Ant in use is a different version from the Ant used to build
Modified: xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh?rev=1372226&r1=1372225&r2=1372226&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh (original)
+++ xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh Mon Aug 13 00:49:54
2012
@@ -16,9 +16,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# build.sh - build script for rasterizer task
+# build.sh - Unix Build Script for Rasterizer Task
#
-# $Id: build.sh
+# $Id$
# --------------------------------------------------------------------------
# ----- Verify and Set Required Environment Variables -------------------------
@@ -32,6 +32,17 @@ if [ "$JAVA_HOME" = "" ] ; then
exit 1
fi
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
BATIK_HOME=../..
@@ -39,10 +50,14 @@ BATIK_HOME=../..
# ----- Set up classpath ---------------------------------------------------
-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant_1_4_1.jar:$BATIK_HOME/lib/build/crimson-ant.jar:$BATIK_HOME/lib/build/jaxp.jar
+CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant-1.6.5.jar:$ANT_HOME/lib/build/ant-launcher-1.6.5.jar:$BATIK_HOME/lib/build/crimson-1.1.3.jar
CP=$CP:$BATIK_HOME/classes
+if $cygwin; then
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ CP=`cygpath --path --windows "$CP"`
+fi
# ----- Execute The Requested Build -------------------------------------------
@@ -51,7 +66,7 @@ if [ $# != 0 ] ; then
shift 1
fi
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main
-Dant.home=$ANT_HOME $TARGET -Dargs="$*"
+"$JAVA_HOME/bin/java" $ANT_OPTS -classpath "$CP" org.apache.tools.ant.Main
-emacs -Dant.home=$ANT_HOME $TARGET -Dargs="$*"
# ----- Cleanup the environment --------------------------------------------
Propchange: xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh
('svn:eol-style' removed)
Propchange: xmlgraphics/batik/trunk/contrib/rasterizertask/build.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: xmlgraphics/batik/trunk/contrib/rasterizertask/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/contrib/rasterizertask/build.xml?rev=1372226&r1=1372225&r2=1372226&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/contrib/rasterizertask/build.xml (original)
+++ xmlgraphics/batik/trunk/contrib/rasterizertask/build.xml Mon Aug 13
00:49:54 2012
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,16 +49,16 @@
<!-- == Targets ====================================================== -->
<target name="help"
description="Displays usage information.">
- <echo>SVG Rasterizer Task build file.</echo>
- <echo>Available targets are:</echo>
- <echo> compile --> Compiles the source code.</echo>
- <echo> jar --> Builds the JAR distribution.</echo>
- <echo> javadoc --> Generates Javadoc documentation.</echo>
- <echo> clean --> Deletes generated directories.</echo>
+ <echo message="SVG Rasterizer Task build file."/>
+ <echo message="Available targets are:"/>
+ <echo message=" compile --> Compiles the source code."/>
+ <echo message=" jar --> Builds the JAR distribution."/>
+ <echo message=" javadoc --> Generates Javadoc documentation."/>
+ <echo message=" clean --> Deletes generated directories."/>
</target>
<target name="prepare">
- <echo>Using ${ant.version}.</echo>
+ <echo message="Using ${ant.version}."/>
<tstamp/>
</target>
@@ -77,7 +75,7 @@
<mkdir dir="${build}/lib" />
<jar jarfile="${build}/lib/RasterizerTask.jar"
basedir="${build.classes}"
- excludes="**/CVS"
+ excludes="**/.svn/"
includes="**/*.class">
</jar>
</target>
