jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgoes...@apache.org
Subject svn commit: r1695966 - in /jspwiki/trunk/jspwiki-portable: ./ src/overlay/launchers/tomcat/woas.app/Contents/ src/overlay/launchers/tomcat/woas.app/Contents/Java/
Date Fri, 14 Aug 2015 19:29:21 GMT
Author: sgoeschl
Date: Fri Aug 14 19:29:20 2015
New Revision: 1695966

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

Added:
    jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
  (with props)
    jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
  (with props)
Removed:
    jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-launcher-7.0.52.jar
Modified:
    jspwiki/trunk/jspwiki-portable/build.xml
    jspwiki/trunk/jspwiki-portable/readme.md
    jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist

Modified: jspwiki/trunk/jspwiki-portable/build.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/build.xml?rev=1695966&r1=1695965&r2=1695966&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/build.xml (original)
+++ jspwiki/trunk/jspwiki-portable/build.xml Fri Aug 14 19:29:20 2015
@@ -135,6 +135,7 @@
       classname="net.sf.launch4j.ant.Launch4jTask"
       classpath="${jspwiki.launch4j.install.dir}/launch4j.jar:${jspwiki.launch4j.install.dir}/lib/xstream.jar"
     />
+    <delete file="${jspwiki.woas.assembly.dir}/woas.exe"/>
     <launch4j bindir="${jspwiki.launch4j.install.dir}/bin">
       <config
         headerType="console" 
@@ -160,7 +161,6 @@
         />        
       </config>  
     </launch4j>
-    <echo>Created ${jspwiki.woas.assembly.dir}/woas.exe ...</echo>
   </target>
 
   <!-- ############################################################## -->

Modified: jspwiki/trunk/jspwiki-portable/readme.md
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/readme.md?rev=1695966&r1=1695965&r2=1695966&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/readme.md (original)
+++ jspwiki/trunk/jspwiki-portable/readme.md Fri Aug 14 19:29:20 2015
@@ -37,9 +37,9 @@ The native launchers are under version c
 Run the following commands
 
 ```
-jspwiki-portable> mvn clean generate-resources
+jspwiki-portable> mvn clean package
 
-jspwiki-portable> ant woas:create-windows-app
+jspwiki-portable> ant woas:download-launch4j-for-mac woas:create-windows-app
 Buildfile: /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/build.xml
 
 woas:download-launch4j-for-mac:
@@ -55,6 +55,8 @@ woas:create-windows-app:
  [launch4j] Wrapping
  [launch4j] Successfully created /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/target/woas/woas.exe
      [echo] Created /Users/sgoeschl/work/asf/jspwiki/trunk/jspwiki/jspwiki-portable/target/woas/woas.exe
...
+
+BUILD SUCCESSFUL
 ```
 The generated "woas.exe" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.exe*
after manual testing.
 
@@ -63,7 +65,7 @@ The generated "woas.exe" can be copied m
 Run the following commands
 
 ```
-jspwiki-portable> mvn clean generate-resources
+jspwiki-portable> mvn clean package
 
 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

Modified: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist?rev=1695966&r1=1695965&r2=1695966&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
(original)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
Fri Aug 14 19:29:20 2015
@@ -43,7 +43,7 @@
 <key>CFBundleVersion</key>
 <string>1</string>
 <key>NSHumanReadableCopyright</key>
-<string></string>
+<string>Apache Software Licence 2.0</string>
 <key>LSApplicationCategoryType</key>
 <string>public.app-category.developer-tools</string>
 <key>JVMMainClassName</key>

Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar?rev=1695966&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar?rev=1695966&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message