This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit b59f61c03a355b4354b092dca18513b2ffb9ae74 Author: juanpablo <[email protected]> AuthorDate: Sat Nov 7 18:14:38 2020 +0100 Portable build native executables can be built entirely through maven, on one run; just mvn clean install -Dgenerate-native-launchers=true --- jspwiki-portable/build.xml | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml index 0d67832..54817b0 100644 --- a/jspwiki-portable/build.xml +++ b/jspwiki-portable/build.xml @@ -50,15 +50,15 @@ <!-- General Targets --> <!-- ############################################################## --> - <target name="woas:info" description="Build the project"> - <echo>jspwiki.woas.version = ${jspwiki.woas.version}</echo> - <echo>jspwiki.woas.assembly.dir = ${jspwiki.woas.assembly.dir}</echo> - <echo>jspwiki.woas.unpack.dir = ${jspwiki.woas.unpack.dir}</echo> - <echo>jspwiki.tomcat.distribution = ${jspwiki.tomcat.distribution}</echo> - </target> + <target name="woas:info" description="Build the project"> + <echo>jspwiki.woas.version = ${jspwiki.woas.version}</echo> + <echo>jspwiki.woas.assembly.dir = ${jspwiki.woas.assembly.dir}</echo> + <echo>jspwiki.woas.unpack.dir = ${jspwiki.woas.unpack.dir}</echo> + <echo>jspwiki.tomcat.distribution = ${jspwiki.tomcat.distribution}</echo> + </target> - <target name="woas:clean" description="Clean the project"> - <delete dir="${jspwiki.woas.target.dir}"/> + <target name="woas:clean" description="Clean the project"> + <delete dir="${jspwiki.woas.target.dir}"/> </target> <!-- ############################################################## --> @@ -83,7 +83,7 @@ </target> <!-- ############################################################## --> - <!-- Tomcat 7 Distribution --> + <!-- Tomcat 9 Distribution --> <!-- ############################################################## --> <target name="woas:copy-tomcat" description="Prepares an unpacked Tomcat deployment"> @@ -117,7 +117,7 @@ <target name="woas:copy-tomcat-launchers" description="Copies the existing native launchers"> <copy todir="${jspwiki.woas.assembly.dir}" overwrite="true"> <fileset dir="${basedir}/src/overlay/launchers/tomcat"/> - </copy> + </copy> <!-- make the shell scripts executable --> <chmod dir="${jspwiki.woas.assembly.dir}/bin" includes="*.sh" perm="ugo+x"/> <chmod dir="${jspwiki.woas.assembly.dir}" includes="*.sh" perm="ugo+x"/> @@ -125,6 +125,15 @@ <chmod file="${jspwiki.woas.assembly.dir}/woas.app/Contents/MacOS/*" perm="ugo+x"/> </target> + <target name="woas:update-tomcat-launchers" description="Copies the generated native launchers over the existing ones"> + <copy todir="${basedir}/src/overlay/launchers/tomcat" overwrite="true"> + <fileset dir="${jspwiki.woas.assembly.dir}" includes="woas.exe" /> + </copy> + <copy todir="${basedir}/src/overlay/launchers/tomcat/woas.app" overwrite="true"> + <fileset dir="${jspwiki.woas.assembly.dir}/woas.app" includes="**" /> + </copy> + </target> + <!-- ############################################################## --> <!-- Windows Native Launcher --> <!-- ############################################################## --> @@ -155,7 +164,7 @@ fileVersion="${jspwiki.woas.version}.0" txtFileVersion="JSPWiki ${jspwiki.woas.version}" fileDescription="WikiOnAStick" - copyright="Apache Software Licence 2.0" + copyright="Apache Software License 2.0" productVersion="${jspwiki.woas.version}.0" txtProductVersion="JSPWiki ${jspwiki.woas.version}" productName="WikiOnAStick" @@ -236,4 +245,9 @@ <get src="https://repo1.maven.org/fromsearch?filepath=com/panayotis/appbundler/1.1.0/appbundler-1.1.0.jar"; dest="${jspwiki.appbundler.install.dir}/appbundler-1.1.0.jar"/> </target> + <target name="woas:download-appbundler-for-mac-on-windows" description="Download the Mac OS X appbundler library when building under Windows OS"> + <antcall target="woas:download-appbundler-for-mac"/> + <antcall target="woas:download-launch4j-for-mac"/> + </target> + </project>
