Use default build location when testing a new xctool release.

Use 0 return codes when xctool is launched with `-version` or `-help` arguments. Fix build warning of otest-shim test bundle.
facebookarchive · Aug 21, 2015 · 2d46711 · 2d46711
1 parent e819295
commit 2d46711
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/otest-shim/otest-shim.xcodeproj/project.pbxproj b/otest-shim/otest-shim.xcodeproj/project.pbxproj
@@ -49,7 +49,6 @@
 		90F7485718E4FAFF00600D5C /* SenIsSuperclassOfClassPerformanceFix.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F7485318E4FAFF00600D5C /* SenIsSuperclassOfClassPerformanceFix.m */; };
 		AA318BEA17E9B43000BF159E /* XCTest.h in Headers */ = {isa = PBXBuildFile; fileRef = AA318BE917E9B43000BF159E /* XCTest.h */; };
 		AA318BEB17E9B43000BF159E /* XCTest.h in Headers */ = {isa = PBXBuildFile; fileRef = AA318BE917E9B43000BF159E /* XCTest.h */; };
-		CC839AB81B433F7C007A4EC1 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CC839AB61B433F7C007A4EC1 /* Info.plist */; };
 		CC839AB91B433F7C007A4EC1 /* OtestShimTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC839AB71B433F7C007A4EC1 /* OtestShimTests.m */; };
 		CC839ABC1B434074007A4EC1 /* otest-shim.m in Sources */ = {isa = PBXBuildFile; fileRef = 283CCA9916C2EE4C00F2E343 /* otest-shim.m */; };
 		CC839ABD1B4344BF007A4EC1 /* otest-shim-osx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 282BFE19171602C60022F9FF /* otest-shim-osx.dylib */; };
@@ -372,7 +371,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CC839AB81B433F7C007A4EC1 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/scripts/make_release.sh b/scripts/make_release.sh
@@ -44,11 +44,6 @@ fi
   -workspace "$XCTOOL_DIR"/xctool.xcworkspace \
   -scheme xctool \
   -configuration Release \
-  -IDEBuildLocationStyle=Custom \
-  -IDECustomBuildLocationType=Absolute \
-  -IDECustomBuildProductsPath="$BUILD_OUTPUT_DIR/Products" \
-  -IDECustomBuildIntermediatesPath="$BUILD_OUTPUT_DIR/Intermediates" \
-  XT_INSTALL_ROOT="$RELEASE_OUTPUT_DIR" \
   test
 
 XCTOOL_VERSION=$("$RELEASE_OUTPUT_DIR"/bin/xctool -version)

diff --git a/xctool/xctool/XCTool.h b/xctool/xctool/XCTool.h
@@ -26,8 +26,8 @@ typedef NS_ENUM(NSInteger, XCToolExitStatus) {
   XCToolReporterInitializationFailed = 6,
   XCToolXcodeInfoValidationFailed = 7,
 
-  XCToolHelpShown = 100,
-  XCToolVersionShown = 101,
+  XCToolHelpShown = 0,
+  XCToolVersionShown = 0,
 };
 
 @interface XCTool : NSObject