Browse Source

Add mig to ui_swing before the main jar is created.

Always add all plugins the the main jar even if they are all up to date.
tags/0.6.3m1rc1
Shane Mc Cormack 15 years ago
parent
commit
5e0e658ae0
4 changed files with 7 additions and 6 deletions
  1. 2
    1
      build-jar.xml
  2. 1
    0
      build.xml
  3. 4
    0
      createAllPluginJar.sh
  4. 0
    5
      createPluginJar.sh

+ 2
- 1
build-jar.xml View File

@@ -6,7 +6,8 @@
6 6
     <property file="nbproject/private/private.properties"/>
7 7
     <property file="${user.properties.file}"/>
8 8
     
9
-    <target name="-addjarlibs">
9
+    <target name="-addjarlibs" />
10
+    <target name="-addpluginlibs">
10 11
         <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
11 12
             <zipfileset src="${file.reference.miglayout.jar}" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
12 13
         </jar>

+ 1
- 0
build.xml View File

@@ -14,6 +14,7 @@
14 14
 
15 15
     <target name="-post-compile" depends="-write-version, build-plugins"/>
16 16
     <target name="-post-test-run" depends="-do-test-reports"/>
17
+    <target name="-pre-jar" depends="-addpluginlibs"/>
17 18
     <target name="-post-jar" depends="-addjarlibs"/>
18 19
 
19 20
 </project>

+ 4
- 0
createAllPluginJar.sh View File

@@ -13,3 +13,7 @@ if [ ${?} = "0" ]; then
13 13
 		fi
14 14
 	done
15 15
 fi
16
+
17
+if [ -d ${srcdir}/build/classes -a ! -e ${srcdir}/build/classes/plugins ]; then
18
+	ln -s ${srcdir}/plugins ${srcdir}/build/classes/plugins;
19
+fi

+ 0
- 5
createPluginJar.sh View File

@@ -75,11 +75,6 @@ ln -s ${srcdir}/build/classes/${foldername} .
75 75
 cd $TMPDIR
76 76
 mkdir -p ${srcdir}/plugins/
77 77
 
78
-if [ -d ${srcdir}/build/classes -a ! -e ${srcdir}/build/classes/plugins ]; then
79
-	ln -s ${srcdir}/plugins ${srcdir}/build/classes/plugins;
80
-fi
81
-
82
-
83 78
 rm -Rf ${srcdir}/plugins/${2}.jar
84 79
 jar -cvf ${srcdir}/src/${foldername}/${2}.jar META-INF >/dev/null
85 80
 bit=""

Loading…
Cancel
Save