Package: jebl2 / 0.1+20140614-1

do_not_build_jam.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 10 Feb 2011 10:26:38 +0100
Description: Do not build jam

--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,6 @@
     <!-- set global properties for this build -->
     <property name="src" location="src"/>
     <property name="build" location="build"/>
-    <property name="build-mac-only" location="build-mac-only"/>
 
     <property name="lib" location="lib"/>
     <property name="dist" location="dist"/>
@@ -19,31 +18,9 @@
         <tstamp/>
         <!-- Create the build directory structure used by compile -->
         <mkdir dir="${build}"/>
-        <mkdir dir="${build-mac-only}"/>
         <mkdir dir="${dist}"/>
     </target>
 
-    <target name="compile-jam" depends="init">
-        <!-- Compile the java code from ${jamsrc} into ${build} -->
-
-        <condition property="isMac">
-            <os family="mac"/>
-        </condition>
-        <javac source="1.5" srcdir="${src}" target="1.5" destdir="${build}" debug="true">
-            <include name="org/**/*"/>
-            <exclude name="org/**/maconly/*" unless = "isMac"/>
-        </javac>
-
-        <!-- Utils.class was getting included in jebl.jar    -->
-        <!-- twice and Pack200 was having issues.            -->
-        <!-- Doesn't seem to be the case for me, the class is missing! RM-->
-        <!--<delete file="${build}/org/virion/jam/mac/Utils.class"/>-->
-
-        <copy todir="${build}">
-            <fileset dir="${src}" includes="org/**/*.png"/>
-        </copy>
-    </target>
-
     <target name="clean">
         <mkdir dir="${build}"/>
         <delete includeEmptyDirs="true">
@@ -52,38 +29,6 @@
 
     </target>
 
-    <target name="compile-jam-mac-only" depends="init">
-        <!-- Compile the java code from ${jamsrc} into ${build} -->
-        <condition property="isMac">
-            <os family="mac"/>
-        </condition>
-        <javac source="1.5" srcdir="${src}" target="1.5" destdir="${build-mac-only}">
-            <include name="org/**/maconly/*"/>
-        </javac>
-    </target>
-
-    <target name="dist-jam-mac-only" depends="compile-jam-mac-only" description="generate the -mac-only distribution">
-        <!-- Create the distribution directory -->
-        <mkdir dir="${dist}"/>
-
-        <!-- create the mac-only jar file -->
-        <jar jarfile="${lib}/jam-mac-only.jar">
-            <fileset dir="${build-mac-only}" includes="**/mac*/**/*.class,*.properties"/>
-        </jar>
-    </target>
-
-
-    <target name="dist-jam" depends="compile-jam" description="generate the JAM distribution">
-        <!-- Create the distribution directory -->
-        <mkdir dir="${dist}"/>
-        <delete file="${dist}/jam.jar"/>
-        <!-- Put everything in ${build} into the jam.jar file -->
-        <jar jarfile="${dist}/jam.jar">
-            <fileset dir="${build}" includes="org/**/*.class,org/**/*.properties,org/**/*.png"/>
-            <zipgroupfileset dir="${lib}" includes="jam-mac-only.jar"/>
-        </jar>
-    </target>
-
     <target name="compile-jebl" depends="init">
         <!-- Compile the java code from ${src} into ${build} -->
         <javac source="1.5" srcdir="${src}" destdir="${build}" debug="true" target="1.5">
@@ -105,7 +50,7 @@
         </jar>
     </target>
 
-    <target name="dist" depends="dist-jebl,dist-jam" description="generate the distribution">
+    <target name="dist" depends="dist-jebl" description="generate the distribution">
         <!-- Create the distribution directory -->
         <mkdir dir="${dist}"/>
 
@@ -116,7 +61,7 @@
         </jar>
     </target>
 
-    <target name="dist-clean" depends="clean,compile-jebl,compile-jam" description="generate the distribution">
+    <target name="dist-clean" depends="clean,compile-jebl" description="generate the distribution">
         <!-- For some reason I don't fully understand, running the standard distribute
          script doesn't always work if you have done a previous build on a previous version
          of the source code. For some reason, it just doesn't compile some files. This