File _service:tar_scm:xom-build.patch of Package xom

File _service:tar_scm:xom-build.patch of Package xom (Revision fa2511a20fe5124222b4879b1e701181)

Currently displaying revision fa2511a20fe5124222b4879b1e701181 , Show latest

diff --git a/build.xml b/build.xml
index afe9c1f..23f2797 100644
--- a/build.xml
+++ b/build.xml
@@ -68,11 +68,11 @@ subject line. The XOM home page is http://www.xom.nu/
     <property name="dist.dir"        value="./dist"/>    
     <property name="clover.dir"      value="./clover"/>
     <property name="testreports.dir" value="./testreports" />
-    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
 
     <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
     <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
     <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
+    <property name="jaxen.jar"      value="${lib.dir}/jaxen.jar"/>
     <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
     <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
     <property name="junit.jar"      value="${lib.dir}/junit.jar"/>
@@ -107,7 +107,7 @@ subject line. The XOM home page is http://www.xom.nu/
       <pathelement location="${xml-apis.jar}"/>
       <pathelement location="${parser.jar}"/>
       <pathelement location="${junit.jar}"/>
-      <pathelement location="${jaxen.dir}"/>
+      <pathelement location="${jaxen.jar}"/>
       <pathelement location="${servlet.jar}"/>
     </path>
 
@@ -115,7 +115,7 @@ subject line. The XOM home page is http://www.xom.nu/
       <pathelement location="${xml-apis.jar}"/>
       <pathelement location="${parser.jar}"/>
       <pathelement location="${xom-core}"/>
-      <pathelement location="${jaxen.dir}"/>
+      <pathelement location="${jaxen.jar}"/>
       <pathelement location="${xslt.jar}"/>
       <pathelement location="${serializer.jar}"/>
     </path>
@@ -214,15 +214,15 @@ XOM Build file
   </target>
 
 
-  <target name="compile-core" depends="prepare, compile-jaxen" 
+  <target name="compile-core" depends="prepare"
           description="Compile the source code">
     <javac srcdir="${build.src}"
            destdir="${build.dest}"
            debug="${debug}"
            optimize="${optimize}"
            deprecation="${deprecation}"
-           target="1.2"
-           source="1.3"
+           target="1.6"
+           source="1.6"
            encoding="UTF-8"
     	   fork="true"
            includeAntRuntime="false"
@@ -253,8 +253,8 @@ XOM Build file
            debug="${debug}"
            optimize="${optimize}"
            deprecation="${deprecation}"
-           target="1.2"
-           source="1.3"
+           target="1.6"
+           source="1.6"
            encoding="UTF-8"
            includeAntRuntime="false">
        <classpath refid="compile.class.path"/>
@@ -270,8 +270,8 @@ XOM Build file
            debug="${debug}"
            optimize="${optimize}"
            deprecation="${deprecation}"
-           target="1.2"
-           source="1.3"
+           target="1.5"
+           source="1.5"
            encoding="UTF-8"
            failonerror="false"
            includeAntRuntime="false">
@@ -330,13 +330,7 @@ XOM Build file
 		 compress="yes"
          includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
          excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
-
-      <fileset dir="${jaxen.dir}"
-         excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/w3c/dom/UserDataHandler.class org/jaxen/pattern/PriorityTest.class">
-      </fileset>
     
-      <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
-
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
         <attribute name="Specification-Title"    value="XOM"/>
@@ -512,8 +506,8 @@ XOM Build file
            debug="${debug}"
            optimize="${optimize}"
            deprecation="${deprecation}"
-           target="1.2"
-           source="1.3"
+           target="1.5"
+           source="1.5"
            encoding="UTF-8"
            includeAntRuntime="false"
            includes="nu/xom/tools/*">
@@ -840,7 +834,7 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
   
-  <target name="maven2" depends="jar, sources.jar, javadoc.jar" >
+  <target name="maven2" depends="jar" >
       <property name="pom2.template" location="project2.xml" />
       <property name="pom2.file" location="${build.dir}/maven2/project.xml" />
       <property name="package.jar" location="${build.dir}/${name}-${version}.jar"/>
@@ -862,14 +856,14 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
   </target>
 
 
-  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
+  <target name="compile-jaxen" description="Compile Jaxen">
     <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
            destdir="${build.dir}/jaxen-classes"
            debug="${debug}"
            optimize="${optimize}"
            deprecation="${deprecation}"
-           target="1.2"
-           source="1.3"
+           target="1.5"
+           source="1.5"
            encoding="UTF-8"
            includeAntRuntime="false"
            excludes="org/jaxen/dom/** 
@@ -891,10 +885,6 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
        <classpath refid="compile.class.path"/>
     </javac>  
   </target>
-  
-  <target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
-      <unzip src="jaxen-${jaxenversion}-src.zip" dest="${build.dir}" />
-  </target>
 
   <target name="debug" depends="init" description="Print various Ant properties">
     <echoproperties/>