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

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

Browse Source
This commit is contained in:
meeh
2019-05-07 22:47:01 +00:00
parent 16d2bdc1db
commit 5aae625788
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj
View File

@@ -61,6 +61,8 @@
BFAA37FC226892CA0014EB07 /* DateTimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF53150C2150CE310014EB07 /* DateTimeUtils.swift */; }; BFAA37FC226892CA0014EB07 /* DateTimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF53150C2150CE310014EB07 /* DateTimeUtils.swift */; };
BFAA37FD226892CA0014EB07 /* EventManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE16BF92156DAED0014EB07 /* EventManager.swift */; }; BFAA37FD226892CA0014EB07 /* EventManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE16BF92156DAED0014EB07 /* EventManager.swift */; };
BFAA37FE226892CA0014EB07 /* FolderContentMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */; }; BFAA37FE226892CA0014EB07 /* FolderContentMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */; };
BFAD9C94227C92480014EB07 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1D6D9021BB344D0014EB07 /* Preferences.swift */; };
BFAD9C95227C925F0014EB07 /* Identifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF99FD4322708AB10014EB07 /* Identifiers.swift */; };
BFBDCAE9215040670014EB07 /* Subprocess.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAE8215040670014EB07 /* Subprocess.swift */; }; BFBDCAE9215040670014EB07 /* Subprocess.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAE8215040670014EB07 /* Subprocess.swift */; };
BFBDCAEB215041630014EB07 /* TaskPipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAEA215041630014EB07 /* TaskPipeline.swift */; }; BFBDCAEB215041630014EB07 /* TaskPipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAEA215041630014EB07 /* TaskPipeline.swift */; };
BFBDCAED215041C10014EB07 /* Subprocess+CompactAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAEC215041C10014EB07 /* Subprocess+CompactAPI.swift */; }; BFBDCAED215041C10014EB07 /* Subprocess+CompactAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBDCAEC215041C10014EB07 /* Subprocess+CompactAPI.swift */; };
@@ -974,7 +976,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
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"; 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";
}; };
BFD28998227810AF0014EB07 /* ShellScript */ = { BFD28998227810AF0014EB07 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@@ -1161,6 +1163,8 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
BFAD9C95227C925F0014EB07 /* Identifiers.swift in Sources */,
BFAD9C94227C92480014EB07 /* Preferences.swift in Sources */,
BFAA37FA226892CA0014EB07 /* StringExtensions.swift in Sources */, BFAA37FA226892CA0014EB07 /* StringExtensions.swift in Sources */,
BFAA37FB226892CA0014EB07 /* ArrayExtensions.swift in Sources */, BFAA37FB226892CA0014EB07 /* ArrayExtensions.swift in Sources */,
BFAA37FC226892CA0014EB07 /* DateTimeUtils.swift in Sources */, BFAA37FC226892CA0014EB07 /* DateTimeUtils.swift in Sources */,

6
launchers/macosx/I2PLauncher/Info.plist
View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1.4</string> <string>0.1.5</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>6</string> <string>7</string>
<key>I2PRouterVersion</key> <key>I2PRouterVersion</key>
<string>0.9.39</string> <string>0.9.40</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

4
launchers/macosx/osx_create_dmg.sh
View File

@@ -10,7 +10,7 @@ DMG_BACKGROUND_IMG=${BACKGROUND_IMG:-"Background.png"}
APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_NAME}" APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_NAME}"
VOL_NAME="${APP_NAME}-${VERSION}" VOL_NAME="${APP_NAME}-${VERSION}"
DMG_TMP="${VOL_NAME}-temp.dmg" DMG_TMP="${VOL_NAME}-temp.dmg"
DMG_FINAL="${VOL_NAME}.dmg" DMG_FINAL="${DMG_NAME:-"I2PMacLauncher-fallback"}.dmg"
STAGING_DIR="/tmp/mkdmg$$" STAGING_DIR="/tmp/mkdmg$$"
# Check the background image DPI and convert it if it isn't 72x72 # Check the background image DPI and convert it if it isn't 72x72
@@ -31,7 +31,7 @@ fi
# copy over the stuff we want in the final disk image to our staging dir # copy over the stuff we want in the final disk image to our staging dir
mkdir -p "${STAGING_DIR}" mkdir -p "${STAGING_DIR}"
cp -rpf "${APP_NAME}.app" "${STAGING_DIR}" cp -Rpf "${APP_NAME}.app" "${STAGING_DIR}"
# ... cp anything else you want in the DMG - documentation, etc. # ... cp anything else you want in the DMG - documentation, etc.
# figure out how big our DMG needs to be # figure out how big our DMG needs to be