git.gag.com Git - debian/openrocket/blob - debian/patches/use-system-libs.diff

   1 --- build.xml   2011-03-05 13:28:54.000000000 -0700
   2 +++ /tmp/build.xml      2011-03-08 21:53:31.781302342 -0700
   3 @@ -13,7 +13,6 @@
   4
   5         <property name="classes.dir" value="${dist.dir}"/>      <!-- Directory for classes -->
   6         <property name="jar.dir"     value="${build.dir}/jar"/> <!-- Directory for built jar's -->
   7 -       <property name="lib.dir"     value="lib"/>                              <!-- Library source directory -->
   8
   9         <property name="pkgname"     value="${ant.project.name}-${build.version}"/>
  10
  11 @@ -27,7 +26,10 @@
  12
  13         <!-- Classpath definitions -->
  14         <path id="classpath">
  15 -               <fileset dir="${lib.dir}" includes="**/*.jar"/>
  16 +               <!-- update manifest class-path definition below too when making changes here -->
  17 +               <pathelement location="/usr/share/java/jcommon.jar"/>
  18 +               <pathelement location="/usr/share/java/jfreechart.jar"/>
  19 +               <pathelement location="/usr/share/java/miglayout.jar"/>
  20         </path>
  21
  22         <path id="test-classpath">
  23 @@ -36,7 +38,7 @@
  24                 <pathelement location="${build-test.dir}"/>
  25                 <pathelement location="${classes.dir}"/>
  26                 <pathelement location="${src-test.dir}"/>
  27 -               <fileset dir="lib-test/" includes="*.jar"/>
  28 +               <pathelement location="/usr/share/java/junit4.jar"/>
  29         </path>
  30
  31
  32 @@ -69,11 +71,9 @@
  33                         <manifest>
  34                                 <attribute name="Main-Class" value="${main-class}"/>
  35                                 <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
  36 +                               <attribute name="Class-Path" value="/usr/share/j
  37 +ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext.jar"/>
  38                         </manifest>
  39 -                       <zipfileset src="lib/miglayout15-swing.jar" />
  40 -                       <zipfileset src="lib/jcommon-1.0.16.jar" />
  41 -                       <zipfileset src="lib/jfreechart-1.0.13.jar" />
  42 -                       <zipfileset src="lib/iText-5.0.2.jar" />
  43                 </jar>
  44         </target>
  45
  46 @@ -89,7 +89,7 @@
  47                         <fileset dir="." includes="*">
  48                                 <type type="file"/>
  49                         </fileset>
  50 -                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
  51 +                       <fileset dir="." includes="datafiles/ pix/ src/ test/"/>
  52                 </copy>
  53                 <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
  54                 <delete dir="${build.dir}/${pkgname}"/>
  55 @@ -213,4 +213,4 @@
  56                 </echo>
  57         </target>
  58
  59 -</project>
  60 \ No newline at end of file
  61 +</project>