Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 67244
Collapse All | Expand All

(-)build.xml.orig (-2 / +30 lines)
Lines 56-61 Link Here
56
       location properties to make it simpler to reset these values; 
56
       location properties to make it simpler to reset these values; 
57
       please provide feedback if this is useful. 
57
       please provide feedback if this is useful. 
58
  -->
58
  -->
59
  <property name="javac.target" value="1.3"/>
60
  <property name="javac.source" value="${javac.target}"/>
61
59
  <property name="xmlapis.jar.name" value="xml-apis.jar"/>
62
  <property name="xmlapis.jar.name" value="xml-apis.jar"/>
60
  <property name="xmlapis.jar" value="${bin.dir}/${xmlapis.jar.name}"/>
63
  <property name="xmlapis.jar" value="${bin.dir}/${xmlapis.jar.name}"/>
61
  <property name="parser.jar.name" value="xercesImpl.jar"/>
64
  <property name="parser.jar.name" value="xercesImpl.jar"/>
Lines 184-189 Link Here
184
    <!-- Set build.boot.class.path to a JDK 1.1.x classes.zip file to check
187
    <!-- Set build.boot.class.path to a JDK 1.1.x classes.zip file to check
185
         compatibility with 1.1.x.  If you omit this property, compatability
188
         compatibility with 1.1.x.  If you omit this property, compatability
186
         with 1.1.x will not be checked even though javac specifies a target of 1.1 -->
189
         with 1.1.x will not be checked even though javac specifies a target of 1.1 -->
190
    <pathelement path="${xmlapis.jar}"/>
187
    <pathelement location="${build.classes}" />
191
    <pathelement location="${build.classes}" />
188
    <pathelement path="${build.boot.class.path}" />
192
    <pathelement path="${build.boot.class.path}" />
189
    <pathelement path="${sun.boot.class.path}" />
193
    <pathelement path="${sun.boot.class.path}" />
Lines 253-259 Link Here
253
    <javac srcdir="${src.dir}"
257
    <javac srcdir="${src.dir}"
254
           destdir="${build.classes}"
258
           destdir="${build.classes}"
255
           debug="${build.debug}"
259
           debug="${build.debug}"
256
           target="1.1" >
260
           target="${javac.target}" source="${javac.source}" >
257
      <include name="${apachexml.reldir}/**/*.java" />
261
      <include name="${apachexml.reldir}/**/*.java" />
258
      <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
262
      <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
259
      <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />      
263
      <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />      
Lines 277-283 Link Here
277
    <javac srcdir="${src.dir}" 
281
    <javac srcdir="${src.dir}" 
278
           destdir="${build.classes}"
282
           destdir="${build.classes}"
279
           debug="${build.debug}" 
283
           debug="${build.debug}" 
280
           target="1.1" >
284
           target="${javac.target}" source="${javac.source}" >
281
      <include name="${xpath.reldir}/**/*.java" />
285
      <include name="${xpath.reldir}/**/*.java" />
282
      <include name="${domxpath.reldir}/**/*.java" />
286
      <include name="${domxpath.reldir}/**/*.java" />
283
      <include name="${xalan.reldir}/**/*.java" />
287
      <include name="${xalan.reldir}/**/*.java" />
Lines 322-327 Link Here
322
    <javac srcdir="${src.dir}" 
326
    <javac srcdir="${src.dir}" 
323
           destdir="${build.classes}"
327
           destdir="${build.classes}"
324
           includes="${xsltc.reldir}/util/**/*.java"
328
           includes="${xsltc.reldir}/util/**/*.java"
329
           target="${javac.target}" source="${javac.source}"
325
           debug="${build.debug}">
330
           debug="${build.debug}">
326
      <classpath refid="xsltc.class.path" />
331
      <classpath refid="xsltc.class.path" />
327
      <bootclasspath refid="xslt.boot.class.path" />
332
      <bootclasspath refid="xslt.boot.class.path" />
Lines 384-389 Link Here
384
    <javac srcdir="${src.dir}" 
389
    <javac srcdir="${src.dir}" 
385
           destdir="${build.classes}"
390
           destdir="${build.classes}"
386
           includes="${xsltc.reldir}/**/*.java"
