Package: plm / 2.6+repack-3

system-ant-tasks 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
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
Modify the ant file to use the system-wide elements instead of the
embeeded ones.

---
 build.xml |   90 ++++++++++++++++----------------------------------------------
 1 file changed, 24 insertions(+), 66 deletions(-)

Index: b/build.xml
===================================================================
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,20 @@
     <property file="${base.dir}/keystore.properties"/>
 
     <path id="project.class.path">
-            <pathelement path="${classes.dir}"/>    
+            <pathelement path="${classes.dir}"/>
+        <pathelement location="/usr/share/scala/lib/scala-compiler.jar" />
+        <pathelement location="/usr/share/scala/lib/scala-library.jar" />
+        <pathelement location="/usr/share/scala/lib/scala-reflect.jar" />
+            <pathelement location="/usr/share/java/gettext-commons.jar" />
+            <pathelement location="/usr/share/java/org.eclipse.jgit.jar" />
+            <pathelement location="/usr/share/java/miglayout.jar" />
+	    <pathelement location="/usr/share/java/rsyntaxtextarea.jar" />
+	    <pathelement location="/usr/share/java/json-simple.jar" />
+            <pathelement location="/usr/share/java/httpclient.jar" />
+	    <pathelement location="/usr/share/java/httpcore.jar" />
+	    <pathelement location="/usr/share/java/jython.jar" />
+	    <pathelement location="/usr/share/java/junit4.jar" />
+	    <pathelement location="/usr/share/java/mockito-core.jar" />
             <fileset dir="${lib.dir}">
                     <include name="**/*.jar"/>                      
             </fileset>      
@@ -50,23 +63,23 @@
         <delete dir="${site.dir}/bin"/>
     </target>
 
-    <taskdef resource="scala/tools/ant/antlib.xml">
+    <taskdef name="scalac"
+             classname="scala.tools.ant.Scalac">
       <classpath>
-        <pathelement location="${lib.dir}/scala/scala-compiler-2.11.4.jar" />
-        <pathelement location="${lib.dir}/scala/scala-library-2.11.4.jar" />
-        <pathelement location="${lib.dir}/scala/scala-reflect-2.11.4.jar" />
+        <pathelement location="/usr/share/scala/lib/scala-compiler.jar" />
+        <pathelement location="/usr/share/scala/lib/scala-library.jar" />
+        <pathelement location="/usr/share/scala/lib/scala-reflect.jar" />
       </classpath>
     </taskdef>
 	
     <target name="compile" description="compile all source files">
         <mkdir dir="${classes.dir}"/>
         <scalac classpathref="project.class.path" destdir="${classes.dir}" srcdir="${src.dir}" />
-        <javac classpathref="project.class.path" destdir="${classes.dir}" srcdir="${src.dir}" includeantruntime="false" fork="true"/>
+        <javac classpathref="project.class.path" destdir="${classes.dir}" srcdir="${src.dir}" includeantruntime="false" fork="true" encoding="UTF8"/>
     </target>    
     
     <target name="dist" depends="clean, i18n-generate-jar, compile, updateversion" description="build a standalone application jar file">
-        <mkdir dir="${dist.dir}"/>
-        <jar destfile="${dist.dir}/plm-${plm.major.version}-${plm.minor.version}.jar" filesetmanifest="mergewithoutmain">
+        <jar destfile="plm.jar">
             <manifest>
                 <attribute name="Built-By" value="M. Quinson, G. Oster and others" />
                 <attribute name="Main-Class" value="plm.core.ui.ProgrammersLearningMachine" />
@@ -77,69 +90,14 @@
             <fileset dir="${base.dir}" includes="img/*/*.png img/*.png" excludes="*"/>
             <fileset dir="${base.dir}" includes="ChangeLog" />
             <fileset dir="${lib.dir}" excludes="**/*.jar *.pl l10n/missions/* l10n/engine/*"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/RSyntaxTextArea-2.5.4.jar" />			
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/miglayout-4.2.jar" />
+<!--
             <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/tools-openjdk7.jar" />
                         
             <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/scala/scala-compiler-2.11.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/scala/scala-library-2.11.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/scala/scala-reflect-2.11.4.jar"/>
-
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jython/antlr3-runtime.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jython/asm3-3.2.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jruby-1.5.6-5.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jython/jython-2.5.1.jar"/>
-
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpclient-4.3.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpcore-4.3.2.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpmime-4.3.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/commons-logging-1.1.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/gettext-commons-0.9.6.jar"/>
-            
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/json_simple-1.1.jar" />
-            
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/plm-messages.jar" />
-            
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/gson-2.2.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/org.eclipse.egit.github.core-2.1.5.jar"/>
-	    <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/org.eclipse.jgit-3.2.0.201312181205-r.jar" />
-	    <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jsch-0.1.50.jar" />
-
-        </jar>
-
-        <jar destfile="${dist.dir}/plm-light-${plm.major.version}-${plm.minor.version}.jar" filesetmanifest="mergewithoutmain">
-            <manifest>
-                <attribute name="Built-By" value="M. Quinson and G. Oster" />
-                <attribute name="Main-Class" value="plm.core.ui.ProgrammersLearningMachine" />
-                <attribute name="Class-Path" value="." />
-            </manifest>
-            <fileset dir="${classes.dir}" excludes="**/.gitignore **/*.java **/*.css **/*.html"/>
-            <fileset dir="${src.dir}" includes="**/*.py **/*.scala **/*.java **/*.html **/*.css **/*.png **/*.map" excludes="**/.gitignore"/>
-            <fileset dir="${base.dir}" includes="img/*/*.png img/*.png" excludes="*"/>
-            <fileset dir="${base.dir}" includes="ChangeLog" />
-            <fileset dir="${lib.dir}" excludes="**/*.jar *.pl l10n/engine/* l10n/missions/*"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/RSyntaxTextArea-2.5.4.jar" />			
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/miglayout-4.2.jar" />
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/tools-openjdk7.jar" />
-
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpclient-4.3.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpcore-4.3.2.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/httpmime-4.3.4.jar"/>
-
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/commons-logging-1.1.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/gettext-commons-0.9.6.jar"/>
-            
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/json_simple-1.1.jar" />
-            
+-->
             <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/plm-messages.jar" />
             
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/gson-2.2.4.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="${lib.dir}/org.eclipse.egit.github.core-2.1.5.jar"/>
-			<zipfileset excludes="META-INF/*.SF" src="${lib.dir}/org.eclipse.jgit-3.2.0.201312181205-r.jar" />
-			<zipfileset excludes="META-INF/*.SF" src="${lib.dir}/jsch-0.1.50.jar" />
-
         </jar>
-
     </target>
     
     <target name="dist-web" depends="compile, updateversion" description="build webstart application jar files">
@@ -182,7 +140,7 @@
       </propertyfile>
     </target>
 
-    <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.3.jar"/>
+    <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
     <target name="i18n-init" description="Loads the Ant gettext tasks">
       <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
       <taskdef name="gettext-merge"   classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask"   classpath="${gettexttasks.jar}"/>