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

(-)build.xml (-23 / +11 lines)
Lines 68-81 Link Here
68
    <property name="dist.dir"        value="./dist"/>    
68
    <property name="dist.dir"        value="./dist"/>    
69
    <property name="clover.dir"      value="./clover"/>
69
    <property name="clover.dir"      value="./clover"/>
70
    <property name="testreports.dir" value="./testreports" />
70
    <property name="testreports.dir" value="./testreports" />
71
    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
71
    <property name="jaxen.jar"       value="${lib.dir}/jaxen.jar"/>
72
72
73
    <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
73
    <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
74
    <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
74
    <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
75
    <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
75
    <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
76
    <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
76
    <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
77
    <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
77
    <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
78
    <property name="junit.jar"      value="${lib.dir}/junit.jar"/>
78
    <property name="junit.jar"      value="${lib.dir}/junit.jar"/>
79
	<property name="ant-junit.jar"	value="${lib.dir}/ant-junit.jar"/>
79
    <property name="xom.jar"        value="${build.dir}/${name}-${version}.jar"/>
80
    <property name="xom.jar"        value="${build.dir}/${name}-${version}.jar"/>
80
    <property name="xom-core"       value="${build.dest}"/>
81
    <property name="xom-core"       value="${build.dest}"/>
81
    
82
    
Lines 107-113 Link Here
107
      <pathelement location="${xml-apis.jar}"/>
108
      <pathelement location="${xml-apis.jar}"/>
108
      <pathelement location="${parser.jar}"/>
109
      <pathelement location="${parser.jar}"/>
109
      <pathelement location="${junit.jar}"/>
110
      <pathelement location="${junit.jar}"/>
110
      <pathelement location="${jaxen.dir}"/>
111
      <pathelement location="${jaxen.jar}"/>
111
      <pathelement location="${servlet.jar}"/>
112
      <pathelement location="${servlet.jar}"/>
112
    </path>
113
    </path>
113
114
Lines 115-121 Link Here
115
      <pathelement location="${xml-apis.jar}"/>
116
      <pathelement location="${xml-apis.jar}"/>
116
      <pathelement location="${parser.jar}"/>
117
      <pathelement location="${parser.jar}"/>
117
      <pathelement location="${xom-core}"/>
118
      <pathelement location="${xom-core}"/>
118
      <pathelement location="${jaxen.dir}"/>
119
      <pathelement location="${jaxen.jar}"/>
119
      <pathelement location="${xslt.jar}"/>
120
      <pathelement location="${xslt.jar}"/>
120
      <pathelement location="${serializer.jar}"/>
121
      <pathelement location="${serializer.jar}"/>
121
    </path>
122
    </path>
Lines 123-128 Link Here
123
    <path id="test.class.path">
124
    <path id="test.class.path">
124
      <path refid="run.class.path"/>
125
      <path refid="run.class.path"/>
125
      <pathelement location="${junit.jar}"/>
126
      <pathelement location="${junit.jar}"/>
127
      <pathelement location="${ant-junit.jar}"/>
126
      <pathelement location="${saxon6.jar}"/>
128
      <pathelement location="${saxon6.jar}"/>
127
      <pathelement location="${saxon7.jar}"/>
129
      <pathelement location="${saxon7.jar}"/>
128
      <pathelement location="${gnujaxp.jar}"/>
130
      <pathelement location="${gnujaxp.jar}"/>
Lines 214-220 Link Here
214
  </target>
216
  </target>
215
217
216
218
217
  <target name="compile-core" depends="prepare, compile-jaxen" 
219
  <target name="compile-core" depends="prepare" 
218
          description="Compile the source code">
220
          description="Compile the source code">
219
    <javac srcdir="${build.src}"
221
    <javac srcdir="${build.src}"
220
           destdir="${build.dest}"
222
           destdir="${build.dest}"
Lines 226-232 Link Here
226
           encoding="UTF-8"
228
           encoding="UTF-8"
227
    	   fork="true"
229
    	   fork="true"
