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

Collapse All | Expand All

(-)/tmp/xmlbeans-2.6.0.orig/build.xml (-11 / +10 lines)
Lines 487-494 Link Here
487
                 typeimpl.classes, xmlcomp.classes,
487
                 typeimpl.classes, xmlcomp.classes,
488
                 store.classes, saaj_api.classes,
488
                 store.classes, saaj_api.classes,
489
                 marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
489
                 marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
490
                 xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
490
                 xmlinputstream.classes, xbean_xpath.jar,
491
                 piccolo.classes, tools.classes, jamsupport.classes">
491
                 tools.classes">
492
        <jar jarfile="build/lib/xbean.jar" index="true">
492
        <jar jarfile="build/lib/xbean.jar" index="true">
493
            <fileset dir="build/classes/xmlpublic"
493
            <fileset dir="build/classes/xmlpublic"
494
                excludes="javax/**"/>
494
                excludes="javax/**"/>
Lines 508-515 Link Here
508
            <fileset dir="build/classes/xmlinputstream"/>
508
            <fileset dir="build/classes/xmlinputstream"/>
509
            <fileset dir="build/classes/marshal"/>
509
            <fileset dir="build/classes/marshal"/>
510
            <fileset dir="build/classes/repackage"/>
510
            <fileset dir="build/classes/repackage"/>
511
            <fileset dir="build/classes/jam"/>
512
            <fileset dir="build/classes/piccolo"/>
513
            <fileset dir="build/classes/tools"/>
511
            <fileset dir="build/classes/tools"/>
514
            <fileset file="LICENSE.txt"/>
512
            <fileset file="LICENSE.txt"/>
515
            <fileset file="NOTICE.txt"/>
513
            <fileset file="NOTICE.txt"/>
Lines 545-551 Link Here
545
543
546
    <!-- xmlpublic target ============================================== -->
544
    <!-- xmlpublic target ============================================== -->
547
545
548
    <target name="xmlpublic.classes" depends="dirs, jsr173_1.0.jars">
546
    <target name="xmlpublic.classes" depends="dirs">
549
        <mkdir dir="build/classes/xmlpublic"/>
547
        <mkdir dir="build/classes/xmlpublic"/>
550
        <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
548
        <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
551
            <classpath>
549
            <classpath>
Lines 597-603 Link Here
597
595
598
    <!-- common target ============================================= -->
596
    <!-- common target ============================================= -->
599
597
600
    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
598
    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
601
        <mkdir dir="build/classes/common"/>
599
        <mkdir dir="build/classes/common"/>
602
        <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
600
        <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
603
            <classpath>
601
            <classpath>
Lines 639-645 Link Here
639
637
640
    <target name="typeimpl.classes" depends="dirs, store.classes,
638
    <target name="typeimpl.classes" depends="dirs, store.classes,
641
        repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
639
        repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
642
        configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
640
        configschema.classes, toolschema.classes, jam.classes">
643
        <mkdir dir="build/classes/typeimpl"/>
641
        <mkdir dir="build/classes/typeimpl"/>
644
        <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
642
        <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
645
            <classpath>
643
            <classpath>
Lines 697-703 Link Here
697
695
698
    <!-- marshal target =============================================== -->
696
    <!-- marshal target =============================================== -->
699
697
700
    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
698
    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
701
        <mkdir dir="build/classes/marshal"/>
699
        <mkdir dir="build/classes/marshal"/>
702
        <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
700
        <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
703
            <classpath>
701
            <classpath>
Lines 716-721 Link Here
716
    <!-- support for running JAM under JDK1.5 ========================= -->
714
    <!-- support for running JAM under JDK1.5 ========================= -->
717
715
718
    <target name="jamsupport.classes" depends="dirs,jam.classes">
716
    <target name="jamsupport.classes" depends="dirs,jam.classes">
717
		<mkdir dir="build/classes/jam" />
719
        <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
718
        <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
720
            <classpath id="jamsupport.compile.path">
719
            <classpath id="jamsupport.compile.path">
721
                <pathelement location="build/classes/jam"/>
720
                <pathelement location="build/classes/jam"/>
Lines 834-840 Link Here
834
        </condition>
833
        </condition>
835
    </target>
834
    </target>
836
835
837
    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
836
    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
838
        <delete dir="build/classes/xmlschema"/>
837
        <delete dir="build/classes/xmlschema"/>
839
        <delete dir="build/src/xmlschema"/>
838
        <delete dir="build/src/xmlschema"/>
840
        <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
839
        <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
Lines 1073-1079 Link Here
1073
    </path>
1072
    </path>
1074
1073
1075
1074
1076
    <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
1075
    <target name="drt.classes" depends="dirs">
1077
        <mkdir dir="build/private/classes/drt"/>
1076
        <mkdir dir="build/private/classes/drt"/>
1078
        <javac
1077
        <javac
1079
            destdir="build/private/classes/drt"
1078
            destdir="build/private/classes/drt"
Lines 1118-1124 Link Here
1118
        </uptodate>
1117
        </uptodate>
1119
    </target>
1118
    </target>
1120
1119
1121
    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
1120
    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
1122
        <delete dir="build/private/jam"/>
1121
        <delete dir="build/private/jam"/>
1123
        <mkdir dir="build/private/jam"/>
1122
        <mkdir dir="build/private/jam"/>
1124
        <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
1123
        <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>

Return to bug 173129