Changeset 609d594

Timestamp:

Jan 22, 2019 7:25:33 PM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

57de4b1

Parents:

88d9f1d

Message:

Mac OSX Launcher: 0.1.3 Release commit.

Location:

launchers/macosx

Files:

• Deployer.mm (modified) (1 diff)
• I2PLauncher.xcodeproj/project.pbxproj (modified) (1 diff)
• I2PLauncher/Info.plist (modified) (1 diff)
• osx_create_dmg.sh (modified) (1 diff)

launchers/macosx/Deployer.mm

@@ -84 +84 @@
       
       // Everything behind --exec java - would be passed as arguments to the java executable.
-      std::string execStr = "/usr/bin/unzip "; //std::string([rs.getJavaHome UTF8String]);
+      std::string execStr = "/usr/bin/unzip -uo "; //std::string([rs.getJavaHome UTF8String]);
       execStr += [self.metaInfo.zipFile UTF8String];
       //for_each(cli, [&execStr](std::string str){ execStr += std::string(" ") + str; });

launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj

@@ -501 +501 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=`/usr/libexec/PlistBuddy -c \"Print I2PRoutereVersion\" \"${INFOPLIST_FILE}\"`\ncommit=`mtn heads --branch=i2p.i2p | awk '{ print $1 }' | head -n 1`\nbuildinfo=\"Built $(date), $commit\"\n\n# Use cat to avoid any potential alias of cp asking for overwrite of file.\ncat $SRCROOT/version.h.tpl > $SRCROOT/version.h\nsed -i '' \"s#VERSION_REPLACED_BY_XCODE_BUILD_SCRIPT#$version#g\" $SRCROOT/version.h\nsed -i '' \"s#BUILD_INFO_REPLACED_BY_XCODE_BUILD_SCRIPT#$buildinfo#\" $SRCROOT/version.h\n\n$SRCROOT/check_latest_java.sh\n\n";
+                        shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=`/usr/libexec/PlistBuddy -c \"Print I2PRouterVersion\" \"${INFOPLIST_FILE}\"`\ncommit=`mtn heads --branch=i2p.i2p | awk '{ print $1 }' | head -n 1`\nbuildinfo=\"Built $(date), $commit\"\n\n# Use cat to avoid any potential alias of cp asking for overwrite of file.\ncat $SRCROOT/version.h.tpl > $SRCROOT/version.h\nsed -i '' \"s#VERSION_REPLACED_BY_XCODE_BUILD_SCRIPT#$version#g\" $SRCROOT/version.h\nsed -i '' \"s#BUILD_INFO_REPLACED_BY_XCODE_BUILD_SCRIPT#$buildinfo#\" $SRCROOT/version.h\n\n$SRCROOT/check_latest_java.sh\n\n";
                 };
                 BF1EFA4B215142030014EB07 /* ShellScript */ = {

launchers/macosx/I2PLauncher/Info.plist

@@ -18 +18 @@
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>0.1.2</string>
+        <string>0.1.3</string>
         <key>CFBundleVersion</key>
         <string>5</string>
-        <key>I2PRoutereVersion</key>
-        <string>0.9.37</string>
+        <key>I2PRouterVersion</key>
+        <string>0.9.38</string>
         <key>LSApplicationCategoryType</key>
         <string>public.app-category.utilities</string>

launchers/macosx/osx_create_dmg.sh

@@ -5 +5 @@
 
 APP_NAME="I2PLauncher"
-VERSION="0.9.37"
+VERSION="`/usr/libexec/PlistBuddy -c 'Print I2PRouterVersion' Info.plist`"
 DMG_BACKGROUND_IMG=${BACKGROUND_IMG:-"Background.png"}