Changeset 5aae625


Ignore:
Timestamp:
May 7, 2019 10:47:01 PM (10 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
41e8b6d
Parents:
16d2bdc
Message:

Mac OSX Launcher: Version bump etc. 0.9.40, launcher version 0.1.5

Location:
launchers/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj

    r16d2bdc r5aae625  
    6262                BFAA37FD226892CA0014EB07 /* EventManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE16BF92156DAED0014EB07 /* EventManager.swift */; };
    6363                BFAA37FE226892CA0014EB07 /* FolderContentMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */; };
     64                BFAD9C94227C92480014EB07 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1D6D9021BB344D0014EB07 /* Preferences.swift */; };
     65                BFAD9C95227C925F0014EB07 /* Identifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF99FD4322708AB10014EB07 /* Identifiers.swift */; };
    6466                BFBDCAE9215040670014EB07 /* Subprocess.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAE8215040670014EB07 /* Subprocess.swift */; };
    6567                BFBDCAEB215041630014EB07 /* TaskPipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAEA215041630014EB07 /* TaskPipeline.swift */; };
    … …  
    975977                        runOnlyForDeploymentPostprocessing = 0;
    976978                        shellPath = /bin/sh;
    977                         shellScript = "# Run from launchers/macosx\nset -x\n\n# Warning to keep clean files\nfind \"${SRCROOT}\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 wc -l | awk '$1 > 200 && $2 != \"total\" { print $2 \":1: warning: file more than 200 lines\" }'\n\nif [ ! -z \"${REPACK_I2P}\" ]; then\n    export BUILDDIR=$(pwd)\n    export MACOSX_SOURCE_DIR=$SRCROOT\n    export I2P_SOURCE_DIR=$(realpath $SRCROOT/../..)\n    cd $MACOSX_SOURCE_DIR/..\n    # TODO: Find out why sbt hangs when executed in cli\n    #./sbt \";macosx:assembly\"\n    cd ..\n    cd $I2P_SOURCE_DIR\n    ant preppkg-osx jbigi-osx-only\n    cp build/jbigi.jar pkg-temp/lib/jbigi.jar\n    cd pkg-temp\n    rm -f $BUILDDIR/base.zip\n    zip -r -v -9 $BUILDDIR/base.zip *\n    cd $MACOSX_SOURCE_DIR\n    cp $MACOSX_SOURCE_DIR/target/scala-2.11/routerLauncher-assembly-0.1.0-SNAPSHOT.jar $BUILDDIR/launcher.jar\nfi\n\n";
     979                        shellScript = "# Run from launchers/macosx\nset -x\n\n# Warning to keep clean files\nfind \"${SRCROOT}\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 wc -l | awk '$1 > 200 && $2 != \"total\" { print $2 \":1: warning: file more than 200 lines\" }'\n\nif [ ! -z \"${REPACK_I2P}\" ]; then\n    export BUILDDIR=$(pwd)\n    export MACOSX_SOURCE_DIR=$SRCROOT\n    export I2P_SOURCE_DIR=$(realpath $SRCROOT/../..)\n    echo \"I2P Source directory: ${I2P_SOURCE_DIR}\"\n    cd $MACOSX_SOURCE_DIR/..\n    # TODO: Find out why sbt hangs when executed in cli\n    #./sbt \";macosx:assembly\"\n    cd ..\n    cd $I2P_SOURCE_DIR\n    ant distclean preppkg-osx jbigi-osx-only\n    cp build/jbigi.jar pkg-temp/lib/jbigi.jar\n    cd pkg-temp\n    rm -f $BUILDDIR/base.zip\n    zip -r -v -9 $BUILDDIR/base.zip *\n    cd $MACOSX_SOURCE_DIR\n    cp $MACOSX_SOURCE_DIR/target/scala-2.11/routerLauncher-assembly-0.1.0-SNAPSHOT.jar $BUILDDIR/launcher.jar\nfi\n\n";
    978980                };
    979981                BFD28998227810AF0014EB07 /* ShellScript */ = {
    … …  
    11621164                        buildActionMask = 2147483647;
    11631165                        files = (
     1166                                BFAD9C95227C925F0014EB07 /* Identifiers.swift in Sources */,
     1167                                BFAD9C94227C92480014EB07 /* Preferences.swift in Sources */,
    11641168                                BFAA37FA226892CA0014EB07 /* StringExtensions.swift in Sources */,
    11651169                                BFAA37FB226892CA0014EB07 /* ArrayExtensions.swift in Sources */,

  • launchers/macosx/I2PLauncher/Info.plist

    r16d2bdc r5aae625  
    1818        <string>APPL</string>
    1919        <key>CFBundleShortVersionString</key>
    20         <string>0.1.4</string>
     20        <string>0.1.5</string>
    2121        <key>CFBundleVersion</key>
    22         <string>6</string>
     22        <string>7</string>
    2323        <key>I2PRouterVersion</key>
    24         <string>0.9.39</string>
     24        <string>0.9.40</string>
    2525        <key>LSApplicationCategoryType</key>
    2626        <string>public.app-category.utilities</string>

  • launchers/macosx/osx_create_dmg.sh

    r16d2bdc r5aae625  
    1111VOL_NAME="${APP_NAME}-${VERSION}"
    1212DMG_TMP="${VOL_NAME}-temp.dmg"
    13 DMG_FINAL="${VOL_NAME}.dmg"
     13DMG_FINAL="${DMG_NAME:-"I2PMacLauncher-fallback"}.dmg"
    1414STAGING_DIR="/tmp/mkdmg$$"
    1515
    … …  
    3232# copy over the stuff we want in the final disk image to our staging dir
    3333mkdir -p "${STAGING_DIR}"
    34 cp -rpf "${APP_NAME}.app" "${STAGING_DIR}"
     34cp -Rpf "${APP_NAME}.app" "${STAGING_DIR}"
    3535# ... cp anything else you want in the DMG - documentation, etc.
    3636
Note: See TracChangeset for help on using the changeset viewer.