Changeset 1030 for AE/Setup/Mac/Run AE Installer

Timestamp:

Feb 21, 2016, 1:58:04 AM (9 years ago)

Author:

iritscen

Message:

AE Setup v1.1.8. Updated Run AE Installer script for Mono in 10.11. Corrected Run script icon from using Setup's icon to using base AE icon.

Location:

AE/Setup/Mac/Run AE Installer

Files:

• . (modified) (1 prop)
• Run AE Installer.xcodeproj (modified) (1 prop)
• Run AE Installer.xcodeproj/project.pbxproj (modified) (4 diffs)
• Run AE Installer.xcodeproj/project.xcworkspace (modified) (1 prop)
• Run AE Installer/AppDelegate.applescript (modified) (2 diffs)
• Run AE Installer/Images.xcassets/AppIcon.appiconset/AElogo.png (added)
• Run AE Installer/Images.xcassets/AppIcon.appiconset/AEsetuplogo-1.png (deleted)
• Run AE Installer/Images.xcassets/AppIcon.appiconset/Contents.json (modified) (1 diff)
• Run AE Installer/Info.plist (modified) (3 diffs)

AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.pbxproj

@@ -108 +108 @@
                         isa = PBXProject;
                         attributes = {
-                                LastUpgradeCheck = 0640;
+                                LastUpgradeCheck = 0720;
                                 ORGANIZATIONNAME = Oni2.net;
                                 TargetAttributes = {
@@ -191 +191 @@
                                 DEBUG_INFORMATION_FORMAT = dwarf;
                                 ENABLE_STRICT_OBJC_MSGSEND = YES;
+                                ENABLE_TESTABILITY = YES;
                                 GCC_C_LANGUAGE_STANDARD = gnu99;
                                 GCC_DYNAMIC_NO_PIC = NO;
@@ -261 +262 @@
                                 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
                                 MACOSX_DEPLOYMENT_TARGET = 10.6;
+                                PRODUCT_BUNDLE_IDENTIFIER = "net.oni2.ae.$(PRODUCT_NAME:rfc1034identifier)";
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -273 +275 @@
                                 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
                                 MACOSX_DEPLOYMENT_TARGET = 10.6;
+                                PRODUCT_BUNDLE_IDENTIFIER = "net.oni2.ae.$(PRODUCT_NAME:rfc1034identifier)";
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };

AE/Setup/Mac/Run AE Installer/Run AE Installer/AppDelegate.applescript

@@ -6 +6 @@
 --      shortcut for the user and as a part of the AE Setup process.
 -- History:
+--   1.0.8 - Now that Mono is installed in /usr/local/bin/ in 10.11, we need to add
+--              that path to PATH when invoking Java.
 --   1.0.7 - Now an AppleScriptObjC application to ensure signing integrity and OS
 --              compatibility for 10.6 through 10.11.
@@ -62 +64 @@
             
             if (success is true) then
+                set run_prefix to "export PATH=/usr/local/bin:${PATH};export LC_CTYPE=\"UTF-8\";"
                 set AEIUfolder to parentPathASStr & "AEInstaller"
                 set AEIU to AEIUfolder & ":AEInstaller2Updater.jar"
                 set AEIU_CLI to POSIX path of AEIU
-                set run_AEIU to "export LC_CTYPE=\"UTF-8\";" & javaPath & " -jar \"" & AEIU_CLI & "\" &> /dev/null &"
+                set run_AEIU to run_prefix & javaPath & " -jar \"" & AEIU_CLI & "\" &> /dev/null &"
                 
                 set AEIfolder to parentPathASStr & "AEInstaller:bin"
                 set AEI to AEIfolder & ":AEInstaller2.jar"
                 set AEI_CLI to POSIX path of AEI
-                set run_AEI to "export LC_CTYPE=\"UTF-8\";" & javaPath & " -jar \"" & AEI_CLI & "\" &> /dev/null &"
+                set run_AEI to run_prefix & javaPath & " -jar \"" & AEI_CLI & "\" &> /dev/null &"
                 if not (parentPathUnixNS's lastPathComponent as string is "AE") then
                     display alert "Please put \"Run AE Installer\" in the AE/ folder so I can find the Installer."

AE/Setup/Mac/Run AE Installer/Run AE Installer/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -34 +34 @@
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "AEsetuplogo-1.png",
+      "filename" : "AElogo.png",
       "scale" : "1x"
     },

AE/Setup/Mac/Run AE Installer/Run AE Installer/Info.plist

@@ -3 +3 @@
 <plist version="1.0">
 <dict>
-        <key>LSUIElement</key>
-        <true/>
         <key>CFBundleDevelopmentRegion</key>
         <string>en</string>
@@ -12 +10 @@
         <string></string>
         <key>CFBundleIdentifier</key>
-        <string>net.oni2.ae.$(PRODUCT_NAME:rfc1034identifier)</string>
+        <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
@@ -20 +18 @@
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.0.7</string>
+        <string>1.0.8</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.0.7</string>
+        <string>1.0.8</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+        <key>LSUIElement</key>
+        <true/>
         <key>NSHumanReadableCopyright</key>
         <string>Copyright © 2015 iritscen@oni2.net. All rights reserved.</string>