391
           includes="${xsltc.reldir}/**/*.java"
392
           target="${javac.target}" source="${javac.source}"
387
           debug="${build.debug}">
393
           debug="${build.debug}">
388
      <classpath refid="xsltc.class.path" />
394
      <classpath refid="xsltc.class.path" />
389
      <bootclasspath refid="xslt.boot.class.path" />
395
      <bootclasspath refid="xslt.boot.class.path" />
Lines 397-402 Link Here
397
    <javac srcdir="${src.dir}" 
403
    <javac srcdir="${src.dir}" 
398
           destdir="${build.classes}"
404
           destdir="${build.classes}"
399
           includes="${xsltc.reldir}/**/*.java"
405
           includes="${xsltc.reldir}/**/*.java"
406
           target="${javac.target}" source="${javac.source}"
400
           debug="${build.debug}">
407
           debug="${build.debug}">
401
      <classpath refid="xsltc.class.path" />
408
      <classpath refid="xsltc.class.path" />
402
      <bootclasspath refid="xslt.boot.class.path" />
409
      <bootclasspath refid="xslt.boot.class.path" />
Lines 598-668 Link Here
598
    <!-- Since the samples are packageless, they must be compiled separately. -->   
605
    <!-- Since the samples are packageless, they must be compiled separately. -->   
599
    <javac srcdir="${samples.dir}/SimpleTransform" 
606
    <javac srcdir="${samples.dir}/SimpleTransform" 
600
           destdir="${build.samples}"  excludes="${exclude}"
607
           destdir="${build.samples}"  excludes="${exclude}"
608
           target="${javac.target}" source="${javac.source}"
601
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
609
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
602
      <classpath refid="samples.class.path" />
610
      <classpath refid="samples.class.path" />
603
    </javac>           
611
    </javac>           
604
    <javac srcdir="${samples.dir}/UseStylesheetPI"   
612
    <javac srcdir="${samples.dir}/UseStylesheetPI"   
605
           destdir="${build.samples}"  excludes="${exclude}"
613
           destdir="${build.samples}"  excludes="${exclude}"
614
           target="${javac.target}" source="${javac.source}"
606
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
615
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
607
      <classpath refid="samples.class.path" />
616
      <classpath refid="samples.class.path" />
608
    </javac>           
617
    </javac>           
609
    <javac srcdir="${samples.dir}/UseStylesheetParam" 
618
    <javac srcdir="${samples.dir}/UseStylesheetParam" 
610
           destdir="${build.samples}"  excludes="${exclude}"
619
           destdir="${build.samples}"  excludes="${exclude}"
620
           target="${javac.target}" source="${javac.source}"
611
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
621
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
612
      <classpath refid="samples.class.path" />
622
      <classpath refid="samples.class.path" />
613
    </javac>           
623
    </javac>           
614
    <javac srcdir="${samples.dir}/SAX2SAX"  
624
    <javac srcdir="${samples.dir}/SAX2SAX"  
615
           destdir="${build.samples}"  excludes="${exclude}"
625
           destdir="${build.samples}"  excludes="${exclude}"
626
           target="${javac.target}" source="${javac.source}"
616
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
627
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
617
      <classpath refid="samples.class.path" />
628
      <classpath refid="samples.class.path" />
618
    </javac>           
629
    </javac>           
619
    <javac srcdir="${samples.dir}/DOM2DOM"  
630
    <javac srcdir="${samples.dir}/DOM2DOM"  
620
           destdir="${build.samples}"  excludes="${exclude}"
631
           destdir="${build.samples}"  excludes="${exclude}"
632
           target="${javac.target}" source="${javac.source}"
621
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
633
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
622
      <classpath refid="samples.class.path" />
634
      <classpath refid="samples.class.path" />
623
    </javac>           
635
    </javac>           
624
    <javac srcdir="${samples.dir}/Pipe"  
636
    <javac srcdir="${samples.dir}/Pipe"  
625
           destdir="${build.samples}"  excludes="${exclude}"
637
           destdir="${build.samples}"  excludes="${exclude}"
638
           target="${javac.target}" source="${javac.source}"
626
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
639
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
627
      <classpath refid="samples.class.path" />
