Skip to content

Commit b2c342f

Browse files
scallananscallanan
committed
Build repl_swift with a script, so building it can be disabled
1 parent 10cfd1d commit b2c342f

File tree

2 files changed

+40
-75
lines changed

2 files changed

+40
-75
lines changed

‎lldb.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
buildConfigurationList = 26CEF3B214FD592B007286B2 /* Build configuration list for PBXAggregateTarget "desktop" */;
2727
buildPhases = (
2828
AF90106415AB7D2900FF120D /* Copy Files */,
29-
AF63C3A51A9FCFCF00D6A6B5 /* Copy Files */,
29+
49ACF8361E3AF8A900FAF7FC /* Copy repl_swift */,
3030
);
3131
dependencies = (
3232
26CEF3BB14FD595B007286B2 /* PBXTargetDependency */,
@@ -241,7 +241,6 @@
241241
263C4938178B50C40070F12D /* SBModuleSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263C4937178B50C40070F12D /* SBModuleSpec.cpp */; };
242242
263C493A178B50CF0070F12D /* SBModuleSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 263C4939178B50CF0070F12D /* SBModuleSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
243243
263E949F13661AEA00E7D1CE /* UnwindAssembly-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263E949D13661AE400E7D1CE /* UnwindAssembly-x86.cpp */; };
244-
263F921F1B4DFEEE001244A6 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; };
245244
263FDE601A79A01500E68013 /* FormatEntity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263FDE5F1A79A01500E68013 /* FormatEntity.cpp */; };
246245
2640E19F15DC78FD00F23B50 /* Property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2640E19E15DC78FD00F23B50 /* Property.cpp */; };
247246
264297571D1DF247003F2BF4 /* SBMemoryRegionInfoList.h in Headers */ = {isa = PBXBuildFile; fileRef = 264297541D1DF209003F2BF4 /* SBMemoryRegionInfoList.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -270,10 +269,6 @@
270269
265205A813D3E3F700132FE2 /* RegisterContextKDP_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 265205A213D3E3F700132FE2 /* RegisterContextKDP_arm.cpp */; };
271270
265205AA13D3E3F700132FE2 /* RegisterContextKDP_i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 265205A413D3E3F700132FE2 /* RegisterContextKDP_i386.cpp */; };
272271
265205AC13D3E3F700132FE2 /* RegisterContextKDP_x86_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 265205A613D3E3F700132FE2 /* RegisterContextKDP_x86_64.cpp */; };
273-
2656BBC31AE0739C00441749 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32A10F3DFDD009D5894 /* libedit.dylib */; };
274-
2656BBC41AE073A800441749 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
275-
2656BBC51AE073AD00441749 /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
276-
2656BBC61AE073B500441749 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
277272
2657AFB71B86910100958979 /* CompilerDeclContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2657AFB61B86910100958979 /* CompilerDeclContext.cpp */; };
278273
2660AAB914622483003A9694 /* LLDBWrapPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */; settings = {COMPILER_FLAGS = "-Dregister="; }; };
279274
26651A18133BF9E0005B64B7 /* Opcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26651A17133BF9DF005B64B7 /* Opcode.cpp */; };
@@ -796,7 +791,6 @@
796791
49DEF1251CD7C6DF006A7C7D /* BlockPointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DEF11F1CD7BD90006A7C7D /* BlockPointer.cpp */; };
797792
49E431651BB5ED070085B52D /* ClangModulesDeclVendor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4959511E1A1BC4BC00F6F8FC /* ClangModulesDeclVendor.cpp */; };
798793
49E4F66B1C9CAD16008487EA /* DiagnosticManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49E4F6681C9CAD12008487EA /* DiagnosticManager.cpp */; };
799-
49FA9B44192282A100EE381B /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9438E18B19217ABA00AE7A2A /* main.swift */; };
800794
4C0083401B9F9BA900D5CF24 /* UtilityFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C00833F1B9F9BA900D5CF24 /* UtilityFunction.cpp */; };
801795
4C2479BD1BA39295009C9A7B /* FunctionCaller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0083321B9A5DE200D5CF24 /* FunctionCaller.cpp */; };
802796
4C3ADCD61810D88B00357218 /* BreakpointResolverFileRegex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CAA56141422D986001FFA01 /* BreakpointResolverFileRegex.cpp */; };
@@ -875,7 +869,6 @@
875869
942612F71B95000000EF842E /* LanguageCategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 942612F61B95000000EF842E /* LanguageCategory.cpp */; };
876870
942612F81B952C9B00EF842E /* ObjCLanguage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94B6385E1B8FB7A2004FE1E4 /* ObjCLanguage.cpp */; };
877871
942829561A89614C00521B30 /* JSON.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 942829551A89614C00521B30 /* JSON.cpp */; };
878-
942829CC1A89839300521B30 /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
879872
9428BC2C1C6E64E4002A24D7 /* LibCxxAtomic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9428BC291C6E64DC002A24D7 /* LibCxxAtomic.cpp */; };
880873
942B8F781AC48287008C2EEF /* RegisterContextFreeBSD_arm64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 942B8F761AC48282008C2EEF /* RegisterContextFreeBSD_arm64.cpp */; };
881874
942B8F7B1AC482E9008C2EEF /* RegisterContextPOSIX_arm64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 942B8F791AC482E5008C2EEF /* RegisterContextPOSIX_arm64.cpp */; };
@@ -1036,7 +1029,6 @@
10361029
AF46AE6A19A708EC008BD829 /* AppleObjCClassDescriptorV2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF46AE6819A708EC008BD829 /* AppleObjCClassDescriptorV2.cpp */; };
10371030
AF62AAE61BEC2DE100A829B2 /* PlatformAppleTVSimulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF62AAE51BEC2DE100A829B2 /* PlatformAppleTVSimulator.cpp */; };
10381031
AF6335E31C87B21E00F7D554 /* SymbolFilePDB.h in Headers */ = {isa = PBXBuildFile; fileRef = AF6335E11C87B21E00F7D554 /* SymbolFilePDB.h */; };
1039-
AF63C3A61A9FCFDD00D6A6B5 /* repl_swift in Copy Files */ = {isa = PBXBuildFile; fileRef = 26F8EA1718F6096400EFD6B1 /* repl_swift */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
10401032
AF77E08F1A033C700096C0EA /* ABISysV_ppc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF77E08D1A033C700096C0EA /* ABISysV_ppc.cpp */; };
10411033
AF77E0931A033C7F0096C0EA /* ABISysV_ppc64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF77E0911A033C7F0096C0EA /* ABISysV_ppc64.cpp */; };
10421034
AF77E0A11A033D360096C0EA /* RegisterContextFreeBSD_powerpc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF77E09A1A033D360096C0EA /* RegisterContextFreeBSD_powerpc.cpp */; };
@@ -1334,17 +1326,6 @@
13341326
);
13351327
runOnlyForDeploymentPostprocessing = 0;
13361328
};
1337-
AF63C3A51A9FCFCF00D6A6B5 /* Copy Files */ = {
1338-
isa = PBXCopyFilesBuildPhase;
1339-
buildActionMask = 12;
1340-
dstPath = LLDB.framework/Resources;
1341-
dstSubfolderSpec = 16;
1342-
files = (
1343-
AF63C3A61A9FCFDD00D6A6B5 /* repl_swift in Copy Files */,
1344-
);
1345-
name = "Copy Files";
1346-
runOnlyForDeploymentPostprocessing = 0;
1347-
};
13481329
AF90106415AB7D2900FF120D /* Copy Files */ = {
13491330
isa = PBXCopyFilesBuildPhase;
13501331
buildActionMask = 8;
@@ -1568,7 +1549,6 @@
15681549
257E47161AA56C2000A62F81 /* ModuleCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModuleCache.h; path = source/Utility/ModuleCache.h; sourceTree = "<group>"; };
15691550
25EF23751AC09AD800908DF0 /* AdbClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdbClient.cpp; sourceTree = "<group>"; };
15701551
25EF23761AC09AD800908DF0 /* AdbClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdbClient.h; sourceTree = "<group>"; };
1571-
260157C41885F4FF00F875CF /* libpanel.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpanel.dylib; path = /usr/lib/libpanel.dylib; sourceTree = "<absolute>"; };
15721552
260223E7115F06D500A601A2 /* SBCommunication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBCommunication.h; path = include/lldb/API/SBCommunication.h; sourceTree = "<group>"; };
15731553
260223E8115F06E500A601A2 /* SBCommunication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBCommunication.cpp; path = source/API/SBCommunication.cpp; sourceTree = "<group>"; };
15741554
26022531115F27FA00A601A2 /* SBFileSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBFileSpec.h; path = include/lldb/API/SBFileSpec.h; sourceTree = "<group>"; };
@@ -3380,19 +3360,6 @@
33803360
);
33813361
runOnlyForDeploymentPostprocessing = 0;
33823362
};
3383-
26F8EA1418F6096400EFD6B1 /* Frameworks */ = {
3384-
isa = PBXFrameworksBuildPhase;
3385-
buildActionMask = 2147483647;
3386-
files = (
3387-
2656BBC31AE0739C00441749 /* libedit.dylib in Frameworks */,
3388-
2656BBC61AE073B500441749 /* libz.dylib in Frameworks */,
3389-
2656BBC51AE073AD00441749 /* libpanel.dylib in Frameworks */,
3390-
263F921F1B4DFEEE001244A6 /* CoreFoundation.framework in Frameworks */,
3391-
2656BBC41AE073A800441749 /* libncurses.dylib in Frameworks */,
3392-
942829CC1A89839300521B30 /* liblldb-core.a in Frameworks */,
3393-
);
3394-
runOnlyForDeploymentPostprocessing = 0;
3395-
};
33963363
94A9285E1A92B81600771D51 /* Frameworks */ = {
33973364
isa = PBXFrameworksBuildPhase;
33983365
buildActionMask = 2147483647;
@@ -7049,8 +7016,6 @@
70497016
isa = PBXNativeTarget;
70507017
buildConfigurationList = 26F8EA2118F6096500EFD6B1 /* Build configuration list for PBXNativeTarget "repl_swift" */;
70517018
buildPhases = (
7052-
26F8EA1318F6096400EFD6B1 /* Sources */,
7053-
26F8EA1418F6096400EFD6B1 /* Frameworks */,
70547019
26B60735191A961000523C8D /* Compile REPL */,
70557020
);
70567021
buildRules = (
@@ -7340,6 +7305,20 @@
73407305
shellPath = /bin/sh;
73417306
shellScript = "if [ \"${CONFIGURATION}\" != BuildAndIntegration ]\nthen\n if [ -n \"${DEBUGSERVER_DELETE_AFTER_BUILD}\" ]\n then\n rm -f \"${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources/debugserver\"\n fi\nfi\n";
73427307
};
7308+
49ACF8361E3AF8A900FAF7FC /* Copy repl_swift */ = {
7309+
isa = PBXShellScriptBuildPhase;
7310+
buildActionMask = 2147483647;
7311+
files = (
7312+
);
7313+
inputPaths = (
7314+
);
7315+
name = "Copy repl_swift";
7316+
outputPaths = (
7317+
);
7318+
runOnlyForDeploymentPostprocessing = 0;
7319+
shellPath = /bin/sh;
7320+
shellScript = "if [ -e \"${BUILT_PRODUCTS_DIR}/repl_swift\" ]\nthen\n cp \"${BUILT_PRODUCTS_DIR}/repl_swift\" \"${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources\"\nfi";
7321+
};
73437322
49DD45051B4EDB4A00DB3579 /* Install Swift compiler resources */ = {
73447323
isa = PBXShellScriptBuildPhase;
73457324
buildActionMask = 2147483647;
@@ -8333,14 +8312,6 @@
83338312
);
83348313
runOnlyForDeploymentPostprocessing = 0;
83358314
};
8336-
26F8EA1318F6096400EFD6B1 /* Sources */ = {
8337-
isa = PBXSourcesBuildPhase;
8338-
buildActionMask = 2147483647;
8339-
files = (
8340-
49FA9B44192282A100EE381B /* main.swift in Sources */,
8341-
);
8342-
runOnlyForDeploymentPostprocessing = 0;
8343-
};
83448315
94A9285D1A92B81600771D51 /* Sources */ = {
83458316
isa = PBXSourcesBuildPhase;
83468317
buildActionMask = 2147483647;
@@ -12225,13 +12196,9 @@
1222512196
);
1222612197
GCC_DYNAMIC_NO_PIC = NO;
1222712198
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
12228-
GCC_PREPROCESSOR_DEFINITIONS = (
12229-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12230-
);
12231-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = (
12232-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12233-
);
1223412199
GCC_OPTIMIZATION_LEVEL = 0;
12200+
GCC_PREPROCESSOR_DEFINITIONS = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
12201+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
1223512202
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
1223612203
INFOPLIST_FILE = "tools/driver/lldb-Info.plist";
1223712204
INSTALL_PATH = "$(LLDB_TOOLS_INSTALL_DIR)";
@@ -12267,13 +12234,9 @@
1226712234
);
1226812235
FRAMEWORK_VERSION = A;
1226912236
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
12270-
GCC_PREPROCESSOR_DEFINITIONS = (
12271-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12272-
);
12273-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = (
12274-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12275-
);
1227612237
GCC_OPTIMIZATION_LEVEL = 0;
12238+
GCC_PREPROCESSOR_DEFINITIONS = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
12239+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
1227712240
HEADER_SEARCH_PATHS = "";
1227812241
INFOPLIST_FILE = "resources/LLDB-Info.plist";
1227912242
INSTALL_PATH = "$(LLDB_FRAMEWORK_INSTALL_DIR)";
@@ -12364,12 +12327,8 @@
1236412327
"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
1236512328
);
1236612329
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
12367-
GCC_PREPROCESSOR_DEFINITIONS = (
12368-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12369-
);
12370-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = (
12371-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
12372-
);
12330+
GCC_PREPROCESSOR_DEFINITIONS = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
12331+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
1237312332
HEADER_SEARCH_PATHS = /usr/include/libxml2;
1237412333
MACH_O_TYPE = staticlib;
1237512334
OTHER_CFLAGS = (
@@ -13904,12 +13863,8 @@
1390413863
"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
1390513864
);
1390613865
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
13907-
GCC_PREPROCESSOR_DEFINITIONS = (
13908-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
13909-
);
13910-
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = (
13911-
"LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}",
13912-
);
13866+
GCC_PREPROCESSOR_DEFINITIONS = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
13867+
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = "LLDB_VERSION_STRING=lldb-${CURRENT_PROJECT_VERSION}";
1391313868
HEADER_SEARCH_PATHS = /usr/include/libxml2;
1391413869
MACH_O_TYPE = staticlib;
1391513870
OTHER_CFLAGS = (

‎scripts/Xcode/build-swift-repl.py‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,20 @@ def module_cache_path():
6363
return os.path.join(lldb_build_path(), "repl_swift_module_cache")
6464

6565

66+
def inhibit_repl():
67+
return False
68+
6669
def swiftc_path():
67-
return os.path.join(
68-
lldbbuild.expected_package_build_path_for("swift"),
69-
"bin",
70-
"swiftc")
70+
ret = ""
71+
if os.environ.get("CONFIGURATION") == "BuildAndIntegration":
72+
ret = os.path.join(os.environ.get("TOOLCHAIN_DIR"), "usr", "bin", "swiftc")
73+
else:
74+
ret = os.path.join(
75+
lldbbuild.expected_package_build_path_for("swift"),
76+
"bin",
77+
"swiftc")
78+
print "swiftc is at " + ret
79+
return ret
7180

7281

7382
def swift_target():
@@ -126,8 +135,9 @@ def strip_args_for_repl():
126135

127136
# Core logic
128137

129-
check_args()
130-
lldbbuild.run_in_directory(swiftc_args_for_repl(), lldb_build_path())
131-
lldbbuild.run_in_directory(strip_args_for_repl(), lldb_build_path())
138+
if not inhibit_repl():
139+
check_args()
140+
lldbbuild.run_in_directory(swiftc_args_for_repl(), lldb_build_path())
141+
lldbbuild.run_in_directory(strip_args_for_repl(), lldb_build_path())
132142

133143
sys.exit(0)

0 commit comments

Comments
 (0)