Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 146593 | Differences between
and this patch

Collapse All | Expand All

(-)a/build.xml (-7 / +6 lines)
Lines 21-27 elharo@metalab.unc.edu. Please include the word "XOM" in the Link Here
21
subject line. The XOM home page is http://www.xom.nu/
21
subject line. The XOM home page is http://www.xom.nu/
22
-->
22
-->
23
<project name="XOM" default="help" basedir=".">
23
<project name="XOM" default="help" basedir=".">
24
25
    <description>
24
    <description>
26
      Build XOM
25
      Build XOM
27
    </description>
26
    </description>
Lines 42-48 subject line. The XOM home page is http://www.xom.nu/ Link Here
42
  	<!-- Can I have an if statement here to check if ${microversion} is an empty string before adding a period? 
41
  	<!-- Can I have an if statement here to check if ${microversion} is an empty string before adding a period? 
43
  	     Problem is release version doesn't get a version qualifier. -->
42
  	     Problem is release version doesn't get a version qualifier. -->
44
    <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.osgi"/>
43
    <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.osgi"/>
45
    <property name="jaxenversion" value="1.1.3"/>
44
    <property name="jaxenversion" value="1.1.1"/>
46
    <!-- <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.${versionqualifier}.osgi"/> -->
45
    <!-- <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.${versionqualifier}.osgi"/> -->
47
    <property name="year"    value="2010"/>
46
    <property name="year"    value="2010"/>
48
47
Lines 71-77 subject line. The XOM home page is http://www.xom.nu/ Link Here
71
    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
70
    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
72
71
73
    <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
72
    <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
74
    <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
73
    <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
75
    <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
74
    <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
76
    <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
75
    <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
77
    <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
76
    <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
Lines 226-232 XOM Build file Link Here
226
           encoding="UTF-8"
225
           encoding="UTF-8"
227
    	   fork="true"
226
    	   fork="true"
228
           includeAntRuntime="false"
227
           includeAntRuntime="false"
229
           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
228
excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
230
       <classpath refid="compile.class.path"/>
229
       <classpath refid="compile.class.path"/>
231
    </javac>
230
    </javac>
232
    <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
231
    <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
Lines 323-329 XOM Build file Link Here
323
322
324
  <target name="jar" depends="compile" description="Create xom.jar">
323
  <target name="jar" depends="compile" description="Create xom.jar">
325
  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
324
  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
326
  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
325
  	        classpath="${lib.dir}/jarjar.jar"/>
327
    <jarjar jarfile="${build.dir}/${name}-${version}.jar"
326
    <jarjar jarfile="${build.dir}/${name}-${version}.jar"
328
         basedir="${build.dest}"
327
         basedir="${build.dest}"
329
         index="no"
328
         index="no"
Lines 862-869 location="${dist.dir}/maven1/xom-maven-${version}.jar" /> Link Here
862
  </target>
861
  </target>
863
862
864
863
865
  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
864
  <target name="compile-jaxen" description="Compile Jaxen">
866
    <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
865
    <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main"
867
           destdir="${build.dir}/jaxen-classes"
866
           destdir="${build.dir}/jaxen-classes"
868
           debug="${debug}"
867
           debug="${debug}"
869
           optimize="${optimize}"
868
           optimize="${optimize}"

Return to bug 146593