added fde option

twocanoes · Jul 24, 2022 · 2b022b4 · 2b022b4
1 parent 14d39e3
commit 2b022b4
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 51 deletions.
diff --git a/app_to_test.sh b/app_to_test.sh
@@ -3,10 +3,17 @@
 
 set -e
 set -x 
+a=123
+BUILD_DIR="/tmp/xcreds"
+DERIVED_DATA_DIR="${BUILD_DIR}/DerivedData"
 
-ssh -J tcadmin@simac.local root@test001.local rm -rf "/Applications/XCreds.app"
 
-scp -r -J tcadmin@simac.local "${BUILD_ROOT}"/Release/XCreds.app root@test001.local:/Applications/ 
+agvtool bump
+xcodebuild  -scheme "XCreds"  -configuration "Release" -derivedDataPath  "${DERIVED_DATA_DIR}"
+
+ssh -J tcadmin@simac.local root@test001.local 'bash -c "if [ -e "/Applications/XCreds.app" ] ; then echo removing; rm -rf "/Applications/XCreds.app"; fi"'
+
+scp -r -J tcadmin@simac.local "${DERIVED_DATA_DIR}"/Build/Products/Release/XCreds.app root@test001.local:/Applications/ 
 
 #ssh -J tcadmin@simac.local root@test001.local reboot || exit 0
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -131,13 +131,6 @@
 			remoteGlobalIDString = 7631935C287D22C700D36BF7;
 			remoteInfo = authrights;
 		};
-		766F4C502883B8AC0021F548 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 76EE069227FD1D00009E0F3A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 76EE069927FD1D00009E0F3A;
-			remoteInfo = XCreds;
-		};
 		76DC0A7A28837152007C42B2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 76EE069227FD1D00009E0F3A /* Project object */;
@@ -471,14 +464,13 @@
 /* Begin PBXLegacyTarget section */
 		766F4C4C2883B88F0021F548 /* Send To Test */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "${PROJECT_DIR}/app_to_test.sh";
+			buildArgumentsString = app_to_test.sh;
 			buildConfigurationList = 766F4C4D2883B88F0021F548 /* Build configuration list for PBXLegacyTarget "Send To Test" */;
 			buildPhases = (
 			);
 			buildToolPath = /bin/bash;
-			buildWorkingDirectory = "";
+			buildWorkingDirectory = /Users/tperfitt/Documents/Projects/xcreds;
 			dependencies = (
-				766F4C512883B8AC0021F548 /* PBXTargetDependency */,
 			);
 			name = "Send To Test";
 			passBuildSettingsInEnvironment = 1;
@@ -555,10 +547,10 @@
 			buildRules = (
 			);
 			dependencies = (
+				76DD6D14285997DA00A700ED /* PBXTargetDependency */,
 				76DC0A7B28837152007C42B2 /* PBXTargetDependency */,
-				76319379287E204500D36BF7 /* PBXTargetDependency */,
 				76319376287E19A500D36BF7 /* PBXTargetDependency */,
-				76DD6D14285997DA00A700ED /* PBXTargetDependency */,
+				76319379287E204500D36BF7 /* PBXTargetDependency */,
 			);
 			name = XCreds;
 			packageProductDependencies = (
@@ -792,11 +784,6 @@
 			target = 7631935C287D22C700D36BF7 /* authrights */;
 			targetProxy = 76319378287E204500D36BF7 /* PBXContainerItemProxy */;
 		};
-		766F4C512883B8AC0021F548 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 76EE069927FD1D00009E0F3A /* XCreds */;
-			targetProxy = 766F4C502883B8AC0021F548 /* PBXContainerItemProxy */;
-		};
 		76DC0A7B28837152007C42B2 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 76DC0A6428836EB1007C42B2 /* XCreds Login Overlay */;
@@ -860,7 +847,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -890,7 +877,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -948,7 +935,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -978,7 +965,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1121,7 +1108,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1150,7 +1137,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3095;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/xCreds.xcodeproj/xcshareddata/xcschemes/Send To Test.xcscheme b/xCreds.xcodeproj/xcshareddata/xcschemes/Send To Test.xcscheme
@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1340"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
-      parallelizeBuildables = "YES"
+      parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
-      <PreActions>
+      <PostActions>
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "cd &quot;${PROJECT_DIR}&quot;&#10;&#10;#/usr/bin/agvtool  bump&#10;"
-               shellToInvoke = "/bin/sh">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "766F4C4C2883B88F0021F548"
-                     BuildableName = "Send To Test"
-                     BlueprintName = "Send To Test"
-                     ReferencedContainer = "container:XCreds.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
+               scriptText = "touch /tmp/xcreds_done&#10;">
             </ActionContent>
          </ExecutionAction>
-      </PreActions>
+      </PostActions>
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "76EE069927FD1D00009E0F3A"
+               BuildableName = "XCreds.app"
+               BlueprintName = "XCreds"
+               ReferencedContainer = "container:XCreds.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -59,16 +63,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7631935C287D22C700D36BF7"
-            BuildableName = "authrights"
-            BlueprintName = "authrights"
-            ReferencedContainer = "container:XCreds.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/xCreds.xcodeproj/xcshareddata/xcschemes/XCreds.xcscheme b/xCreds.xcodeproj/xcshareddata/xcschemes/XCreds.xcscheme
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1340"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "&#10;#cd &quot;${PROJECT_DIR}&quot; ; agvtool bump&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "76EE069927FD1D00009E0F3A"
+                     BuildableName = "XCreds.app"
+                     BlueprintName = "XCreds"
+                     ReferencedContainer = "container:XCreds.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"