echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-30rc

Browse Source 
Add an icon (in OSX parlance, a 'bundle') to the installation folder to start
I2P.  

While there might be a better way to handle this (admittedly, I don't know OSX
that well), it is my belief that this way is less 'hackish' than the various
OSX 'installers' that I've seen floating around.
This commit is contained in:
kytv
2011-06-23 10:18:19 +00:00
parent 67fd074f04
commit 5a64a866da
7 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.xml
View File

@ -482,7 +482,7 @@
</delete>
</target>
<target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
<target name="preppkg" depends="preppkg-linux, preppkg-osx, preppkg-windows, jbigi">
<copy file="build/jbigi.jar" todir="pkg-temp/lib" />
<copy todir="pkg-temp/lib/wrapper/freebsd/">
<fileset dir="installer/lib/wrapper/freebsd/" />
@ -546,6 +546,13 @@
</copy>
</target>
<target name="preppkg-osx" depends="preppkg-linux">
<!--<copy file="installer/resources/I2P Router Console.webloc" todir="pkg-temp/" />-->
<copy todir="pkg-temp/Start I2P Router.app">
<fileset dir="installer/resources/Start I2P Router.app" />
</copy>
</target>
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates">
<!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
<delete>

7
installer/install.xml
View File

@ -135,6 +135,7 @@
<parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
<parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
<parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
<parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
<conditions>
<condition type="variable" id="is64bit">
@ -180,6 +181,12 @@
<args><arg value="$INSTALL_PATH\lib\wrapper" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH\eepget" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH/Start I2P Router.app" /></args></executable>
<!-- Placeholder for an OSX 'shortcut' to the router console
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
-->
<!-- workaround for vista permission problems - see comments above -->
<executable targetfile="$INSTALL_PATH/fixperms.bat" type="bin" stage="postinstall" keep="true" failure="warn"

45
installer/resources/Start I2P Router.app/Contents/Info.plist Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>i2prouter</string>
<key>NSHumanReadableCopyright</key>
<string>Public Domain</string>
<key>CFBundleGetInfoString</key>
<string>0.0.1</string>
<key>CFBundleIconFile</key>
<string>i2p</string>
<key>CFBundleIdentifier</key>
<string>de.i2p2</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>I2P</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleSignature</key>
<string>i2p</string>
<key>CFBundleVersion</key>
<string>0.0.1</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>CGDisableCoalescedUpdates</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>CFBundleDisplayName</key>
<string>Start I2P Router</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>i386</key>
<string>10.5.0</string>
<key>x86_64</key>
<string>10.6.0</string>
</dict>
</dict>
</plist>

4
installer/resources/Start I2P Router.app/Contents/MacOS/i2prouter Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
%INSTALL_PATH/i2prouter start

BIN
installer/resources/Start I2P Router.app/Contents/Resources/i2p.icns Normal file
View File

Binary file not shown.

7
installer/resources/postinstall.sh
View File

@ -67,6 +67,7 @@ case $HOST_OS in
osx )
wrapperpath="./lib/wrapper/macosx"
cp ${wrapperpath}/libwrapper.jnilib ./lib/
chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
;;
solaris )
wrapperpath="./lib/wrapper/solaris"
@ -90,6 +91,12 @@ rm -f ./lib/*.dll
rm -f ./*.bat
rm -f ./*.exe
rm -rf ./installer
if [ ! `echo $HOST_OS |grep osx` ]; then
rm -rf ./Start\ I2P\ Router.app
#rm -f I2P\ Router\ Console.webloc
fi
# no, let's not start the router from the install script any more
# ./i2prouter start
exit 0

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 29;
public final static long BUILD = 30;
/** for example "-test" */
public final static String EXTRA = "-rc";