Author: nextgens
Date: 2006-04-04 17:33:33 +0000 (Tue, 04 Apr 2006)
New Revision: 8453
Added:
trunk/apps/installer/installclasspath/bin/wrapper-macos
trunk/apps/installer/installclasspath/lib/libwrapper.jnilib
trunk/apps/installer/installclasspath/macos/
trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
Modified:
trunk/apps/installer/build.xml
Log:
installer: Should work on macosx now
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-04-04 14:56:49 UTC (rev 8452)
+++ trunk/apps/installer/build.xml 2006-04-04 17:33:33 UTC (rev 8453)
@@ -15,6 +15,9 @@
<condition property="is_unix" value="true">
<os family="unix" />
</condition>
+ <condition property="is_macos" value="true">
+ <os family="mac" />
+ </condition>
<condition property="freenetWorkingMode" value="darknet"
else="testnet">
<isfalse value="${enableTestnet}" />
</condition>
@@ -114,14 +117,14 @@
</replace>
</target>
- <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,final_config,windows-start,unix-start,frost,start_browser">
+ <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,start_browser">
</target>
<target name="copy">
<copy todir="${installDir}/bin/">
<fileset dir="${basedir}/bin/"/>
</copy>
- <chmod file="${installDir}/bin/wrapper" perm="755"/>
+ <chmod file="${installDir}/bin/*" perm="755"/>
<copy todir="${installDir}/lib/">
<fileset dir="${basedir}/lib/"/>
</copy>
@@ -211,7 +214,42 @@
</exec>
<sleep seconds="5"/>
</target>
+
+ <target name="mac" if="is_macos">
+ <copy file="${basedir}/run.sh" tofile="${installDir}/run.sh"/>
+ <chmod file="${installDir}/run.sh" perm="755"/>
+ <replace file="${installDir}/run.sh">
+ <replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ </replace>
+
+ <copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
+ <chmod file="${installDir}/update.sh" perm="755"/>
+ <copy file="${basedir}/bin/wrapper-macos"
tofile="${installDir}/bin/wrapper"/>
+ <replace file="${installDir}/update.sh">
+ <replacefilter token="@path@" value="/${basedir}/"/>
+ </replace>
+
+ <echo message="Creating shortcuts"/>
+ <chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="755"/>
+ <exec executable="sh" dir="${basedir}/macos/">
+ <arg value="CreateDesktopShortcut.sh"/>
+ <arg value="${freenetWorkingMode}"/>
+ <arg value="${installDir}"/>
+ </exec>
+
+ <echo message="Registering as a system service if possible"/>
+ </target>
+
+ <target name="macos-start" if="is_macos">
+ <echo message="Starting the node up"/>
+ <exec executable="sh" dir="${installDir}/">
+ <arg value="run.sh"/>
+ <arg value="start"/>
+ </exec>
+ <sleep seconds="5"/>
+ </target>
+
<target name="start_browser">
<java classpath="${basedir}/browser.jar"
classname="BareBonesBrowserLaunch" failonerror="false" fork="true"
logError="true">
<arg
value="http://freenetproject.org/index.php?page=installed"/>
Added: trunk/apps/installer/installclasspath/bin/wrapper-macos
===================================================================
(Binary files differ)
Property changes on: trunk/apps/installer/installclasspath/bin/wrapper-macos
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/installer/installclasspath/lib/libwrapper.jnilib
===================================================================
(Binary files differ)
Property changes on: trunk/apps/installer/installclasspath/lib/libwrapper.jnilib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
===================================================================
--- trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
2006-04-04 14:56:49 UTC (rev 8452)
+++ trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
2006-04-04 17:33:33 UTC (rev 8453)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ln -s $2\run.sh Freenet-$1-Start
