Changeset 5a64a86


Ignore:
Timestamp:
Jun 23, 2011 10:18:19 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
3f39cea8, 50bd1c05, f6f7482
Parents:
67fd074
Message:

-30rc

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.

Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r67fd074 r5a64a86  
    483483    </target>
    484484
    485     <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
     485    <target name="preppkg" depends="preppkg-linux, preppkg-osx, preppkg-windows, jbigi">
    486486        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    487487        <copy todir="pkg-temp/lib/wrapper/freebsd/">
     
    545545            <fileset dir="installer/lib/wrapper/linux64/" />
    546546        </copy>
     547    </target>
     548
     549    <target name="preppkg-osx" depends="preppkg-linux">
     550        <!--<copy file="installer/resources/I2P Router Console.webloc" todir="pkg-temp/" />-->
     551        <copy todir="pkg-temp/Start I2P Router.app">
     552            <fileset dir="installer/resources/Start I2P Router.app" />
     553        </copy>
    547554    </target>
    548555
  • installer/install.xml

    r67fd074 r5a64a86  
    136136            <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
    137137            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
     138            <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
    138139           
    139140            <conditions>
     
    181182            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    182183                <args><arg value="$INSTALL_PATH\eepget" /></args></executable>
     184            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
     185                <args><arg value="$INSTALL_PATH/Start I2P Router.app" /></args></executable>
     186            <!-- Placeholder for an OSX 'shortcut' to the router console
     187            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
     188                <args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
     189                -->
    183190
    184191            <!-- workaround for vista permission problems - see comments above -->
  • installer/resources/postinstall.sh

    r67fd074 r5a64a86  
    6868        wrapperpath="./lib/wrapper/macosx"
    6969        cp ${wrapperpath}/libwrapper.jnilib ./lib/
     70        chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
    7071        ;;
    7172    solaris )
     
    9192rm -f ./*.exe
    9293rm -rf ./installer
     94
     95if [ ! `echo $HOST_OS  |grep osx` ]; then
     96    rm -rf ./Start\ I2P\ Router.app
     97    #rm -f I2P\ Router\ Console.webloc
     98fi
     99
    93100# no, let's not start the router from the install script any more
    94101# ./i2prouter start
  • router/java/src/net/i2p/router/RouterVersion.java

    r67fd074 r5a64a86  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 29;
     21    public final static long BUILD = 30;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.