228
           includeAntRuntime="false"
230
           includeAntRuntime="false"
229
           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
231
           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/* nu/xom/samples/inner/* nu/xom/tests/*">
230
       <classpath refid="compile.class.path"/>
232
       <classpath refid="compile.class.path"/>
231
    </javac>
233
    </javac>
232
    <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
234
    <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
Lines 322-342 Link Here
322
324
323
325
324
  <target name="jar" depends="compile" description="Create xom.jar">
326
  <target name="jar" depends="compile" description="Create xom.jar">
325
  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
327
    <jar jarfile="${build.dir}/${name}-${version}.jar"
326
  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
327
    <jarjar jarfile="${build.dir}/${name}-${version}.jar"
328
         basedir="${build.dest}"
328
         basedir="${build.dest}"
329
         index="no"
329
         index="no"
330
		 compress="yes"
330
		 compress="yes"
331
         includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
331
         includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
332
         excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
332
         excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
333
333
334
      <fileset dir="${jaxen.dir}"
335
         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/jaxen/pattern/PriorityTest.class">
336
      </fileset>
337
    
338
      <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
339
340
      <manifest>
334
      <manifest>
341
        <attribute name="Built-By" value="${user.name}"/>
335
        <attribute name="Built-By" value="${user.name}"/>
342
        <attribute name="Specification-Title"    value="XOM"/>
336
        <attribute name="Specification-Title"    value="XOM"/>
Lines 368-379 Link Here
368
          <attribute name="Implementation-Version" value="${version}"/>
362
          <attribute name="Implementation-Version" value="${version}"/>
369
          <attribute name="Implementation-Vendor"  value="Elliotte Rusty Harold"/>          
363
          <attribute name="Implementation-Vendor"  value="Elliotte Rusty Harold"/>          
370
       </section>
364
       </section>
371
        <section name="nu/xom/jaxen/">
372
          <attribute name="Specification-Title"    value="Jaxen XPath engine"/>
373
          <attribute name="Implementation-Title"   value="org.jaxen"/>
374
          <attribute name="Implementation-Version" value="${jaxenversion}"/>
375
          <attribute name="Implementation-Vendor"  value="CodeHaus"/>
376
        </section>
377
        <section name="nu/xom/xslt/">
365
        <section name="nu/xom/xslt/">
378
          <attribute name="Sealed" value="true"/>
366
          <attribute name="Sealed" value="true"/>
379
          <attribute name="Specification-Title"   value="XOM XSLT interface"/>
367
          <attribute name="Specification-Title"   value="XOM XSLT interface"/>
Lines 395-401 Link Here
395
          <attribute name="Implementation-Title"  value="nu.xom.canonical"/>
383
          <attribute name="Implementation-Title"  value="nu.xom.canonical"/>
396
        </section>
384
        </section>
397
      </manifest>
385
      </manifest>
398
    </jarjar>
386
    </jar>
399
  	
387
  	
400
  	<!-- Put a copy in the dist dir too, because I never remember to upload 
388
  	<!-- Put a copy in the dist dir too, because I never remember to upload 
401
  	     the jar from the build directory. -->
389
  	     the jar from the build directory. -->
Lines 524-530 Link Here
524
    </javac>
512
    </javac>
525
    
513
    
526
    <java classname="nu.xom.tools.XHTMLJavaDoc" fork="yes"> 
514
    <java classname="nu.xom.tools.XHTMLJavaDoc" fork="yes"> 
527
      <jvmarg value="-Xbootclasspath/p:lib/dtd-xercesImpl.jar:lib/xml-apis.jar:lib/xalan.jar"/> 
515
      <jvmarg value="-Xbootclasspath/p:lib/xercesImpl.jar:lib/xml-apis.jar:lib/xalan.jar"/> 
528
      <classpath refid="doc.class.path" />
516
      <classpath refid="doc.class.path" />
529
      <arg value="build/apidocs"/> 
517
      <arg value="build/apidocs"/> 
530
    </java>
518
    </java>

Return to bug 146593