Преглед изворни кода

Plugin build changes for webui plugin

Change-Id: I8cc2d3256f028eb0d9a813d5eeb7d16e38ecda37
Reviewed-on: http://gerrit.dmdirc.com/609
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.3b1
Chris Smith пре 14 година
родитељ
комит
fc2b70d90c
2 измењених фајлова са 8 додато и 5 уклоњено
  1. 7
    4
      build-jar.xml
  2. 1
    1
      createPluginJar.sh

+ 7
- 4
build-jar.xml Прегледај датотеку

@@ -10,17 +10,20 @@
10 10
     <target name="-addpluginlibs">
11 11
         <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
12 12
             <zipfileset src="modules/plugins/lib/miglayout-3.7.2-swing.jar" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
13
-        </jar>
14
-        <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
15 13
             <zipfileset src="modules/plugins/lib/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
16 14
         </jar>
17 15
 
18 16
 	<jar destfile="plugins/parser_twitter.jar" compress="${jar.compress}" keepcompression="true" update="true">
19 17
             <zipfileset src="modules/plugins/lib/commons-codec-1.3.jar" includes="org/apache/**"/>
20
-        </jar>
21
-        <jar destfile="plugins/parser_twitter.jar" compress="${jar.compress}" keepcompression="true" update="true">
22 18
             <zipfileset src="modules/plugins/lib/signpost-core-1.1-SNAPSHOT.jar" includes="com/google/** oauth/signpost/**"/>
23 19
         </jar>
20
+
21
+        <jar destfile="plugins/ui_web.jar" compress="${jar.compress}" keepcompression="true" update="true">
22
+            <zipfileset src="modules/plugins/lib/commons-lang-2.4.jar" includes="org/apache/**"/>
23
+            <zipfileset src="modules/plugins/lib/jetty-6.1.22.jar" includes="org/mortbay/**"/>
24
+            <zipfileset src="modules/plugins/lib/jetty-util-6.1.22.jar" includes="org/mortbay/**"/>
25
+            <zipfileset src="modules/plugins/lib/servlet-api-2.5-20081211.jar" includes="javax/servlet/**"/>
26
+        </jar>
24 27
     </target>
25 28
 
26 29
 </project>

+ 1
- 1
createPluginJar.sh Прегледај датотеку

@@ -83,7 +83,7 @@ while [ 1 -eq 1 ]; do
83 83
 			/bin/sh "${prepackage}"
84 84
 			cd ${DIR}
85 85
 		done;
86
-		jar -uvf "${srcdir}/src/${foldername}/${2}.jar" `ls -1 ${foo}${bit}/*.class ${foo}${bit}/*.png ${foo}${bit}/*.exe ${foo}${bit}/*.dll 2>/dev/null` >/dev/null
86
+		jar -uvf "${srcdir}/src/${foldername}/${2}.jar" `ls -1 ${foo}${bit}/*.{class,png,exe,dll,html,css,js,gif} 2>/dev/null` >/dev/null
87 87
 	fi
88 88
 done
89 89
 

Loading…
Откажи
Сачувај