Skip to content

Commit 2ef9986

Browse files
authored
Frameworks path in local_addons fix (#343)
#changelog #filesystem
1 parent cfc564e commit 2ef9986

18 files changed

+2063
-2071
lines changed

commandLine/commandLine.xcodeproj/project.pbxproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@
235235
);
236236
runOnlyForDeploymentPostprocessing = 0;
237237
shellPath = /bin/sh;
238-
shellScript = "cp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\";\t\n";
239-
showEnvVarsInLog = 0;
238+
shellScript = "rm \"$TARGET_BUILD_DIR/projectGenerator\"\ncp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\";\t\n";
240239
};
241240
E42962A92163ECCD00A6A9E2 /* Run Script - Compile OF */ = {
242241
isa = PBXShellScriptBuildPhase;
@@ -320,7 +319,6 @@
320319
baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
321320
buildSettings = {
322321
COMBINE_HIDPI_IMAGES = YES;
323-
COPY_PHASE_STRIP = YES;
324322
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
325323
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
326324
GCC_MODEL_TUNING = NONE;

commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Debug.xcscheme

+22-11
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
30-
<Testables>
31-
</Testables>
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,17 +36,21 @@
3836
ReferencedContainer = "container:commandLine.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
39+
<Testables>
40+
</Testables>
4141
</TestAction>
4242
<LaunchAction
43+
buildConfiguration = "Debug"
4344
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4445
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4546
launchStyle = "0"
4647
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4848
ignoresPersistentStateOnLaunch = "NO"
49-
debugDocumentVersioning = "YES"
49+
debugDocumentVersioning = "NO"
50+
debugServiceExtension = "internal"
5051
allowLocationSimulation = "YES">
51-
<BuildableProductRunnable>
52+
<BuildableProductRunnable
53+
runnableDebuggingMode = "0">
5254
<BuildableReference
5355
BuildableIdentifier = "primary"
5456
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
@@ -57,16 +59,25 @@
5759
ReferencedContainer = "container:commandLine.xcodeproj">
5860
</BuildableReference>
5961
</BuildableProductRunnable>
60-
<AdditionalOptions>
61-
</AdditionalOptions>
62+
<CommandLineArguments>
63+
<CommandLineArgument
64+
argument = "-o&quot;/Volumes/tool/ofw&quot;"
65+
isEnabled = "YES">
66+
</CommandLineArgument>
67+
<CommandLineArgument
68+
argument = "/Volumes/tool/ofw/apps/WerkApps/TestSurface "
69+
isEnabled = "YES">
70+
</CommandLineArgument>
71+
</CommandLineArguments>
6272
</LaunchAction>
6373
<ProfileAction
74+
buildConfiguration = "Debug"
6475
shouldUseLaunchSchemeArgsEnv = "YES"
6576
savedToolIdentifier = ""
6677
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Debug"
6878
debugDocumentVersioning = "YES">
69-
<BuildableProductRunnable>
79+
<BuildableProductRunnable
80+
runnableDebuggingMode = "0">
7081
<BuildableReference
7182
BuildableIdentifier = "primary"
7283
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"

commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Release.xcscheme

+10
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,16 @@
5959
ReferencedContainer = "container:commandLine.xcodeproj">
6060
</BuildableReference>
6161
</BuildableProductRunnable>
62+
<CommandLineArguments>
63+
<CommandLineArgument
64+
argument = "-o&quot;/Volumes/tool/ofw&quot;"
65+
isEnabled = "YES">
66+
</CommandLineArgument>
67+
<CommandLineArgument
68+
argument = "/Volumes/tool/ofw/apps/WerkApps/TestSurface "
69+
isEnabled = "YES">
70+
</CommandLineArgument>
71+
</CommandLineArguments>
6272
</LaunchAction>
6373
<ProfileAction
6474
buildConfiguration = "Release"

0 commit comments

Comments
 (0)