diff options
author | 2010-02-01 21:35:11 +0000 | |
---|---|---|
committer | 2010-02-01 21:35:11 +0000 | |
commit | 8f1c61900c8d54853925b933972dba4e0041e4e0 (patch) | |
tree | bb30b73b23a6af05ff13d7908d221ac4cc8718f8 | |
parent | 11428214e480f1e305658fd084413b45f2353ffd (diff) |
[Author: dmaclach]
Updated plugin to deal with relative paths on testhosts.
Deals better with putting OBJC_GC_DISABLED flags into environment variables
Updated project version.
R=thomasvl
DELTA=14 (10 added, 1 deleted, 3 changed)
-rw-r--r-- | XcodePlugin/GTMXcodePlugin.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | XcodePlugin/Resources/CreateUnitTestExecutable.applescript | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/XcodePlugin/GTMXcodePlugin.xcodeproj/project.pbxproj b/XcodePlugin/GTMXcodePlugin.xcodeproj/project.pbxproj index 2223c77..d08ecb1 100644 --- a/XcodePlugin/GTMXcodePlugin.xcodeproj/project.pbxproj +++ b/XcodePlugin/GTMXcodePlugin.xcodeproj/project.pbxproj @@ -376,7 +376,7 @@ GTM_VERSIONINFO_SHORT = "$(GTM_VERSION_MAJOR).$(GTM_VERSION_MINOR).$(GTM_VERSION_FIXLEVEL)"; GTM_VERSION_BUILDNUMBER = 0; GTM_VERSION_COPYRIGHT = "2005-2010"; - GTM_VERSION_FIXLEVEL = 2; + GTM_VERSION_FIXLEVEL = 3; GTM_VERSION_MAJOR = 10; GTM_VERSION_MINOR = 0; INFOPLIST_FILE = Resources/Info.plist; diff --git a/XcodePlugin/Resources/CreateUnitTestExecutable.applescript b/XcodePlugin/Resources/CreateUnitTestExecutable.applescript index 5cec67b..f1eecc8 100644 --- a/XcodePlugin/Resources/CreateUnitTestExecutable.applescript +++ b/XcodePlugin/Resources/CreateUnitTestExecutable.applescript @@ -92,14 +92,23 @@ tell application "Xcode" try tell me set useGC to expandBuildSetting("$(GCC_ENABLE_OBJC_GC)") + if useGC is equal to "Unsupported" or useGC is equal to "" then + set useGC to yes + else + set useGC to no + end if end tell on error e log "Unable to expand GCC_ENABLE_OBJC_GC " & e - set useGC to "" + set useGC to no end try try tell me set testhost to expandBuildSetting("$(TEST_HOST)") + -- if testhost is a relative path, make it absolute + if first character of testhost is not "/" then + set testhost to expandBuildSetting("$(SRCROOT)") & "/" & testhost + end if end tell on error e log "Unable to expand testHost " & e @@ -131,7 +140,6 @@ tell application "Xcode" return & "Go to http://developer.apple.com/technotes/tn2004/tn2124.html for more info on settings."} tell exec if useGC is equal to "Unsupported" or useGC is equal to "" then - make new environment variable with properties {name:"OBJC_DISABLE_GC", value:"YES", active:yes} end if if wrapperExtension is "octest" then @@ -161,7 +169,7 @@ tell application "Xcode" make new launch argument with properties {name:"\"" & bundlename & "\"", active:yes} end if - make new environment variable with properties {name:"DYLD_IMAGE_SUFFIX", value:"_debug", active:no} + make new environment variable with properties {name:"OBJC_DISABLE_GC", value:"YES", active:useGC} make new environment variable with properties {name:"DYLD_LIBRARY_PATH", value:".", active:yes} make new environment variable with properties {name:"DYLD_FRAMEWORK_PATH", value:".:/Developer/Library/Frameworks", active:yes} @@ -186,6 +194,7 @@ tell application "Xcode" make new environment variable with properties {name:"TSMEventTracing", value:"1", active:no} make new environment variable with properties {name:"OBJC_PRINT_IMAGES", value:"1", active:no} make new environment variable with properties {name:"OBJC_PRINT_LOAD_METHODS", value:"1", active:no} + make new environment variable with properties {name:"DYLD_IMAGE_SUFFIX", value:"_debug", active:no} make new environment variable with properties {name:"DYLD_PRINT_LIBRARIES", value:"1", active:no} make new environment variable with properties {name:"DYLD_PRINT_LIBRARIES_POST_LAUNCH", value:"1", active:no} make new environment variable with properties {name:"DYLD_PREBIND_DEBUG", value:"1", active:no} |