[dmdirc commit] r5833 - trunk

[com...@dmdirc.com]

Author: chris87
Date: 2010-01-24 21:57:04 +0000 (Sun, 24 Jan 2010)
New Revision: 5833

Modified:
trunk/build-jar.xml
trunk/createPluginJar.sh
Log:
Plugin build changes for webui plugin

Git-version: 0.6.3m2-375-gfc2b70d

Modified: trunk/build-jar.xml
===================================================================
--- trunk/build-jar.xml 2010-01-24 21:41:05 UTC (rev 5832)
+++ trunk/build-jar.xml 2010-01-24 21:57:04 UTC (rev 5833)
@@ -10,17 +10,20 @@
<target name="-addpluginlibs">
<jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
<zipfileset src="modules/plugins/lib/miglayout-3.7.2-swing.jar" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
- </jar>
- <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
<zipfileset src="modules/plugins/lib/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
</jar>

<jar destfile="plugins/parser_twitter.jar" compress="${jar.compress}" keepcompression="true" update="true">
<zipfileset src="modules/plugins/lib/commons-codec-1.3.jar" includes="org/apache/**"/>
- </jar>
- <jar destfile="plugins/parser_twitter.jar" compress="${jar.compress}" keepcompression="true" update="true">
<zipfileset src="modules/plugins/lib/signpost-core-1.1-SNAPSHOT.jar" includes="com/google/** oauth/signpost/**"/>
</jar>
+
+ <jar destfile="plugins/ui_web.jar" compress="${jar.compress}" keepcompression="true" update="true">
+ <zipfileset src="modules/plugins/lib/commons-lang-2.4.jar" includes="org/apache/**"/>
+ <zipfileset src="modules/plugins/lib/jetty-6.1.22.jar" includes="org/mortbay/**"/>
+ <zipfileset src="modules/plugins/lib/jetty-util-6.1.22.jar" includes="org/mortbay/**"/>
+ <zipfileset src="modules/plugins/lib/servlet-api-2.5-20081211.jar" includes="javax/servlet/**"/>
+ </jar>
</target>

</project>

Modified: trunk/createPluginJar.sh
===================================================================
--- trunk/createPluginJar.sh 2010-01-24 21:41:05 UTC (rev 5832)
+++ trunk/createPluginJar.sh 2010-01-24 21:57:04 UTC (rev 5833)
@@ -83,7 +83,7 @@
/bin/sh "${prepackage}"
cd ${DIR}
done;
- 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
+ jar -uvf "${srcdir}/src/${foldername}/${2}.jar" `ls -1 ${foo}${bit}/*.{class,png,exe,dll,html,css,js,gif} 2>/dev/null` >/dev/null
fi
done

[com...@dmdirc.com]