jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgoes...@apache.org
Subject svn commit: r1695958 - in /jspwiki/trunk/jspwiki-portable: build.xml readme.md src/resources/appbundler/
Date Fri, 14 Aug 2015 18:50:29 GMT
Author: sgoeschl
Date: Fri Aug 14 18:50:29 2015
New Revision: 1695958

URL: http://svn.apache.org/r1695958
Log:
JSPWIKI-907 [Portable] Remove GPLed build tools - removing appbundler for Mac OS X

Removed:
    jspwiki/trunk/jspwiki-portable/src/resources/appbundler/
Modified:
    jspwiki/trunk/jspwiki-portable/build.xml
    jspwiki/trunk/jspwiki-portable/readme.md

Modified: jspwiki/trunk/jspwiki-portable/build.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/build.xml?rev=1695958&r1=1695957&r2=1695958&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/build.xml (original)
+++ jspwiki/trunk/jspwiki-portable/build.xml Fri Aug 14 18:50:29 2015
@@ -44,6 +44,7 @@
   <property name="jspwiki.tomcat.distribution" value="apache-tomcat-${jspwiki.tomcat.version}"/>
 
   <property name="jspwiki.launch4j.install.dir" value="${jspwiki.woas.unpack.dir}/launch4j"/>
+  <property name="jspwiki.appbundler.install.dir" value="${jspwiki.woas.unpack.dir}/appbundler"/>
 
   <!-- ############################################################## -->
   <!-- General Targets                                                -->
@@ -128,7 +129,7 @@
   <!-- Windows Native Launcher                                        -->
   <!-- ############################################################## -->
 
-  <target name="woas:create-windows-app" depends="woas:download-launch4j-for-mac" description="Create
an windows application wrapper">
+  <target name="woas:create-windows-app" description="Create an windows application wrapper">
     <taskdef 
       name="launch4j"
       classname="net.sf.launch4j.ant.Launch4jTask"
@@ -180,7 +181,7 @@
     <taskdef 
       name="bundleapp" 
       classname="com.oracle.appbundler.AppBundlerTask"
-      classpath="${basedir}/src/resources/appbundler/appbundler-1.0.jar" 
+      classpath="${jspwiki.appbundler.install.dir}/appbundler-1.0.jar" 
     />
     <delete dir="${jspwiki.woas.assembly.dir}/woas.app"/> 
     <bundleapp 
@@ -225,4 +226,10 @@
         <chmod dir="${jspwiki.launch4j.install.dir}/bin" includes="*" perm="ugo+x"/>
     </target>
 
+    <target name="woas:download-appbundler-for-mac" description="Download the Mac OS X
appbundler library">
+        <delete dir="${jspwiki.appbundler.install.dir}"/>
+        <mkdir dir="${jspwiki.appbundler.install.dir}"/>
+        <get src="https://java.net/downloads/appbundler/appbundler-1.0.jar" dest="${jspwiki.appbundler.install.dir}"/>
+    </target>
+
 </project>

Modified: jspwiki/trunk/jspwiki-portable/readme.md
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/readme.md?rev=1695958&r1=1695957&r2=1695958&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/readme.md (original)
+++ jspwiki/trunk/jspwiki-portable/readme.md Fri Aug 14 18:50:29 2015
@@ -26,9 +26,15 @@ This project builds a ready-to-use JSP W
 
 # 2. Creating The Native Launchers
 
-The native launchers are under version control and can be re-created manually.
+The native launchers are under version control and can be re-created manually. In other words
there are not automatically build because
 
-## 2.1 Native Windows Launcher
+* Considering the complex setup I'm glad that it works on the JSPWiki committer boxes
+* Downloading all the stuff is time-consuming and would slow the build for everyone
+* There should be some manual testing before promoting the native launchers
+
+## 2.1 Creating The Windows Launcher
+
+Run the following commands
 
 ```
 jspwiki-portable> mvn clean generate-resources
@@ -52,6 +58,29 @@ woas:create-windows-app:
 ```
 The generated "woas.exe" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.exe*
after manual testing.
 
+## 2.2 Creating The Mac OS X Launcher
+
+Run the following commands
+
+```
+jspwiki-portable> mvn clean generate-resources
+
+jspwiki-portable> ant woas:download-appbundler-for-mac woas:mac-app-oracle-jdk
+Buildfile: /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/build.xml
+
+woas:download-appbundler-for-mac:
+    [mkdir] Created dir: /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/target/unpack/appbundler
+      [get] Getting: https://java.net/downloads/appbundler/appbundler-1.0.jar
+      [get] To: /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/target/unpack/appbundler/appbundler-1.0.jar
+
+woas:mac-app-oracle-jdk:
+     [echo] Building Mac OS X launcher for Oracle JDK
+[bundleapp] Creating app bundle: woas
+
+BUILD SUCCESSFUL
+```
+The generated "woas.exe" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.exe*
after manual testing.
+
 # 3. Current State
 
 ## 3.1 Mac OS X



Mime
View raw message