Changeset 7f09206


Ignore:
Timestamp:
Aug 8, 2012 12:07:17 AM (8 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
b464ef0
Parents:
5355e5b
Message:

Fixed jarScalaTest targets to actually package all classes

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/build.xml

    r5355e5b r7f09206  
    106106    <!-- jars with tests -->
    107107    <target name="jarScalaTest" depends="scalatest.compileTest">
    108         <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
     108        <mkdir dir="./build/obj_scala_jar" />
     109        <copy todir="./build/obj_scala_jar">
     110            <fileset dir="./build/">
     111                <include name="obj/**/*.class"/>
     112            </fileset>
     113            <mapper type="glob" from="obj/*" to="*" />
     114        </copy>
     115        <copy todir="./build/obj_scala_jar">
     116            <fileset dir="./build/">
     117                <include name="obj_scala/**/*.class"/>
     118            </fileset>
     119            <mapper type="glob" from="obj_scala/*" to="*" />
     120        </copy>
     121        <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
    109122    </target>
    110123    <target name="jarTest" depends="junit.compileTest">
  • router/java/build.xml

    r5355e5b r7f09206  
    132132    <!-- jars with tests -->
    133133    <target name="jarScalaTest" depends="scalatest.compileTest">
    134         <jar destfile="./build/routerscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
     134        <mkdir dir="./build/obj_scala_jar" />
     135        <copy todir="./build/obj_scala_jar">
     136            <fileset dir="./build/">
     137                <include name="obj/**/*.class"/>
     138            </fileset>
     139            <mapper type="glob" from="obj/*" to="*" />
     140        </copy>
     141        <copy todir="./build/obj_scala_jar">
     142            <fileset dir="./build/">
     143                <include name="obj_scala/**/*.class"/>
     144            </fileset>
     145            <mapper type="glob" from="obj_scala/*" to="*" />
     146        </copy>
     147        <jar destfile="./build/routerscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
    135148    </target>
    136149    <target name="jarTest" depends="junit.compileTest">
Note: See TracChangeset for help on using the changeset viewer.