Browse Source

Add mig files to our jar after it's built, and prevent the default copylibs task from running

tags/0.6.3m1rc1
Chris Smith 15 years ago
parent
commit
3c8ac4ca3f
3 changed files with 17 additions and 6 deletions
  1. 15
    0
      build-jar.xml
  2. 2
    0
      build.xml
  3. 0
    6
      nbproject/build-impl.xml

+ 15
- 0
build-jar.xml View File

@@ -0,0 +1,15 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project name="DMDirc-jar" default="default" basedir=".">
3
+
4
+    <!-- Netbeans property files -->
5
+    <property file="nbproject/project.properties"/>
6
+    <property file="nbproject/private/private.properties"/>
7
+    <property file="${user.properties.file}"/>
8
+    
9
+    <target name="-addjarlibs">
10
+        <jar destfile="${dist.jar}" compress="${jar.compress}" keepcompression="true" update="true">
11
+            <zipfileset src="${file.reference.miglayout.jar}" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
12
+        </jar>
13
+    </target>
14
+
15
+</project>

+ 2
- 0
build.xml View File

@@ -6,6 +6,7 @@
6 6
 
7 7
     <import file="nbproject/build-impl.xml"/>
8 8
     <import file="build-installer.xml"/>
9
+    <import file="build-jar.xml"/>
9 10
     <import file="build-plugins.xml"/>
10 11
     <import file="build-reports.xml"/>
11 12
     <import file="build-svn.xml"/>
@@ -14,5 +15,6 @@
14 15
     <target name="-post-compile" depends="-unsvn, build-plugins"/>
15 16
     <target name="-pre-compile" depends="-addsvn"/>
16 17
     <target name="-post-test-run" depends="-do-test-reports"/>
18
+    <target name="-post-jar" depends="-addjarlibs"/>
17 19
 
18 20
 </project>

+ 0
- 6
nbproject/build-impl.xml View File

@@ -57,12 +57,6 @@ is divided into following sections:
57 57
                 </not>
58 58
             </and>
59 59
         </condition>
60
-        <condition property="manifest.available+main.class+mkdist.available">
61
-            <and>
62
-                <istrue value="${manifest.available+main.class}"/>
63
-                <isset property="libs.CopyLibs.classpath"/>
64
-            </and>
65
-        </condition>
66 60
         <condition property="have.tests">
67 61
             <or>
68 62
                 <available file="${test.src.dir}"/>

Loading…
Cancel
Save