Package: jaffl / 0.5.4-1

0002-remove-copyLibs-task.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
From: Torsten Werner <twerner@debian.org>
Date: Sat, 31 Jul 2010 17:52:48 +0200
Subject: [PATCH] remove <copyLibs> task

---
 nbproject/build-impl.xml |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 29af563..b95ec34 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -520,14 +520,13 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+        <jar compress="${jar.compress}" destfile="${dist.jar}" manifest="${manifest.file}">
             <fileset dir="${build.classes.dir}"/>
             <manifest>
                 <attribute name="Main-Class" value="${main.class}"/>
                 <attribute name="Class-Path" value="${jar.classpath}"/>
             </manifest>
-        </copylibs>
+        </jar>
         <echo>To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo>java -jar "${dist.jar.resolved}"</echo>
@@ -545,13 +544,12 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+        <jar compress="${jar.compress}" destfile="${dist.jar}" manifest="${manifest.file}">
             <fileset dir="${build.classes.dir}"/>
             <manifest>
                 <attribute name="Class-Path" value="${jar.classpath}"/>
             </manifest>
-        </copylibs>
+        </jar>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
@@ -566,13 +564,12 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+        <jar compress="${jar.compress}" destfile="${dist.jar}">
             <fileset dir="${build.classes.dir}"/>
             <manifest>
                 <attribute name="Class-Path" value="${jar.classpath}"/>
             </manifest>
-        </copylibs>
+        </jar>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
--