Index: /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.pbxproj =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.pbxproj (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.pbxproj (revision 1029) @@ -0,0 +1,324 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 2753BF3E1B9F2D4800307AE2 /* AppleScriptObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2753BF3D1B9F2D4800307AE2 /* AppleScriptObjC.framework */; }; + 2753BF431B9F2D4800307AE2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2753BF421B9F2D4800307AE2 /* main.m */; }; + 2753BF451B9F2D4800307AE2 /* AppDelegate.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 2753BF441B9F2D4800307AE2 /* AppDelegate.applescript */; }; + 2753BF471B9F2D4800307AE2 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2753BF461B9F2D4800307AE2 /* Images.xcassets */; }; + 2753BF4A1B9F2D4800307AE2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2753BF481B9F2D4800307AE2 /* MainMenu.xib */; }; + 2753BF511B9F2E2200307AE2 /* AEInstaller2Updater.jar in Resources */ = {isa = PBXBuildFile; fileRef = 2753BF501B9F2E2200307AE2 /* AEInstaller2Updater.jar */; }; + 2753BF581BA3238300307AE2 /* AppIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2753BF571BA3238300307AE2 /* AppIcon.png */; }; + 2753BF5A1BA4923900307AE2 /* Run AE Installer.app in Resources */ = {isa = PBXBuildFile; fileRef = 2753BF591BA4923900307AE2 /* Run AE Installer.app */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 2753BF3A1B9F2D4800307AE2 /* Anniversary Edition Setup.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Anniversary Edition Setup.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2753BF3D1B9F2D4800307AE2 /* AppleScriptObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleScriptObjC.framework; path = System/Library/Frameworks/AppleScriptObjC.framework; sourceTree = SDKROOT; }; + 2753BF411B9F2D4800307AE2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 2753BF421B9F2D4800307AE2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 2753BF441B9F2D4800307AE2 /* AppDelegate.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = AppDelegate.applescript; sourceTree = ""; }; + 2753BF461B9F2D4800307AE2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 2753BF501B9F2E2200307AE2 /* AEInstaller2Updater.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AEInstaller2Updater.jar; path = ../Resources/AEInstaller2Updater.jar; sourceTree = ""; }; + 2753BF551BA0345300307AE2 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; + 2753BF571BA3238300307AE2 /* AppIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AppIcon.png; path = Resources/AppIcon.png; sourceTree = SOURCE_ROOT; }; + 2753BF591BA4923900307AE2 /* Run AE Installer.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = "Run AE Installer.app"; path = "Resources/Run AE Installer.app"; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 2753BF371B9F2D4800307AE2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2753BF3E1B9F2D4800307AE2 /* AppleScriptObjC.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 2753BF311B9F2D4800307AE2 = { + isa = PBXGroup; + children = ( + 2753BF3F1B9F2D4800307AE2 /* AE Setup */, + 2753BF3C1B9F2D4800307AE2 /* Frameworks */, + 2753BF561BA3230C00307AE2 /* Resources */, + 2753BF3B1B9F2D4800307AE2 /* Products */, + ); + sourceTree = ""; + }; + 2753BF3B1B9F2D4800307AE2 /* Products */ = { + isa = PBXGroup; + children = ( + 2753BF3A1B9F2D4800307AE2 /* Anniversary Edition Setup.app */, + ); + name = Products; + sourceTree = ""; + }; + 2753BF3C1B9F2D4800307AE2 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2753BF3D1B9F2D4800307AE2 /* AppleScriptObjC.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 2753BF3F1B9F2D4800307AE2 /* AE Setup */ = { + isa = PBXGroup; + children = ( + 2753BF441B9F2D4800307AE2 /* AppDelegate.applescript */, + 2753BF461B9F2D4800307AE2 /* Images.xcassets */, + 2753BF481B9F2D4800307AE2 /* MainMenu.xib */, + 2753BF401B9F2D4800307AE2 /* Supporting Files */, + ); + path = "AE Setup"; + sourceTree = ""; + }; + 2753BF401B9F2D4800307AE2 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 2753BF411B9F2D4800307AE2 /* Info.plist */, + 2753BF421B9F2D4800307AE2 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 2753BF561BA3230C00307AE2 /* Resources */ = { + isa = PBXGroup; + children = ( + 2753BF591BA4923900307AE2 /* Run AE Installer.app */, + 2753BF571BA3238300307AE2 /* AppIcon.png */, + 2753BF501B9F2E2200307AE2 /* AEInstaller2Updater.jar */, + ); + name = Resources; + path = "AE Setup"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 2753BF391B9F2D4800307AE2 /* Anniversary Edition Setup */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2753BF4D1B9F2D4800307AE2 /* Build configuration list for PBXNativeTarget "Anniversary Edition Setup" */; + buildPhases = ( + 2753BF361B9F2D4800307AE2 /* Sources */, + 2753BF371B9F2D4800307AE2 /* Frameworks */, + 2753BF381B9F2D4800307AE2 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "Anniversary Edition Setup"; + productName = "AE Setup"; + productReference = 2753BF3A1B9F2D4800307AE2 /* Anniversary Edition Setup.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 2753BF321B9F2D4800307AE2 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = Oni2.net; + TargetAttributes = { + 2753BF391B9F2D4800307AE2 = { + CreatedOnToolsVersion = 6.4; + }; + }; + }; + buildConfigurationList = 2753BF351B9F2D4800307AE2 /* Build configuration list for PBXProject "AE Setup" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 2753BF311B9F2D4800307AE2; + productRefGroup = 2753BF3B1B9F2D4800307AE2 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 2753BF391B9F2D4800307AE2 /* Anniversary Edition Setup */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 2753BF381B9F2D4800307AE2 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2753BF581BA3238300307AE2 /* AppIcon.png in Resources */, + 2753BF511B9F2E2200307AE2 /* AEInstaller2Updater.jar in Resources */, + 2753BF5A1BA4923900307AE2 /* Run AE Installer.app in Resources */, + 2753BF471B9F2D4800307AE2 /* Images.xcassets in Resources */, + 2753BF4A1B9F2D4800307AE2 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 2753BF361B9F2D4800307AE2 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2753BF451B9F2D4800307AE2 /* AppDelegate.applescript in Sources */, + 2753BF431B9F2D4800307AE2 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 2753BF481B9F2D4800307AE2 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 2753BF551BA0345300307AE2 /* en */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 2753BF4B1B9F2D4800307AE2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 2753BF4C1B9F2D4800307AE2 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + 2753BF4E1B9F2D4800307AE2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "AE Setup/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIPFLAGS = "-S"; + }; + name = Debug; + }; + 2753BF4F1B9F2D4800307AE2 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + INFOPLIST_FILE = "AE Setup/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIPFLAGS = "-S"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 2753BF351B9F2D4800307AE2 /* Build configuration list for PBXProject "AE Setup" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2753BF4B1B9F2D4800307AE2 /* Debug */, + 2753BF4C1B9F2D4800307AE2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 2753BF4D1B9F2D4800307AE2 /* Build configuration list for PBXNativeTarget "Anniversary Edition Setup" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2753BF4E1B9F2D4800307AE2 /* Debug */, + 2753BF4F1B9F2D4800307AE2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 2753BF321B9F2D4800307AE2 /* Project object */; +} Index: /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.xcworkspace/contents.xcworkspacedata =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.xcworkspace/contents.xcworkspacedata (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup.xcodeproj/project.xcworkspace/contents.xcworkspacedata (revision 1029) @@ -0,0 +1,7 @@ + + + + + Index: /AE/Setup/Mac/AE Setup/AE Setup/AppDelegate.applescript =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup/AppDelegate.applescript (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup/AppDelegate.applescript (revision 1029) @@ -0,0 +1,383 @@ +-- Anniversary Edition Setup +-- for Anniversary Edition Seven +-- by Iritscen +-- For installing the Anniversary Edition Seven's AEI Updater. This script looks for an existing Oni +-- installation, places the AEInstaller2Updater into a new AE/ folder, and runs it. It also makes sure +-- that the user has Java installed so he can run the Updater and Installer. It does not check for Mono +-- because that would be redundant of the Installer itself. +-- History: +-- 1.1.7 - Now an AppleScriptObjC application to ensure signing integrity and OS compatibility. +-- 1.1.6 - Now testing for Java's existence before talking to it, because it seems that simply calling +-- "java -version" now causes the script to fail with an error dialog instead of invoking +-- OS X's Java installation prompt. Setup app now uses the standard icon name "applet" so +-- that Info.plist does not have to be edited, since that invalidates the code signature +-- applied by OS X 10.6's Script Editor. Some dialog text has been made clearer. Fixed a +-- weird bug that cropped up for the first while testing this script, which was breaking +-- GDF validation. +-- 1.1.5 - Now using fixed paths for Java for 10.6 and for 10.7+ because "which java" is not reliable. +-- 1.1.4 - Now attempting to call Java through "java" again before falling back to looking in Internet +-- Plug-Ins, because 10.6 has Java installed differently. +-- 1.1.3 - No longer supplying link to MacUpdate page for Apple Java because it is out of date; only +-- supplying link to java.com. +-- 1.1.2 - Calling Java at Internet plug-in location instead of using basic command-line "java", as +-- only the JDK installs command-line Java. +-- 1.1.1 - Changed the "Run AE Installer" script to set environment to UTF-8 in order to avoid 'ƒ' +-- problem in Java 7. +-- 1.1 - Updated bundled AEI Updater to 1.1, which supports proxies. +-- 1.0 - Initial release. + +script AppDelegate + property parent : class "NSObject" + global pathToMe + global sosumi + global gNeedsJavaVersionMajor + global gNeedsJavaVersionMinor + + -- IBOutlets + property theWindow : missing value + property aesIcon : missing value + + on applicationWillFinishLaunching_(aNotification) + -- Set globals + set gNeedsJavaVersionMajor to 1 + set gNeedsJavaVersionMinor to 6 + + -- Set "pathToMe" for various future uses; its value will be "/path/to/Anniversary Edition Setup.app/Contents/Resources" + tell current application's class "NSBundle" + tell its mainBundle() + set pathToMe to resourcePath() as string + end tell + end tell + + -- Draw the AE Setup icon in the window + set iconPath to POSIX path of ((pathToMe & "/AppIcon.png") as string) + set aesIconImg to current application's NSImage's alloc's initWithContentsOfFile_(iconPath) + aesIcon's setImage_(aesIconImg) + + -- Set up "sosumi" with the Sosumi sound + tell current application's NSSound to set thisSound to soundNamed_("Sosumi") + + -- Bring self to front in case something else stole focus + tell me + activate + end tell + end applicationWillFinishLaunching_ + + on applicationShouldTerminateAfterLastWindowClosed_(sender) + return true + end applicationShouldTerminateAfterLastWindowClosed_ + + on applicationShouldTerminate_(sender) + -- Insert code here to do any housekeeping before your application quits + return current application's NSTerminateNow + end applicationShouldTerminate_ + + -- IBActions + on clickStart_(sender) + set installPath to my find_Oni_folder() + tell me + activate + end tell + if (installPath is "Gave up") then + display dialog "Sorry, the AE currently requires a retail Oni installation." buttons {"OK"} default button 1 with title "AE Setup" + else if (installPath is "AE exists") then + display dialog "If you are sure you want to start over with a new AE installation in this location, then you should delete the existing AE/ folder and then run this Setup app again." buttons {"OK"} default button 1 with title "AE Setup" + else if (installPath is "") then + display dialog "Unknown error encountered while choosing Oni installation. Please ask for help in the Anniversary Edition sub-forum of the Oni Central Forum." buttons {"Go to forum", "OK"} default button 2 with title "AE Setup" + set quitOrForum to button returned of the result + if (quitOrForum is "Go to forum") then + open location "http://oni.bungie.org/community/forum/index.php" + end if + else + set installResult to my install_AEI_Updater(installPath) + tell me + activate + end tell + if (installResult is 0) then + display dialog "Updater installed. AE Setup will now continue the installation by running the Updater." buttons {"OK"} default button 1 with title "AE Setup" + set runResult to my run_AEIU(installPath) + tell me + activate + end tell + -- Quit if running Run AE Installer seems to have been successful + if (runResult is 0) then + tell me + quit + end tell + else if (runResult is 1) then + display dialog "Script copy error. Please ask for help in the Anniversary Edition sub-forum of the Oni Central Forum." buttons {"Go to forum", "OK"} default button 2 with title "AE Setup" + set quitOrForum to button returned of the result + if (quitOrForum is "Go to forum") then + open location "http://oni.bungie.org/community/forum/index.php" + end if + else if (runResult is 2) then + display dialog "Could not run AEI Updater. Please ask for help in the Anniversary Edition sub-forum of the Oni Central Forum." buttons {"Go to forum", "OK"} default button 2 with title "AE Setup" + set quitOrForum to button returned of the result + if (quitOrForum is "Go to forum") then + open location "http://oni.bungie.org/community/forum/index.php" + end if + end if + else if (installResult is 1) then + display dialog "Could not install the AEI Updater because Java was not installed or new enough. Please obtain a Java installer from Java.com." buttons {"Go to Java.com", "OK"} default button 2 with title "AE Setup" + set quitOrJava to button returned of the result + if (quitOrJava is "Go to Java.com") then + open location "http://www.java.com/" + end if + else if (installResult is 2) then -- file operation failure + display dialog "Could not install the AEI Updater. Please ask for help in the Anniversary Edition sub-forum of the Oni Central Forum." buttons {"Go to forum", "OK"} default button 2 with title "AE Setup" + set quitOrForum to button returned of the result + if (quitOrForum is "Go to forum") then + open location "http://oni.bungie.org/community/forum/index.php" + end if + else + display dialog "Unknown error returned from install_AEI_Updater()! Please ask for help in the Anniversary Edition sub-forum of the Oni Central Forum." buttons {"Go to forum", "OK"} default button 2 with title "AE Setup" + set quitOrForum to button returned of the result + if (quitOrForum is "Go to forum") then + open location "http://oni.bungie.org/community/forum/index.php" + end if + end if + end if + end clickStart_ + + -- The user must pick an acceptable folder to install the AE in, or die trying (or give up) + -- Returns "Gave up" if user clicked Quit after being told his choice was not the Oni folder, + -- "AE exists" if user clicked Quit after being told that the AE folder was already present, and + -- returns the user's chosen path if validation was successful + -- Called by clickStart_() + on find_Oni_folder() + tell me + tell me + activate + end tell + set tryAgain to true + set isOniRetail to false + set pathProblem to "" + set folderTest to 0 + repeat while (tryAgain is true) + set chosenPath to (choose folder with prompt "Please locate your Oni installation.") + if (chosenPath is "") then + display dialog "There was an error in choosing the Oni folder." buttons {"OK"} default button 1 with title "AE Setup" + return chosenPath + end if + set folderTest to my validate_Oni_folder(chosenPath) + tell me + activate + end tell + if (folderTest is 1) then + display dialog "This doesn't seem to be your Oni installation. Click \"Try again\" to locate another folder." buttons {"Cancel", "Try again"} default button 2 with title "AE Setup" + set cancelOrTryAgain to the button returned of the result + if (cancelOrTryAgain is "Cancel") then + set tryAgain to false + set pathProblem to "Gave up" + end if + else if (folderTest is 2) then + display dialog "This Oni installation already has an AE/ folder! This means that you've probably already run this Setup app, and now you should be opening the \"Run AE Installer\" script in the AE/ folder. You can also click \"Try again\" to find another Oni installation in which to install the AE." buttons {"Cancel", "Try again"} default button 2 with title "AE Setup" + set cancelOrTryAgain to the button returned of the result + if (cancelOrTryAgain is "Cancel") then + set tryAgain to false + set pathProblem to "AE exists" + end if + else + set tryAgain to false -- we got it, let's get out of this loop + end if + end repeat + if (folderTest is 0) then + return chosenPath + else + return pathProblem + end if + end tell + end find_Oni_folder + + -- Returns 0 if this is a valid target for the AE installation, + -- 1 if this is not a valid target, and + -- 2 if the AE is already here + -- Called by find_Oni_folder() + on validate_Oni_folder(folderPath) + tell application "Finder" + tell me + activate + end tell + -- Is the GDF here? + if not (exists folder "GameDataFolder" in folder folderPath) then + display dialog "GameDataFolder not detected here." buttons {"OK"} default button 1 with title "AE Setup" + return 1 + end if + -- Is the AE folder here? Because we won't install over it. + if (exists folder "AE" in folder folderPath) then + return 2 + end if + + -- Now see if this is the full installation or demo + set retailLevelList to {0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 18, 19} + set demoLevelList to {0, 1, 4} -- there's also a separate demo release of just level 2 to be dropped into the demo's GDF, but 1 and 4 were the only core demo levels + set isRetail to true + set isDemo to true + -- Look for levels until one is missing and we know this isn't a complete retail release + repeat with thisLevel in retailLevelList + if not (exists file ((folderPath & "GameDataFolder:level" & (thisLevel as string) & "_Final.dat") as string)) then + set isRetail to false + exit repeat + end if + end repeat + if (isRetail) then + -- Don't return here if we add demo support below + return 0 + end if + -- Look for levels until one is missing and we know this isn't a complete demo release + repeat with thisLevel in demoLevelList + if not (exists file ((folderPath & "GameDataFolder:level" & (thisLevel as string) & "_Final.dat") as string)) then + set isDemo to false + exit repeat + end if + end repeat + if (isDemo) then + -- Insert handling of demo status here if we ever support a demo AE + return 1 + else + return 1 + end if + end tell + end validate_Oni_folder + + -- If Java is found, creates the AE/ folder with the Updater + -- Returns 0 if the Updater was installed (which will install the Installer itself afterward), + -- 1 if Java fails verification, and + -- 2 if a file operation or other error occurs + -- Called by clickStart_() + on install_AEI_Updater(pathToOni) + tell me + set javaResult to my verify_Java() + if (javaResult is 1) then + return 1 + end if + end tell + -- Make "Oni/AE" folder + tell application "Finder" + if ((pathToOni & "AE") exists) then -- shouldn't happen because we already looked for it in validate_Oni_folder() + display alert "AE folder already present!" + return 2 + end if + try + make new folder at pathToOni with properties {name:"AE"} + delay 0.5 + make new folder at ((pathToOni as string) & "AE") with properties {name:"AEInstaller"} + on error + display alert "Couldn't make AE or AEI folder!" + return 2 + end try + + -- Copy AEI Updater into "AE/" + set AEIU to POSIX file (pathToMe & "/AEInstaller2Updater.jar") as alias + if (AEIU exists) then + set AEIfolder to (pathToOni & "AE:AEInstaller" as string) + try + duplicate file AEIU to folder AEIfolder + on error copyError + return 2 + end try + else + display dialog "AE Installer Updater is not present in the Setup app!" + return 2 + end if + end tell + return 0 + end install_AEI_Updater + + -- Checks for an acceptable Java installation + -- This function was going to support a bundled JRE for those without Java, + -- but it adds too many complications, so just make the user install it himself + -- Returns 1 if Java is not found or too old, and + -- 0 if Java is found and the version is acceptable + -- Called by install_AEI_Updater() + on verify_Java() + tell me + set origDelimiters to AppleScript's text item delimiters + set OSversion to (system version of (system info) as string) + set AppleScript's text item delimiters to "." + + -- Java's location is different in 10.6 than in 10.7+ + if ((second text item of OSversion) as number > 6) then + set javaPath to "/Library/Internet\\ Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" + else + set javaPath to "/usr/bin/java" + end if + + -- Test for Java before talking to it + set javaExistsTest to ("if [ -f " & javaPath & " ]; then echo okay; fi") as string + set javaExists to do shell script javaExistsTest without altering line endings + if (javaExists is "") then + return 1 + end if + + -- Get Java's version + set javaVersionCmd to ((javaPath & " -version 2>&1") as string) -- Java's version output is sometimes on stderr, not stdout :-/ + set javaVersionText to do shell script javaVersionCmd without altering line endings + if (javaVersionText is "") then + return 1 + end if + + -- Isolate version number from output with format: + (* java version "1.7.0_17" + Java(TM) SE Runtime Environment (build 1.7.0_17-b02) + Java HotSpot(TM) 64-Bit Server VM (build 23.7-b01, mixed mode) *) + -- Get first line + set AppleScript's text item delimiters to " +" + set javaVersionText to first text item of javaVersionText + -- Get text after first quote mark + set AppleScript's text item delimiters to "\"" + set javaVersionText to second text item of javaVersionText + -- Get first and second version numbers, third doesn't matter + set AppleScript's text item delimiters to "." + set versionMajor to first text item of javaVersionText + set versionMinor to second text item of javaVersionText + set AppleScript's text item delimiters to origDelimiters + -- Inform user if Java is too old + if (versionMajor ≥ gNeedsJavaVersionMajor) then + if (versionMinor < gNeedsJavaVersionMinor) then + display dialog (("Sorry, Java v" & gNeedsJavaVersionMajor & "." & gNeedsJavaVersionMinor & " is required; found v" & versionMajor & "." & versionMinor & " instead.") as string) buttons {"OK"} default button 1 with title "AE Setup" + return 1 + end if + else + display dialog (("Sorry, Java v" & gNeedsJavaVersionMajor & "." & gNeedsJavaVersionMinor & " is required; found v" & versionMajor & "." & versionMinor & " instead.") as string) buttons {"OK"} default button 1 with title "AE Setup" + return 1 + end if + end tell + return 0 + end verify_Java + + -- Drops an applet into the new "AE/" folder and runs it; + -- the applet will try to run the AEI, but if it's not found, + -- it runs the AEI Updater, which is what we want to happen + -- so that the AEI can be installed. + -- Returns 0 if this is a valid target for the AE installation, + -- 1 if the applet cannot be dropped, and + -- 2 if the applet cannot be run + -- Called by clickStart_() + on run_AEIU(pathToOni) + tell application "Finder" + -- Copy applet to AE/ that opens AEI or AEIU if AEI is not around + set RAEI to POSIX file (pathToMe & "/Run AE Installer.app") as alias + set pathToAE to alias ((pathToOni & "AE") as string) + try + duplicate RAEI to pathToAE + on error copyError + return 1 + end try + set RAEI to ((pathToAE as string) & "Run AE Installer.app") + try + open RAEI + on error runError + return 2 + end try + end tell + return 0 + end run_AEIU + + on play_error_sound() + tell sosumi + play() + end tell + end play_error_sound +end script Index: /AE/Setup/Mac/AE Setup/AE Setup/Images.xcassets/AppIcon.appiconset/Contents.json =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup/Images.xcassets/AppIcon.appiconset/Contents.json (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup/Images.xcassets/AppIcon.appiconset/Contents.json (revision 1029) @@ -0,0 +1,59 @@ +{ + "images" : [ + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "AEsetuplogo-1.png", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} Index: /AE/Setup/Mac/AE Setup/AE Setup/Info.plist =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup/Info.plist (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup/Info.plist (revision 1029) @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + net.oni2.ae.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.1.7 + CFBundleSignature + ???? + CFBundleVersion + Setup 1.1.7 + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + Copyright © 2015 iritscen@oni2.net. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + Index: /AE/Setup/Mac/AE Setup/AE Setup/en.lproj/MainMenu.xib =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup/en.lproj/MainMenu.xib (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup/en.lproj/MainMenu.xib (revision 1029) @@ -0,0 +1,723 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Thanks for your interest in the fan-made Anniversary Edition (AE), a mod installer and modding framework for Oni. + +This is the preliminary setup program which prepares the way for the AE. When it is done, an "AE" folder in your Oni installation will contain the "AE Installer", which installs mods. + +Click "Start" to locate your Oni installation +and begin the process. + + + + + + + + + + + + + + + + + + Index: /AE/Setup/Mac/AE Setup/AE Setup/main.m =================================================================== --- /AE/Setup/Mac/AE Setup/AE Setup/main.m (revision 1029) +++ /AE/Setup/Mac/AE Setup/AE Setup/main.m (revision 1029) @@ -0,0 +1,15 @@ +// +// main.m +// AE Setup +// +// Created by Michael Loudon on 9/8/15. +// Copyright (c) 2015 Oni2.net. All rights reserved. +// + +#import +#import + +int main(int argc, const char * argv[]) { + [[NSBundle mainBundle] loadAppleScriptObjectiveCScripts]; + return NSApplicationMain(argc, argv); +} Index: /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/Info.plist =================================================================== --- /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/Info.plist (revision 1029) +++ /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/Info.plist (revision 1029) @@ -0,0 +1,52 @@ + + + + + BuildMachineOSBuild + 14F27 + CFBundleDevelopmentRegion + en + CFBundleExecutable + Run AE Installer + CFBundleIconFile + AppIcon + CFBundleIdentifier + net.oni2.ae.Run-AE-Installer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Run AE Installer + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0.7 + CFBundleSignature + ???? + CFBundleVersion + 1.0.7 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 6E35b + DTPlatformVersion + GM + DTSDKBuild + 14D125 + DTSDKName + macosx10.10 + DTXcode + 0640 + DTXcodeBuild + 6E35b + LSMinimumSystemVersion + 10.6 + LSUIElement + + NSHumanReadableCopyright + Copyright © 2015 iritscen@oni2.net. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + Index: /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/PkgInfo =================================================================== --- /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/PkgInfo (revision 1029) +++ /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/PkgInfo (revision 1029) @@ -0,0 +1,1 @@ +APPL???? Index: /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/_CodeSignature/CodeResources =================================================================== --- /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/_CodeSignature/CodeResources (revision 1029) +++ /AE/Setup/Mac/AE Setup/Resources/Run AE Installer.app/Contents/_CodeSignature/CodeResources (revision 1029) @@ -0,0 +1,141 @@ + + + + + files + + Resources/AppDelegate.scpt + + 5Wdxj82RAY/DkEglzFVlf8kX9mc= + + Resources/AppIcon.icns + + KuLVWPQLP7uTX/pdqpt0r2g+op0= + + Resources/en.lproj/MainMenu.nib + + hash + + YcJaYr9xKeZ7f/BCOWkvtYusIek= + + optional + + + + files2 + + Resources/AppDelegate.scpt + + 5Wdxj82RAY/DkEglzFVlf8kX9mc= + + Resources/AppIcon.icns + + KuLVWPQLP7uTX/pdqpt0r2g+op0= + + Resources/en.lproj/MainMenu.nib + + hash + + YcJaYr9xKeZ7f/BCOWkvtYusIek= + + optional + + + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.pbxproj =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.pbxproj (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.pbxproj (revision 1029) @@ -0,0 +1,303 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 27A26E311BA4AC060075C6B1 /* AppleScriptObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A26E301BA4AC060075C6B1 /* AppleScriptObjC.framework */; }; + 27A26E361BA4AC060075C6B1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A26E351BA4AC060075C6B1 /* main.m */; }; + 27A26E381BA4AC060075C6B1 /* AppDelegate.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 27A26E371BA4AC060075C6B1 /* AppDelegate.applescript */; }; + 27A26E3A1BA4AC060075C6B1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 27A26E391BA4AC060075C6B1 /* Images.xcassets */; }; + 27A26E431BA4CBEF0075C6B1 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 27A26E3B1BA4AC070075C6B1 /* MainMenu.xib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 27A26E2D1BA4AC060075C6B1 /* Run AE Installer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Run AE Installer.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 27A26E301BA4AC060075C6B1 /* AppleScriptObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleScriptObjC.framework; path = System/Library/Frameworks/AppleScriptObjC.framework; sourceTree = SDKROOT; }; + 27A26E341BA4AC060075C6B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 27A26E351BA4AC060075C6B1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 27A26E371BA4AC060075C6B1 /* AppDelegate.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = AppDelegate.applescript; sourceTree = ""; }; + 27A26E391BA4AC060075C6B1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 27A26E491BA4CD240075C6B1 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 27A26E2A1BA4AC060075C6B1 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 27A26E311BA4AC060075C6B1 /* AppleScriptObjC.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 27A26E241BA4AC060075C6B1 = { + isa = PBXGroup; + children = ( + 27A26E321BA4AC060075C6B1 /* Run AE Installer */, + 27A26E2F1BA4AC060075C6B1 /* Frameworks */, + 27A26E2E1BA4AC060075C6B1 /* Products */, + ); + sourceTree = ""; + }; + 27A26E2E1BA4AC060075C6B1 /* Products */ = { + isa = PBXGroup; + children = ( + 27A26E2D1BA4AC060075C6B1 /* Run AE Installer.app */, + ); + name = Products; + sourceTree = ""; + }; + 27A26E2F1BA4AC060075C6B1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 27A26E301BA4AC060075C6B1 /* AppleScriptObjC.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 27A26E321BA4AC060075C6B1 /* Run AE Installer */ = { + isa = PBXGroup; + children = ( + 27A26E371BA4AC060075C6B1 /* AppDelegate.applescript */, + 27A26E391BA4AC060075C6B1 /* Images.xcassets */, + 27A26E3B1BA4AC070075C6B1 /* MainMenu.xib */, + 27A26E331BA4AC060075C6B1 /* Supporting Files */, + ); + path = "Run AE Installer"; + sourceTree = ""; + }; + 27A26E331BA4AC060075C6B1 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 27A26E341BA4AC060075C6B1 /* Info.plist */, + 27A26E351BA4AC060075C6B1 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 27A26E2C1BA4AC060075C6B1 /* Run AE Installer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 27A26E401BA4AC070075C6B1 /* Build configuration list for PBXNativeTarget "Run AE Installer" */; + buildPhases = ( + 27A26E291BA4AC060075C6B1 /* Sources */, + 27A26E2A1BA4AC060075C6B1 /* Frameworks */, + 27A26E2B1BA4AC060075C6B1 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "Run AE Installer"; + productName = "Run AE Installer"; + productReference = 27A26E2D1BA4AC060075C6B1 /* Run AE Installer.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 27A26E251BA4AC060075C6B1 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = Oni2.net; + TargetAttributes = { + 27A26E2C1BA4AC060075C6B1 = { + CreatedOnToolsVersion = 6.4; + }; + }; + }; + buildConfigurationList = 27A26E281BA4AC060075C6B1 /* Build configuration list for PBXProject "Run AE Installer" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 27A26E241BA4AC060075C6B1; + productRefGroup = 27A26E2E1BA4AC060075C6B1 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 27A26E2C1BA4AC060075C6B1 /* Run AE Installer */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 27A26E2B1BA4AC060075C6B1 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 27A26E3A1BA4AC060075C6B1 /* Images.xcassets in Resources */, + 27A26E431BA4CBEF0075C6B1 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 27A26E291BA4AC060075C6B1 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 27A26E381BA4AC060075C6B1 /* AppDelegate.applescript in Sources */, + 27A26E361BA4AC060075C6B1 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 27A26E3B1BA4AC070075C6B1 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 27A26E491BA4CD240075C6B1 /* en */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 27A26E3E1BA4AC070075C6B1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + STRIPFLAGS = "-S"; + }; + name = Debug; + }; + 27A26E3F1BA4AC070075C6B1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = s; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + STRIPFLAGS = "-S"; + }; + name = Release; + }; + 27A26E411BA4AC070075C6B1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Run AE Installer/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 27A26E421BA4AC070075C6B1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "Run AE Installer/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 27A26E281BA4AC060075C6B1 /* Build configuration list for PBXProject "Run AE Installer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 27A26E3E1BA4AC070075C6B1 /* Debug */, + 27A26E3F1BA4AC070075C6B1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 27A26E401BA4AC070075C6B1 /* Build configuration list for PBXNativeTarget "Run AE Installer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 27A26E411BA4AC070075C6B1 /* Debug */, + 27A26E421BA4AC070075C6B1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 27A26E251BA4AC060075C6B1 /* Project object */; +} Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.xcworkspace/contents.xcworkspacedata =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.xcworkspace/contents.xcworkspacedata (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer.xcodeproj/project.xcworkspace/contents.xcworkspacedata (revision 1029) @@ -0,0 +1,7 @@ + + + + + Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer/AppDelegate.applescript =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer/AppDelegate.applescript (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer/AppDelegate.applescript (revision 1029) @@ -0,0 +1,94 @@ +-- Run AE Installer +-- for Anniversary Edition Seven +-- by Iritscen +-- Serves as a forking alias which opens either the AE Installer, or, if the AEI is +-- not found, the AEI Updater so it can install the Installer. Used as both a +-- shortcut for the user and as a part of the AE Setup process. +-- History: +-- 1.0.7 - Now an AppleScriptObjC application to ensure signing integrity and OS +-- compatibility for 10.6 through 10.11. +-- 1.0.6 - The previous method fails sometimes, e.g. in 10.7 with Apple Java +-- installed, so now we are just looking in either place and calling Java +-- when we find it. +-- 1.0.5 - Removing "which java" as "smart" method for finding Java, as it can now +-- return a value like "/usr/bin/java" even when Java is not really +-- there; now calling Java using a fixed path for 10.6 and another fixed +-- path for 10.7+. +-- 1.0.4 - Calling Java through command-line again before falling back to Internet +-- Plug-Ins location, to restore 10.6 compatibility. +-- 1.0.3 - Instead of escaping only space characters in paths, put paths in quotes +-- to avoid need for escaping entirely. +-- 1.0.2 - Calling Java at Internet plug-in location instead of using basic command- +-- line "java", as only the JDK installs command-line Java. +-- 1.0.1 - Now setting environment to UTF-8 in order to avoid 'ƒ' problem in Java 7. +-- 1.0 - Initial release. + +script AppDelegate + property parent : class "NSObject" + global parentPathUnixNS + global parentPathUnixStr + global parentPathASAlias + global parentPathASStr + + -- IBOutlets + property theWindow : missing value + + on applicationWillFinishLaunching_(aNotification) + tell application "Finder" + tell current application's class "NSBundle" + tell its mainBundle() + set parentPathUnixNS to bundlePath()'s stringByDeletingLastPathComponent + set parentPathUnixStr to parentPathUnixNS as string + end tell + end tell + set parentPathASAlias to POSIX file parentPathUnixStr as alias + set parentPathASStr to parentPathASAlias as string + set success to true + + -- Test for Java at the two standard locations + set javaPath to "/Library/Internet\\ Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" + set javaExistsTest to ("if [ -f " & javaPath & " ]; then echo okay; fi") as string + set javaExists to do shell script javaExistsTest without altering line endings + if (javaExists is "") then + -- Test for Java at old location (Apple Java) + set javaPath to "/usr/bin/java" + set javaExistsTest to ("if [ -f " & javaPath & " ]; then echo okay; fi") as string + set javaExists to do shell script javaExistsTest without altering line endings + if (javaExists is "") then + display alert "Could not find Java!" + set success to false + end if + end if + + if (success is true) then + 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 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 &" + 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." + else if (AEI exists) then + do shell script run_AEI + else if (AEIU exists) then + do shell script run_AEIU + else + display alert "Could not find AE Installer *or* AE Installer Updater! You may need to re-install the AE." + end if + end if + end tell + tell me + quit + end tell + end applicationWillFinishLaunching_ + + on applicationShouldTerminate_(sender) + -- Insert code here to do any housekeeping before your application quits + return current application's NSTerminateNow + end applicationShouldTerminate_ + +end script Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer/Images.xcassets/AppIcon.appiconset/Contents.json =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer/Images.xcassets/AppIcon.appiconset/Contents.json (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer/Images.xcassets/AppIcon.appiconset/Contents.json (revision 1029) @@ -0,0 +1,59 @@ +{ + "images" : [ + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "AEsetuplogo-1.png", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer/Info.plist =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer/Info.plist (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer/Info.plist (revision 1029) @@ -0,0 +1,36 @@ + + + + + LSUIElement + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + net.oni2.ae.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0.7 + CFBundleSignature + ???? + CFBundleVersion + 1.0.7 + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + Copyright © 2015 iritscen@oni2.net. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer/en.lproj/MainMenu.xib =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer/en.lproj/MainMenu.xib (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer/en.lproj/MainMenu.xib (revision 1029) @@ -0,0 +1,681 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /AE/Setup/Mac/Run AE Installer/Run AE Installer/main.m =================================================================== --- /AE/Setup/Mac/Run AE Installer/Run AE Installer/main.m (revision 1029) +++ /AE/Setup/Mac/Run AE Installer/Run AE Installer/main.m (revision 1029) @@ -0,0 +1,15 @@ +// +// main.m +// Run AE Installer +// +// Created by Michael Loudon on 9/12/15. +// Copyright (c) 2015 Oni2.net. All rights reserved. +// + +#import +#import + +int main(int argc, const char * argv[]) { + [[NSBundle mainBundle] loadAppleScriptObjectiveCScripts]; + return NSApplicationMain(argc, argv); +}