Skip to content

O
Openfire
Commit 32abeecd authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Fixed bad formatting. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5885 b35dd754-fafc-0310-a699-88a17e54d16e
parent 889969b0
Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 369 deletions
build/build.xml
View file @ 32abeecd
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
<property name="version.major" value="3"/> <property name="version.major" value="3"/>
<property name="version.minor" value="1"/> <property name="version.minor" value="1"/>
<property name="version.revision" value="1"/> <property name="version.revision" value="1"/>
<property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' --> <property name="version.extra" value=""/>
<!-- For 'beta' or 'alpha' -->
<property name="dist.prefix" value="wildfire"/> <property name="dist.prefix" value="wildfire"/>
<property file="${basedir}/build/build.properties"/> <property file="${basedir}/build/build.properties"/>
...@@ -104,7 +105,8 @@ ...@@ -104,7 +105,8 @@
<property name="test.results.dest.dir" value="${test.dest.dir}/results"/> <property name="test.results.dest.dir" value="${test.dest.dir}/results"/>
<property name="plugin.src.dir" value="${src.dir}/plugins"/> <property name="plugin.src.dir" value="${src.dir}/plugins"/>
<property name="plugin.dev.dir" value=""/> <!-- Set by a developer as alt plugin location --> <property name="plugin.dev.dir" value=""/>
<!-- Set by a developer as alt plugin location -->
<property name="plugin.dev.dest.dir" value="${work.dir}/plugins-dev"/> <property name="plugin.dev.dest.dir" value="${work.dir}/plugins-dev"/>
<property name="plugin.dest.dir" value="${work.dir}/plugins"/> <property name="plugin.dest.dir" value="${work.dir}/plugins"/>
<property name="nonrelease.plugin.dir" value="${basedir}/plugins-tmp"/> <property name="nonrelease.plugin.dir" value="${basedir}/plugins-tmp"/>
...@@ -137,7 +139,7 @@ ...@@ -137,7 +139,7 @@
<property name="license.file.path" value="${docs.dir}/dist"/> <property name="license.file.path" value="${docs.dir}/dist"/>
<!-- For auto-running and debugging --> <!-- For auto-running and debugging -->
<property name="debug" value="false" /> <property name="debug" value="false"/>
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- PATHs / PATTERNSETs / FILTERSETs --> <!-- PATHs / PATTERNSETs / FILTERSETs -->
...@@ -146,7 +148,8 @@ ...@@ -146,7 +148,8 @@
<path id="javadoc.dependencies"> <path id="javadoc.dependencies">
<fileset dir="${lib.build.dir}" includes="*.jar" excludes="junit.jar"/> <fileset dir="${lib.build.dir}" includes="*.jar" excludes="junit.jar"/>
<fileset dir="${lib.merge.dir}" includes="*.jar"/> <fileset dir="${lib.merge.dir}" includes="*.jar"/>
<fileset dir="${lib.dist.dir}" includes="servlet.jar, mail.jar, activation.jar, jdic.jar, bouncycastle.jar"/> <fileset dir="${lib.dist.dir}"
includes="servlet.jar, mail.jar, activation.jar, jdic.jar, bouncycastle.jar"/>
</path> </path>
<path id="compile.dependencies"> <path id="compile.dependencies">
...@@ -225,12 +228,16 @@ ...@@ -225,12 +228,16 @@
<if> <if>
<equals arg1="${version.extra}" arg2=""/> <equals arg1="${version.extra}" arg2=""/>
<then> <then>
<property name="version" value="${version.major}.${version.minor}.${version.revision}"/> <property name="version"
<property name="version.filename" value="${version.major}_${version.minor}_${version.revision}"/> value="${version.major}.${version.minor}.${version.revision}"/>
<property name="version.filename"
value="${version.major}_${version.minor}_${version.revision}"/>
</then> </then>
<else> <else>
<property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/> <property name="version"
<property name="version.filename" value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/> value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
<property name="version.filename"
value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/>
</else> </else>
</if> </if>
...@@ -269,7 +276,8 @@ ...@@ -269,7 +276,8 @@
<target name="plugins-dev"> <target name="plugins-dev">
<!-- Setup Wildfire --> <!-- Setup Wildfire -->
<ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="wildfire" inheritAll="false" inheritRefs="false"/> <ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="wildfire"
inheritAll="false" inheritRefs="false"/>
<copy file="${java.home}/../lib/tools.jar" todir="${jar.dest.dir}"></copy> <copy file="${java.home}/../lib/tools.jar" todir="${jar.dest.dir}"></copy>
<copy file="${ant.home}/lib/ant.jar" todir="${jar.dest.dir}"></copy> <copy file="${ant.home}/lib/ant.jar" todir="${jar.dest.dir}"></copy>
...@@ -304,7 +312,8 @@ ...@@ -304,7 +312,8 @@
</target> </target>
<!-- wildfire =================================================================================== --> <!-- wildfire =================================================================================== -->
<target name="wildfire" depends="compile, jspc, -i18n" description="Compiles and generates runnable target/wildfire folder"> <target name="wildfire" depends="compile, jspc, -i18n"
description="Compiles and generates runnable target/wildfire folder">
<mkdir dir="${jar.dest.dir}"/> <mkdir dir="${jar.dest.dir}"/>
<!-- Make main Wildfire jar --> <!-- Make main Wildfire jar -->
<jar jarfile="${jar.dest.dir}/${jar.name}" index="true" duplicate="preserve"> <jar jarfile="${jar.dest.dir}/${jar.name}" index="true" duplicate="preserve">
...@@ -329,7 +338,8 @@ ...@@ -329,7 +338,8 @@
<fileset dir="${lib.build.installer.dir}/images" includes="**/*.gif"/> <fileset dir="${lib.build.installer.dir}/images" includes="**/*.gif"/>
<fileset dir="${lib.build.installer.dir}/images" includes="**/*.png"/> <fileset dir="${lib.build.installer.dir}/images" includes="**/*.png"/>
<manifest> <manifest>
<attribute name="Main-Class" value="org.jivesoftware.wildfire.starter.ServerStarter"/> <attribute name="Main-Class"
value="org.jivesoftware.wildfire.starter.ServerStarter"/>
<attribute name="Built-By" value="Jive Software (www.jivesoftware.org)"/> <attribute name="Built-By" value="Jive Software (www.jivesoftware.org)"/>
</manifest> </manifest>
</jar> </jar>
...@@ -356,15 +366,18 @@ ...@@ -356,15 +366,18 @@
<!-- run =================================================================================== --> <!-- run =================================================================================== -->
<target name="run" description="Starts Wildfire inline to the build process."> <target name="run" description="Starts Wildfire inline to the build process.">
<available file="${target.wildfireHome}" type="dir" property="wildfire.found"/> <available file="${target.wildfireHome}" type="dir" property="wildfire.found"/>
<fail unless="wildfire.found" message="Can't find wildfire, run 'ant wildfire' or specify with -Dtarget.wildfireHome."/> <fail unless="wildfire.found"
message="Can't find wildfire, run 'ant wildfire' or specify with -Dtarget.wildfireHome."/>
<condition property="run.debug" value="-Xdebug -Xint -server -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"> <condition property="run.debug"
value="-Xdebug -Xint -server -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000">
<isset property="debug"/> <isset property="debug"/>
</condition> </condition>
<property name="run.spawn" value="false"/> <property name="run.spawn" value="false"/>
<java jar="${target.wildfireHome}/lib/startup.jar" fork="true" spawn="${run.spawn}" dir="${target.wildfireHome}/bin"> <java jar="${target.wildfireHome}/lib/startup.jar" fork="true" spawn="${run.spawn}"
dir="${target.wildfireHome}/bin">
<jvmarg line="${run.debug}"/> <jvmarg line="${run.debug}"/>
</java> </java>
</target> </target>
...@@ -372,7 +385,7 @@ ...@@ -372,7 +385,7 @@
<!-- run.test.init ========================================================================= --> <!-- run.test.init ========================================================================= -->
<target name="run.test.init"> <target name="run.test.init">
<delete dir="${target.wildfireHome}" /> <delete dir="${target.wildfireHome}"/>
<property name="wildfireHome.preconfigured" value="true"/> <property name="wildfireHome.preconfigured" value="true"/>
...@@ -381,7 +394,7 @@ ...@@ -381,7 +394,7 @@
<!-- run.test ============================================================================== --> <!-- run.test ============================================================================== -->
<!-- Starts Wildfire inline to the build process, with a clean pre-configured wildfireHome --> <!-- Starts Wildfire inline to the build process, with a clean pre-configured wildfireHome -->
<target name="run.test" depends="run.test.init,wildfireHome,run" > <target name="run.test" depends="run.test.init,wildfireHome,run">
<echo>Wildfire server started.</echo> <echo>Wildfire server started.</echo>
</target> </target>
...@@ -404,13 +417,15 @@ ...@@ -404,13 +417,15 @@
<path location="${src.java.dir}"/> <path location="${src.java.dir}"/>
<path location="${whack.src}"/> <path location="${whack.src}"/>
</sourcepath> </sourcepath>
<doctitle><![CDATA[<font face="arial,helvetica,sans-serif">Wildfire ${version} Javadoc</font>]]></doctitle> <doctitle>
<![CDATA[<font face="arial,helvetica,sans-serif">Wildfire ${version} Javadoc</font>]]></doctitle>
<header><![CDATA[<b>Wildfire ${version} Javadoc</b>]]></header> <header><![CDATA[<b>Wildfire ${version} Javadoc</b>]]></header>
<bottom><![CDATA[<i>Copyright &copy; 2003-2006 Jive Software.</i>]]></bottom> <bottom><![CDATA[<i>Copyright &copy; 2003-2006 Jive Software.</i>]]></bottom>
<classpath> <classpath>
<path refid="javadoc.dependencies"/> <path refid="javadoc.dependencies"/>
</classpath> </classpath>
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="${javadoc.src.dir}/jdk15"/> <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
packagelistLoc="${javadoc.src.dir}/jdk15"/>
</javadoc> </javadoc>
</target> </target>
...@@ -431,10 +446,10 @@ ...@@ -431,10 +446,10 @@
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
<path refid="jspc.dependencies"/> <path refid="jspc.dependencies"/>
</classpath> </classpath>
<arg line="-uriroot ${web.dir}" /> <arg line="-uriroot ${web.dir}"/>
<arg line="-d ${jspc.java.dest.dir}" /> <arg line="-d ${jspc.java.dest.dir}"/>
<arg line="-p org.jivesoftware.wildfire.admin" /> <arg line="-p org.jivesoftware.wildfire.admin"/>
<arg line="-webinc ${jspc.dest.dir}/web.partial.xml" /> <arg line="-webinc ${jspc.dest.dir}/web.partial.xml"/>
</java> </java>
<!-- Compile java source --> <!-- Compile java source -->
...@@ -532,7 +547,7 @@ ...@@ -532,7 +547,7 @@
<property name="wildfireHome.preconfigured" value="false"/> <property name="wildfireHome.preconfigured" value="false"/>
<property name="wildfireHome.no.plugins" value="false"/> <property name="wildfireHome.no.plugins" value="false"/>
<mkdir dir="${target.wildfireHome}" /> <mkdir dir="${target.wildfireHome}"/>
<!-- Copy conf dir --> <!-- Copy conf dir -->
<copy todir="${target.wildfireHome}"> <copy todir="${target.wildfireHome}">
...@@ -575,14 +590,14 @@ ...@@ -575,14 +590,14 @@
<then> <then>
<!-- Copy pre-configured wildfireHome dir --> <!-- Copy pre-configured wildfireHome dir -->
<copy todir="${target.wildfireHome}"> <copy todir="${target.wildfireHome}">
<fileset dir="${basedir}/build/wildfireHome" includes="**/*.*" /> <fileset dir="${basedir}/build/wildfireHome" includes="**/*.*"/>
</copy> </copy>
</then> </then>
</if> </if>
<!-- Copy admin Plugin --> <!-- Copy admin Plugin -->
<antcall target="adminPlugin"> <antcall target="adminPlugin">
<param name="plugin.dest.dir" value="${target.wildfireHome}/plugins" /> <param name="plugin.dest.dir" value="${target.wildfireHome}/plugins"/>
</antcall> </antcall>
<!-- Copy compiled plugins if we need to --> <!-- Copy compiled plugins if we need to -->
...@@ -597,7 +612,7 @@ ...@@ -597,7 +612,7 @@
<!-- Copy bin dir --> <!-- Copy bin dir -->
<copy todir="${target.wildfireHome}"> <copy todir="${target.wildfireHome}">
<fileset dir="${src.dir}" includes="bin/**/*" /> <fileset dir="${src.dir}" includes="bin/**/*"/>
</copy> </copy>
<fixcrlf srcdir="${target.wildfireHome}/bin" eol="lf" eof="remove" includes="*.sh,extra/*"/> <fixcrlf srcdir="${target.wildfireHome}/bin" eol="lf" eof="remove" includes="*.sh,extra/*"/>
...@@ -635,13 +650,14 @@ ...@@ -635,13 +650,14 @@
<if> <if>
<available file="${src.dir}/help/help.zip"/> <available file="${src.dir}/help/help.zip"/>
<then> <then>
<unzip src="${src.dir}/help/help.zip" dest="${plugin.dest.dir}/admin/webapp" /> <unzip src="${src.dir}/help/help.zip" dest="${plugin.dest.dir}/admin/webapp"/>
</then> </then>
</if> </if>
</target> </target>
<!-- dist.src =============================================================================== --> <!-- dist.src =============================================================================== -->
<target name="dist.src" depends="javadoc, -i18n" description="Creates a source distribution package"> <target name="dist.src" depends="javadoc, -i18n"
description="Creates a source distribution package">
<mkdir dir="${release.dest.dir}"/> <mkdir dir="${release.dest.dir}"/>
<!-- Create a new prop for the final release dirs then create the dirs --> <!-- Create a new prop for the final release dirs then create the dirs -->
...@@ -697,7 +713,9 @@ ...@@ -697,7 +713,9 @@
<property name="package.dest.dir" value="${release.dest.dir}"/> <property name="package.dest.dir" value="${release.dest.dir}"/>
<if> <if>
<not> <isset property="no.package"/> </not> <not>
<isset property="no.package"/>
</not>
<then> <then>
<parallel> <parallel>
<!-- Source Packages --> <!-- Source Packages -->
...@@ -717,14 +735,15 @@ ...@@ -717,14 +735,15 @@
</target> </target>
<!-- dist.bin =============================================================================== --> <!-- dist.bin =============================================================================== -->
<target name="dist.bin" depends="plugins,javadoc" description="Creates a binary distribution package"> <target name="dist.bin" depends="plugins,javadoc"
description="Creates a binary distribution package">
<!-- ie: wildfire --> <!-- ie: wildfire -->
<property name="release.name" value="${dist.prefix}"/> <property name="release.name" value="${dist.prefix}"/>
<!-- ie: wildfire_2_1_2 --> <!-- ie: wildfire_2_1_2 -->
<property name="release.fullname" value="${dist.prefix}_${version.filename}"/> <property name="release.fullname" value="${dist.prefix}_${version.filename}"/>
<property name="release.out.dir" value="${release.dest.dir}/${release.name}"/> <property name="release.out.dir" value="${release.dest.dir}/${release.name}"/>
<antcall target="enterprise" /> <antcall target="enterprise"/>
<mkdir dir="${release.out.dir}"/> <mkdir dir="${release.out.dir}"/>
...@@ -749,15 +768,16 @@ ...@@ -749,15 +768,16 @@
<for param="jar"> <for param="jar">
<path> <path>
<fileset dir="${release.out.dir}/lib" includes="*.jar" excludes="startup.jar,jdic.jar,mail.jar,activation.jar,bouncycastle.jar" /> <fileset dir="${release.out.dir}/lib" includes="*.jar"
excludes="startup.jar,jdic.jar,mail.jar,activation.jar,bouncycastle.jar"/>
</path> </path>
<sequential> <sequential>
<delete file="@{jar}.pack" /> <delete file="@{jar}.pack"/>
<pack200 src="@{jar}" <pack200 src="@{jar}"
destfile="@{jar}.pack" destfile="@{jar}.pack"
gzipoutput="false" gzipoutput="false"
/> />
<delete file="@{jar}" /> <delete file="@{jar}"/>
</sequential> </sequential>
</for> </for>
...@@ -772,8 +792,8 @@ ...@@ -772,8 +792,8 @@
<!-- Copy the license --> <!-- Copy the license -->
<copy todir="${release.out.dir}" file="${license.file.path}/LICENSE.html"/> <copy todir="${release.out.dir}" file="${license.file.path}/LICENSE.html"/>
<mkdir dir="${release.out.dir}/logs" /> <mkdir dir="${release.out.dir}/logs"/>
<touch file="${release.out.dir}/logs/stderr.out" /> <touch file="${release.out.dir}/logs/stderr.out"/>
<!-- Copy docs --> <!-- Copy docs -->
<copy todir="${release.out.dir}/documentation"> <copy todir="${release.out.dir}/documentation">
...@@ -802,7 +822,9 @@ ...@@ -802,7 +822,9 @@
<property name="package.dest.dir" value="${release.dest.dir}"/> <property name="package.dest.dir" value="${release.dest.dir}"/>
<if> <if>
<not> <isset property="no.package"/> </not> <not>
<isset property="no.package"/>
</not>
<then> <then>
<parallel> <parallel>
<!-- Binary packages --> <!-- Binary packages -->
...@@ -838,8 +860,10 @@ ...@@ -838,8 +860,10 @@
<property name="release.fullname" value="${release.out.name}"/> <property name="release.fullname" value="${release.out.name}"/>
<property name="release.src.out.name" value="${dist.prefix}_src_${dailybuild.tstamp}"/> <property name="release.src.out.name" value="${dist.prefix}_src_${dailybuild.tstamp}"/>
<property name="release.fullname.src" value="${release.src.out.name}"/> <property name="release.fullname.src" value="${release.src.out.name}"/>
<property name="release.out.dir" value="${release.dest.dir}/dailybuild/${release.out.name}"/> <property name="release.out.dir"
<property name="release.src.out.dir" value="${release.dest.dir}/dailybuild/${release.src.out.name}"/> value="${release.dest.dir}/dailybuild/${release.out.name}"/>
<property name="release.src.out.dir"
value="${release.dest.dir}/dailybuild/${release.src.out.name}"/>
<antcall target="dist.src"> <antcall target="dist.src">
<param name="release.src.out.name" value="${release.src.out.name}"/> <param name="release.src.out.name" value="${release.src.out.name}"/>
<param name="release.src.out.dir" value="${release.src.out.dir}"/> <param name="release.src.out.dir" value="${release.src.out.dir}"/>
...@@ -850,7 +874,7 @@ ...@@ -850,7 +874,7 @@
<param name="release.out.dir" value="${release.out.dir}"/> <param name="release.out.dir" value="${release.out.dir}"/>
<param name="package.dest.dir" value="${release.dest.dir}/dailybuild"/> <param name="package.dest.dir" value="${release.dest.dir}/dailybuild"/>
<!-- dist.src above does this already, so don't need to do it twice --> <!-- dist.src above does this already, so don't need to do it twice -->
<param name="no.javadoc" value="true" /> <param name="no.javadoc" value="true"/>
</antcall> </antcall>
</target> </target>
...@@ -862,15 +886,16 @@ ...@@ -862,15 +886,16 @@
<available file="${installer.install4j.home}/bin/install4j.jar"/> <available file="${installer.install4j.home}/bin/install4j.jar"/>
</not> </not>
</condition> </condition>
<fail if="install4j.not.ok" message="Path to Install4j not set, see build.properties.template file."/> <fail if="install4j.not.ok"
message="Path to Install4j not set, see build.properties.template file."/>
<antcall target="dist.src" /> <antcall target="dist.src"/>
<antcall target="dist.bin" > <antcall target="dist.bin">
<!-- Don't need package for installer build --> <!-- Don't need package for installer build -->
<param name="no.package" value="true" /> <param name="no.package" value="true"/>
<!-- Already built javadoc with dist.src above --> <!-- Already built javadoc with dist.src above -->
<param name="no.javadoc" value="true" /> <param name="no.javadoc" value="true"/>
</antcall> </antcall>
<taskdef name="install4j" <taskdef name="install4j"
...@@ -906,10 +931,11 @@ ...@@ -906,10 +931,11 @@
<param name="wildfireHome.no.update" value="true"/> <param name="wildfireHome.no.update" value="true"/>
</antcall> </antcall>
<mkdir dir="${plugin.dest.dir}" /> <mkdir dir="${plugin.dest.dir}"/>
<!-- Get a list of subdirs of the main plugins dir. This tells us which plugins to make. --> <!-- Get a list of subdirs of the main plugins dir. This tells us which plugins to make. -->
<subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml" except="admin"/> <subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml"
except="admin"/>
<antcall target="-plugins-impl-dev"/> <antcall target="-plugins-impl-dev"/>
<antcall target="-plugins-impl"/> <antcall target="-plugins-impl"/>
...@@ -988,7 +1014,8 @@ ...@@ -988,7 +1014,8 @@
<jar jarfile="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"> <jar jarfile="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/classes"/> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/classes"/>
</jar> </jar>
<available file="@{pluginsrc}/@{plugin}/src/include" type="dir" property="@{plugin}.include.exists"/> <available file="@{pluginsrc}/@{plugin}/src/include" type="dir"
property="@{plugin}.include.exists"/>
<if> <if>
<equals arg1="${@{plugin}.include.exists}" arg2="true"/> <equals arg1="${@{plugin}.include.exists}" arg2="true"/>
<then> <then>
...@@ -1000,19 +1027,22 @@ ...@@ -1000,19 +1027,22 @@
</if> </if>
<!-- Copy anything in the plugin's lib dir to the target lib dir --> <!-- Copy anything in the plugin's lib dir to the target lib dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/lib" failonerror="false" overwrite="${overwrite}" > <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/lib" failonerror="false"
overwrite="${overwrite}">
<fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*"/> <fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*"/>
</copy> </copy>
<!-- Copy anything in the plugin's lib dir to the target lib dir --> <!-- Copy anything in the plugin's lib dir to the target lib dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" failonerror="false" overwrite="${overwrite}" > <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" failonerror="false"
overwrite="${overwrite}">
<fileset dir="@{pluginsrc}/@{plugin}/src/web/WEB-INF" includes="web.xml"/> <fileset dir="@{pluginsrc}/@{plugin}/src/web/WEB-INF" includes="web.xml"/>
<mapper type="glob" from="web.xml" to="web-custom.xml"/> <mapper type="glob" from="web.xml" to="web-custom.xml"/>
</copy> </copy>
<!-- Copy the plugin.xml and documentation to the target dir, code below assumes it's there --> <!-- Copy the plugin.xml and documentation to the target dir, code below assumes it's there -->
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}/jar"/> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/jar"/>
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" failonerror="false" overwrite="${overwrite}" > <copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" failonerror="false"
overwrite="${overwrite}">
<fileset dir="@{pluginsrc}/@{plugin}" includes="*.xml, *.html, *.gif, *.png"/> <fileset dir="@{pluginsrc}/@{plugin}" includes="*.xml, *.html, *.gif, *.png"/>
</copy> </copy>
...@@ -1037,7 +1067,8 @@ ...@@ -1037,7 +1067,8 @@
<!-- Copy jsp's from plugin and web.xml from wildfire to a temp dir. We'll <!-- Copy jsp's from plugin and web.xml from wildfire to a temp dir. We'll
not fail on an error since the web dir might not exist. not fail on an error since the web dir might not exist.
--> -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web" overwrite="${overwrite}"> <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web"
overwrite="${overwrite}">
<fileset dir="@{pluginsrc}/@{plugin}/src/web"> <fileset dir="@{pluginsrc}/@{plugin}/src/web">
<exclude name="WEB-INF/web.xml"/> <exclude name="WEB-INF/web.xml"/>
</fileset> </fileset>
...@@ -1054,7 +1085,8 @@ ...@@ -1054,7 +1085,8 @@
<taskdef classname="org.apache.jasper.JspC" name="jasper2" loaderref="jasperB"> <taskdef classname="org.apache.jasper.JspC" name="jasper2" loaderref="jasperB">
<classpath> <classpath>
<pathelement location="${java.home}/../lib/tools.jar"/> <pathelement location="${java.home}/../lib/tools.jar"/>
<pathelement location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/> <pathelement
location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/>
<path refid="jspc.dependencies"/> <path refid="jspc.dependencies"/>
<fileset dir="@{pluginsrc}/@{plugin}" includes="lib/*.jar"/> <fileset dir="@{pluginsrc}/@{plugin}" includes="lib/*.jar"/>
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
...@@ -1087,15 +1119,19 @@ ...@@ -1087,15 +1119,19 @@
<copy path="//web-app/servlet-mapping[last()]" buffer="foobar2"/> <copy path="//web-app/servlet-mapping[last()]" buffer="foobar2"/>
</xmltask> </xmltask>
<!-- Add the copied servlet and servlet-mapping elements to the generated web.xml --> <!-- Add the copied servlet and servlet-mapping elements to the generated web.xml -->
<xmltask source="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml" dest="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF/web.xml"> <xmltask source="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml"
<insert path="/web-app/servlet[last()]" buffer="foobar" position="after"/> dest="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF/web.xml">
<insert path="/web-app/servlet-mapping[last()]" buffer="foobar2" position="after"/> <insert path="/web-app/servlet[last()]" buffer="foobar"
position="after"/>
<insert path="/web-app/servlet-mapping[last()]" buffer="foobar2"
position="after"/>
</xmltask> </xmltask>
</then> </then>
<else> <else>
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF"
file="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml" overwrite="${overwrite}"/> file="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml"
overwrite="${overwrite}"/>
</else> </else>
</if> </if>
...@@ -1111,13 +1147,15 @@ ...@@ -1111,13 +1147,15 @@
<path refid="jspc.dependencies"/> <path refid="jspc.dependencies"/>
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
<fileset dir="@{pluginsrc}/@{plugin}" includes="lib/*.jar"/> <fileset dir="@{pluginsrc}/@{plugin}" includes="lib/*.jar"/>
<pathelement location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/> <pathelement
location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/>
</classpath> </classpath>
</javac> </javac>
<!-- Make a jar of compiled jsp classes --> <!-- Make a jar of compiled jsp classes -->
<jar jarfile="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}-jspc.jar" > <jar jarfile="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}-jspc.jar">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" includes="**/*.class"/> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes"
includes="**/*.class"/>
</jar> </jar>
</then> </then>
...@@ -1126,14 +1164,16 @@ ...@@ -1126,14 +1164,16 @@
<!-- Some JAR files don't work well through Pack200. When that's the case, they should <!-- Some JAR files don't work well through Pack200. When that's the case, they should
be manually added to this list. be manually added to this list.
--> -->
<property name="pack200.excludes" value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar"/> <property name="pack200.excludes"
value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar"/>
<for param="jar"> <for param="jar">
<path> <path>
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="*.jar" excludes="${pack200.excludes}"/> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="*.jar"
excludes="${pack200.excludes}"/>
</path> </path>
<sequential> <sequential>
<delete file="@{jar}.pack" /> <delete file="@{jar}.pack"/>
<pack200 src="@{jar}" <pack200 src="@{jar}"
destfile="@{jar}.pack" destfile="@{jar}.pack"
gzipoutput="false" gzipoutput="false"
...@@ -1142,7 +1182,7 @@ ...@@ -1142,7 +1182,7 @@
</for> </for>
<!-- Copy everything else to Wildfire's plugin dir --> <!-- Copy everything else to Wildfire's plugin dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" overwrite="true" > <copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target"> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target">
<include name="lib/*.pack"/> <include name="lib/*.pack"/>
<include name="web/WEB-INF/web.xml"/> <include name="web/WEB-INF/web.xml"/>
...@@ -1164,8 +1204,9 @@ ...@@ -1164,8 +1204,9 @@
</copy> </copy>
<!-- Excluded pack files need to be copied over as well --> <!-- Excluded pack files need to be copied over as well -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar/lib" overwrite="true" > <copy todir="${plugin.dev.dest.dir}/@{plugin}/jar/lib" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="${pack200.excludes}"/> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib"
includes="${pack200.excludes}"/>
</copy> </copy>
<!-- Jar the plugin --> <!-- Jar the plugin -->
...@@ -1211,44 +1252,44 @@ ...@@ -1211,44 +1252,44 @@
<!-- clean-jspc ============================================================================ --> <!-- clean-jspc ============================================================================ -->
<!-- Cleans all JSPC output --> <!-- Cleans all JSPC output -->
<target name="clean-jspc" > <target name="clean-jspc">
<delete dir="${jspc.dest.dir}"/> <delete dir="${jspc.dest.dir}"/>
</target> </target>
<!-- clean-test ============================================================================ --> <!-- clean-test ============================================================================ -->
<!-- Cleans all compiled test classes --> <!-- Cleans all compiled test classes -->
<target name="clean-test" > <target name="clean-test">
<delete dir="${test.classes.dest.dir}"/> <delete dir="${test.classes.dest.dir}"/>
</target> </target>
<!-- clean-plugins ========================================================================= --> <!-- clean-plugins ========================================================================= -->
<!-- Cleans all generated plugins --> <!-- Cleans all generated plugins -->
<target name="clean-plugins" > <target name="clean-plugins">
<delete includeemptydirs="true" failonerror="false"> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${plugin.dest.dir}" excludes="admin/**/*.*" /> <fileset dir="${plugin.dest.dir}" excludes="admin/**/*.*"/>
</delete> </delete>
<!--<delete dir="${plugin.dest.dir}"/> --> <!--<delete dir="${plugin.dest.dir}"/> -->
<delete dir="${plugin.dev.dest.dir}"/> <delete dir="${plugin.dev.dest.dir}"/>
</target> </target>
<!-- Mac installer ========================================================================= --> <!-- Mac installer ========================================================================= -->
<property name="mac.pkg.dir" value="${basedir}/macpkg" /> <property name="mac.pkg.dir" value="${basedir}/macpkg"/>
<property name="mac.dmg.dir" value="${basedir}/Wildfire" /> <property name="mac.dmg.dir" value="${basedir}/Wildfire"/>
<property name="mac.dmg.file" value="${basedir}/wildfire.dmg" /> <property name="mac.dmg.file" value="${basedir}/wildfire.dmg"/>
<property name="mac.dmg.template" value="${basedir}/build/osx/template.dmg" /> <property name="mac.dmg.template" value="${basedir}/build/osx/template.dmg"/>
<target name="mac.delete"> <target name="mac.delete">
<delete dir="${mac.pkg.dir}" /> <delete dir="${mac.pkg.dir}"/>
<delete dir="${mac.dmg.dir}" /> <delete dir="${mac.dmg.dir}"/>
<delete file="${mac.dmg.file}" /> <delete file="${mac.dmg.file}"/>
</target> </target>
<target name="mac.prepare" depends="mac.delete,wildfire"> <target name="mac.prepare" depends="mac.delete,wildfire">
<unzip src="${basedir}/build/osx/template.dmg.zip" dest="${basedir}/build/osx/" /> <unzip src="${basedir}/build/osx/template.dmg.zip" dest="${basedir}/build/osx/"/>
<copy file="${mac.dmg.template}" tofile="${basedir}/tmp.dmg" /> <copy file="${mac.dmg.template}" tofile="${basedir}/tmp.dmg"/>
<mkdir dir="${mac.dmg.dir}" /> <mkdir dir="${mac.dmg.dir}"/>
<exec executable="hdiutil" failonerror="true"> <exec executable="hdiutil" failonerror="true">
<arg line="attach '${basedir}/tmp.dmg' -noautoopen -mountpoint '${mac.dmg.dir}'" /> <arg line="attach '${basedir}/tmp.dmg' -noautoopen -mountpoint '${mac.dmg.dir}'"/>
</exec> </exec>
<copy todir="${mac.pkg.dir}/usr/local/wildfire"> <copy todir="${mac.pkg.dir}/usr/local/wildfire">
<fileset dir="${work.dir}"> <fileset dir="${work.dir}">
...@@ -1277,7 +1318,7 @@ ...@@ -1277,7 +1318,7 @@
<target name="mac.pkg" depends="mac.prepare"> <target name="mac.pkg" depends="mac.prepare">
<exec executable="/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"> <exec executable="/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker">
<arg value="-build"/> <arg value="-build"/>
<arg value="-proj" /> <arg value="-proj"/>
<arg value="${basedir}/build/osx/wildfire.pmproj"/> <arg value="${basedir}/build/osx/wildfire.pmproj"/>
<arg value="-p"/> <arg value="-p"/>
<arg value="${mac.dmg.dir}/Wildfire.pkg"/> <arg value="${mac.dmg.dir}/Wildfire.pkg"/>
...@@ -1288,7 +1329,7 @@ ...@@ -1288,7 +1329,7 @@
<target name="installer-mac" depends="mac.pkg" description="Creates a Mac OS X package"> <target name="installer-mac" depends="mac.pkg" description="Creates a Mac OS X package">
<exec executable="hdiutil" failonerror="true"> <exec executable="hdiutil" failonerror="true">
<arg line="detach ${mac.dmg.dir} -quiet -force" /> <arg line="detach ${mac.dmg.dir} -quiet -force"/>
</exec> </exec>
<exec executable="hdiutil" failonerror="true"> <exec executable="hdiutil" failonerror="true">
<arg line="convert ${basedir}/tmp.dmg -format UDZO -o ${mac.dmg.file}"/> <arg line="convert ${basedir}/tmp.dmg -format UDZO -o ${mac.dmg.file}"/>
...@@ -1297,9 +1338,9 @@ ...@@ -1297,9 +1338,9 @@
</target> </target>
<!-- Debian package ========================================================================= --> <!-- Debian package ========================================================================= -->
<property name="debian.dir" value="${basedir}/build/debian" /> <property name="debian.dir" value="${basedir}/build/debian"/>
<property name="debian.release.dir" value="${target.dir}/debian" /> <property name="debian.release.dir" value="${target.dir}/debian"/>
<property name="debian.release.install_path" value="${debian.release.dir}/usr/bin" /> <property name="debian.release.install_path" value="${debian.release.dir}/usr/bin"/>
<property name="debian.version" value="${version.major}.${version.minor}.${version.revision}"/> <property name="debian.version" value="${version.major}.${version.minor}.${version.revision}"/>
<tstamp> <tstamp>
<format property="debian.builddate" pattern="EEE, dd MMM yyyy HH:mm:ss Z" locale="en"/> <format property="debian.builddate" pattern="EEE, dd MMM yyyy HH:mm:ss Z" locale="en"/>
...@@ -1314,7 +1355,7 @@ ...@@ -1314,7 +1355,7 @@
</copy> </copy>
<copy todir="${debian.release.dir}/DEBIAN"> <copy todir="${debian.release.dir}/DEBIAN">
<fileset dir="${debian.dir}" includes="**/*" /> <fileset dir="${debian.dir}" includes="**/*"/>
<filterset> <filterset>
<filter token="builddate" value="${debian.builddate}"/> <filter token="builddate" value="${debian.builddate}"/>
<filter token="version" value="${debian.version}"/> <filter token="version" value="${debian.version}"/>
...@@ -1339,7 +1380,7 @@ ...@@ -1339,7 +1380,7 @@
<exec executable="dpkg" failonerror="true"> <exec executable="dpkg" failonerror="true">
<arg line="-b ${debian.release.dir} ${dist.prefix}_${debian.version}-i386.deb"/> <arg line="-b ${debian.release.dir} ${dist.prefix}_${debian.version}-i386.deb"/>
</exec> </exec>
<move file="${dist.prefix}_${debian.version}-i386.deb" todir="${release.dest.dir}" /> <move file="${dist.prefix}_${debian.version}-i386.deb" todir="${release.dest.dir}"/>
<delete dir="${debian.release.dir}"/> <delete dir="${debian.release.dir}"/>
</target> </target>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023