640
      <classpath refid="samples.class.path" />
628
    </javac>           
641
    </javac>           
629
    <javac srcdir="${samples.dir}/UseXMLFilters"  
642
    <javac srcdir="${samples.dir}/UseXMLFilters"  
630
           destdir="${build.samples}"  excludes="${exclude}"
643
           destdir="${build.samples}"  excludes="${exclude}"
644
           target="${javac.target}" source="${javac.source}"
631
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
645
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
632
      <classpath refid="samples.class.path" />
646
      <classpath refid="samples.class.path" />
633
    </javac>           
647
    </javac>           
634
    <javac srcdir="${samples.dir}/Trace"   
648
    <javac srcdir="${samples.dir}/Trace"   
635
           destdir="${build.samples}"  excludes="${exclude}"
649
           destdir="${build.samples}"  excludes="${exclude}"
650
           target="${javac.target}" source="${javac.source}"
636
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
651
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
637
      <classpath refid="samples.class.path" />
652
      <classpath refid="samples.class.path" />
638
    </javac>           
653
    </javac>           
639
    <javac srcdir="${samples.dir}/ApplyXPath"  
654
    <javac srcdir="${samples.dir}/ApplyXPath"  
640
           destdir="${build.samples}" excludes="${exclude}" 
655
           destdir="${build.samples}" excludes="${exclude}" 
656
           target="${javac.target}" source="${javac.source}"
641
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
657
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
642
      <classpath refid="samples.class.path" />
658
      <classpath refid="samples.class.path" />
643
    </javac>
659
    </javac>
644
    <javac srcdir="${samples.dir}/ApplyXPathDOM"  
660
    <javac srcdir="${samples.dir}/ApplyXPathDOM"  
645
           destdir="${build.samples}" excludes="${exclude}" 
661
           destdir="${build.samples}" excludes="${exclude}" 
662
           target="${javac.target}" source="${javac.source}"
646
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
663
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
647
      <classpath refid="samples.class.path" />
664
      <classpath refid="samples.class.path" />
648
    </javac>             
665
    </javac>             
649
    <javac srcdir="${samples.dir}/trax"  
666
    <javac srcdir="${samples.dir}/trax"  
650
           destdir="${build.samples}" excludes="${exclude}" 
667
           destdir="${build.samples}" excludes="${exclude}" 
668
           target="${javac.target}" source="${javac.source}"
651
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
669
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
652
      <classpath refid="samples.class.path" />
670
      <classpath refid="samples.class.path" />
653
    </javac>           
671
    </javac>           
654
    <javac srcdir="${samples.dir}/extensions"  
672
    <javac srcdir="${samples.dir}/extensions"  
655
           destdir="${build.samples}" excludes="${exclude}" 
673
           destdir="${build.samples}" excludes="${exclude}" 
674
           target="${javac.target}" source="${javac.source}"
656
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
675
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
657
      <classpath refid="samples.class.path" />
676
      <classpath refid="samples.class.path" />
658
    </javac>           
677
    </javac>           
659
    <javac srcdir="${samples.dir}/Validate"  
678
    <javac srcdir="${samples.dir}/Validate"  
660
           destdir="${build.samples}" excludes="${exclude}" 
679
           destdir="${build.samples}" excludes="${exclude}" 
680
           target="${javac.target}" source="${javac.source}"
661
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
681
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
662
      <classpath refid="samples.class.path" />
682
      <classpath refid="samples.class.path" />
663
    </javac> 
683
    </javac> 
664
    <javac srcdir="${samples.dir}/TransformThread"  
684
    <javac srcdir="${samples.dir}/TransformThread"  
665
           destdir="${build.samples}" excludes="${exclude}" 
685
           destdir="${build.samples}" excludes="${exclude}" 
686
           target="${javac.target}" source="${javac.source}"
666
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
687
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
667
      <classpath refid="samples.class.path" />
688
      <classpath refid="samples.class.path" />
668
    </javac>           
689
    </javac>           
Lines 705-710 Link Here
705
     <javac srcdir="${samples.dir}/servlet"
726
     <javac srcdir="${samples.dir}/servlet"
