svn commit: r1581694 - in /xalan/java/branches/xalan-j_2_7_1_maint: build.xml lib/brazil-2.1.jar

[gg...@apache.org]

Author: ggregory
Date: Wed Mar 26 04:54:28 2014
New Revision: 1581694

URL: http://svn.apache.org/r1581694
Log:
Do not make the build rely on an external classpath. Add antic jar from sunlab.brazil.

Added:
    xalan/java/branches/xalan-j_2_7_1_maint/lib/brazil-2.1.jar   (with props)
Modified:
    xalan/java/branches/xalan-j_2_7_1_maint/build.xml

Modified: xalan/java/branches/xalan-j_2_7_1_maint/build.xml
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/build.xml?rev=1581694&r1=1581693&r2=1581694&view=diff
==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/build.xml (original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/build.xml Wed Mar 26 04:54:28 2014
@@ -126,6 +126,8 @@ $Id$
   <property name="servlet-api.jar"        value="${lib.dir}/${servlet-api.jar.name}"/>
   <property name="javaee-api.jar.name"    value="javaee-api-5.0-2.jar"/>
   <property name="javaee-api.jar"         value="${lib.dir}/${javaee-api.jar.name}"/>
+  <property name="brazil.jar.name"        value="brazil-2.1.jar"/>
+  <property name="brazil.jar"             value="${lib.dir}/${brazil.jar.name}"/>
  
   <!-- Relative locations of source directories -->
   <property name="manifest.mf"            value="./src/MANIFEST.MF"/>
@@ -844,7 +846,7 @@ $Id$
   <!-- =================================================================== -->
   <target name="extra.nonstd.samples" depends="xsltc.brazil"/>
   
-  <target name="extra.nonstd.samples.nojardepends" depends="xsltc.brazil.nojardepends"/>
+  <target name="extra.nonstd.samples.nojardepends" depends="xsltc.brazil.jardepends"/>
 
   <!-- =================================================================== -->
   <!-- Compiles the sample servlet and jars the class files.               --> 
@@ -931,14 +933,16 @@ $Id$
   <!-- =================================================================== -->
   <!-- Compiles the XSLTC brazil example and jars the class files.         --> 
   <!-- =================================================================== -->
-  <target name="xsltc.brazil" depends="jar,xsltc.brazil.nojardepends"/>
+  <target name="xsltc.brazil" depends="jar,xsltc.brazil.jardepends"/>
 
-  <target name="xsltc.brazil.nojardepends">
+  <target name="xsltc.brazil.jardepends">
     <mkdir dir="${build.samples}/CompiledBrazil"/>
     <javac srcdir="${samples.dir}/CompiledBrazil"
            destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-    	   target="${compiler.target}" source="${compiler.source}"/>
+    	   target="${compiler.target}" source="${compiler.source}">
+    	<classpath location="${brazil.jar}"/>
+  	</javac>
     <jar jarfile="${build.xsltc.brazil.jar}"
          basedir="${build.samples}/CompiledBrazil"
          includes="*.class"/>

Added: xalan/java/branches/xalan-j_2_7_1_maint/lib/brazil-2.1.jar
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/lib/brazil-2.1.jar?rev=1581694&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xalan/java/branches/xalan-j_2_7_1_maint/lib/brazil-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org