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

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