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

   1 diff -u -r a/build.xml b/build.xml
   2 --- a/build.xml 2011-04-23 11:31:08.000408298 -0600
   3 +++ b/build.xml 2011-04-23 11:38:22.363543631 -0600
   4 @@ -13,7 +13,6 @@
   5
   6         <property name="classes.dir" value="${dist.dir}"/>      <!-- Directory for classes -->
   7         <property name="jar.dir"     value="${build.dir}/jar"/> <!-- Directory for built jar's -->
   8 -       <property name="lib.dir"     value="lib"/>                              <!-- Library source directory -->
   9
  10         <property name="pkgname"     value="${ant.project.name}-${build.version}"/>
  11
  12 @@ -27,7 +26,12 @@
  13
  14         <!-- Classpath definitions -->
  15         <path id="classpath">
  16 -               <fileset dir="${lib.dir}" includes="**/*.jar"/>
  17 +               <!-- update manifest class-path definition below too when making changes here -->
  18 +               <pathelement location="/usr/share/java/itext5.jar"/>
  19 +               <pathelement location="/usr/share/java/jcommon.jar"/>
  20 +               <pathelement location="/usr/share/java/jfreechart.jar"/>
  21 +               <pathelement location="/usr/share/java/jmock2.jar"/>
  22 +               <pathelement location="/usr/share/java/miglayout.jar"/>
  23         </path>
  24
  25         <path id="test-classpath">
  26 @@ -36,7 +40,7 @@
  27                 <pathelement location="${build-test.dir}"/>
  28                 <pathelement location="${classes.dir}"/>
  29                 <pathelement location="${src-test.dir}"/>
  30 -               <fileset dir="lib-test/" includes="*.jar"/>
  31 +               <pathelement location="/usr/share/java/junit4.jar"/>
  32         </path>
  33
  34
  35 @@ -69,11 +73,9 @@
  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/j
  40 +ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext5.jar"/>
  41                         </manifest>
  42 -                       <zipfileset src="lib/miglayout15-swing.jar" />
  43 -                       <zipfileset src="lib/jcommon-1.0.16.jar" />
  44 -                       <zipfileset src="lib/jfreechart-1.0.13.jar" />
  45 -                       <zipfileset src="lib/iText-5.0.2.jar" />
  46                 </jar>
  47         </target>
  48
  49 @@ -89,7 +91,7 @@
  50                         <fileset dir="." includes="*">
  51                                 <type type="file"/>
  52                         </fileset>
  53 -                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
  54 +                       <fileset dir="." includes="datafiles/ pix/ src/ test/"/>
  55                 </copy>
  56                 <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
  57                 <delete dir="${build.dir}/${pkgname}"/>
  58 @@ -213,4 +215,4 @@
  59                 </echo>
  60         </target>
  61
  62 -</project>
  63 \ No newline at end of file
  64 +</project>