706
            destdir="${build.servlet}/WEB-INF/classes"
727
            destdir="${build.servlet}/WEB-INF/classes"
707
            debug="${build.debug}"
728
            debug="${build.debug}"
729
            target="${javac.target}" source="${javac.source}"
708
            bootclasspathref="xslt.boot.class.path" >
730
            bootclasspathref="xslt.boot.class.path" >
709
       <classpath refid="samples.class.path" />
731
       <classpath refid="samples.class.path" />
710
     </javac>           
732
     </javac>           
Lines 745-753 Link Here
745
    <javac srcdir="${samples.dir}/translets"
767
    <javac srcdir="${samples.dir}/translets"
746
           classpath="${java.class.path}:${build.xalan.jar}" 
768
           classpath="${java.class.path}:${build.xalan.jar}" 
747
           destdir="${build.samples}" excludes="${exclude}" 
769
           destdir="${build.samples}" excludes="${exclude}" 
770
           target="${javac.target}" source="${javac.source}"
748
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
771
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
749
    <javac srcdir="${samples.dir}/CompiledJAXP"
772
    <javac srcdir="${samples.dir}/CompiledJAXP"
750
           destdir="${build.samples}" excludes="${exclude}"
773
           destdir="${build.samples}" excludes="${exclude}"
774
           target="${javac.target}" source="${javac.source}"
751
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
775
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
752
  </target>
776
  </target>
753
777
Lines 760-765 Link Here
760
    <mkdir dir="${build.samples}/CompiledApplet"/>
784
    <mkdir dir="${build.samples}/CompiledApplet"/>
761
    <javac srcdir="${samples.dir}/CompiledApplet"
785
    <javac srcdir="${samples.dir}/CompiledApplet"
762
           destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
786
           destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
787
           target="${javac.target}" source="${javac.source}"
763
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
788
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
764
    <jar jarfile="${build.xsltc.applet.jar}"
789
    <jar jarfile="${build.xsltc.applet.jar}"
765
         basedir="${build.samples}/CompiledApplet"
790
         basedir="${build.samples}/CompiledApplet"
Lines 775-780 Link Here
775
    <mkdir dir="${build.samples}/CompiledBrazil"/>
800
    <mkdir dir="${build.samples}/CompiledBrazil"/>
776
    <javac srcdir="${samples.dir}/CompiledBrazil"
801
    <javac srcdir="${samples.dir}/CompiledBrazil"
777
           destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
802
           destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
803
           target="${javac.target}" source="${javac.source}"
778
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
804
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
779
    <jar jarfile="${build.xsltc.brazil.jar}"
805
    <jar jarfile="${build.xsltc.brazil.jar}"
780
         basedir="${build.samples}/CompiledBrazil"
806
         basedir="${build.samples}/CompiledBrazil"
Lines 792-797 Link Here
792
    <mkdir dir="${build.samples}/CompiledEJB"/>
818
    <mkdir dir="${build.samples}/CompiledEJB"/>
793
    <javac srcdir="${samples.dir}/CompiledEJB"
819
    <javac srcdir="${samples.dir}/CompiledEJB"
794
           destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
820
           destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
821
           target="${javac.target}" source="${javac.source}"
795
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
822
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
796
    <jar jarfile="${build.xsltc.ejb.jar}"
823
    <jar jarfile="${build.xsltc.ejb.jar}"
797
         basedir="${build.samples}/CompiledEJB"
824
         basedir="${build.samples}/CompiledEJB"
Lines 807-812 Link Here
807
    <mkdir dir="${build.samples}/CompiledServlet"/>
834
    <mkdir dir="${build.samples}/CompiledServlet"/>
808
    <javac srcdir="${samples.dir}/CompiledServlet"
835
    <javac srcdir="${samples.dir}/CompiledServlet"
809
           destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
836
           destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
837
           target="${javac.target}" source="${javac.source}"
810
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
838
           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
811
    <jar jarfile="${build.xsltc.servlet.jar}"
839
    <jar jarfile="${build.xsltc.servlet.jar}"
812
         basedir="${build.samples}/CompiledServlet"
840
         basedir="${build.samples}/CompiledServlet"

Return to bug 67244