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

   1 --- a/build.xml 2011-04-23 11:31:08.000408298 -0600
   2 +++ b/build.xml 2011-04-23 11:30:57.881335056 -0600
   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,11 @@
  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/itext5.jar"/>
  18 +               <pathelement location="/usr/share/java/jcommon.jar"/>
  19 +               <pathelement location="/usr/share/java/jfreechart.jar"/>
  20 +               <pathelement location="/usr/share/java/miglayout.jar"/>
  21         </path>
  22
  23         <path id="test-classpath">
  24 @@ -36,7 +39,7 @@
  25                 <pathelement location="${build-test.dir}"/>
  26                 <pathelement location="${classes.dir}"/>
  27                 <pathelement location="${src-test.dir}"/>
  28 -               <fileset dir="lib-test/" includes="*.jar"/>
  29 +               <pathelement location="/usr/share/java/junit4.jar"/>
  30         </path>
  31
  32
  33 @@ -69,11 +72,9 @@
  34                         <manifest>
  35                                 <attribute name="Main-Class" value="${main-class}"/>
  36                                 <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
  37 +                               <attribute name="Class-Path" value="/usr/share/j
  38 +ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext5.jar"/>
  39                         </manifest>
  40 -                       <zipfileset src="lib/miglayout15-swing.jar" />
  41 -                       <zipfileset src="lib/jcommon-1.0.16.jar" />
  42 -                       <zipfileset src="lib/jfreechart-1.0.13.jar" />
  43 -                       <zipfileset src="lib/iText-5.0.2.jar" />
  44                 </jar>
  45         </target>
  46
  47 @@ -89,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 @@ -213,4 +214,4 @@
  57                 </echo>
  58         </target>
  59
  60 -</project>
  61 \ No newline at end of file
  62 +</project>