Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 426e7a5

Browse files
livecodesebastienlivecodesebastien
committed
[[ ExternalsV6 ]] LCIDLC project updated to use foundation; call to perfect.osx dropped
1 parent 8cb2e0c commit 426e7a5

File tree

18 files changed

+1293
-46
lines changed

18 files changed

+1293
-46
lines changed

‎lcidlc/lcidlc.xcodeproj/project.pbxproj‎

Lines changed: 69 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
4D12FFC817A3EF0F0004F700 /* Coder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D12FFC717A3EF0F0004F700 /* Coder.cpp */; };
11-
4D332C41178D7959005DFE92 /* EncodedJavaSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D332C3F178D7959005DFE92 /* EncodedJavaSupport.c */; };
12-
4D332C42178D7959005DFE92 /* EncodedSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D332C40178D7959005DFE92 /* EncodedSupport.c */; };
1311
4D4051A3176B2D340097F2D6 /* NativeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D4051A1176B2D340097F2D6 /* NativeType.cpp */; };
1412
4D9036A31398FC0800CBC7F6 /* Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9036911398FC0800CBC7F6 /* Error.cpp */; };
1513
4D9036A41398FC0800CBC7F6 /* Interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9036931398FC0800CBC7F6 /* Interface.cpp */; };
@@ -20,25 +18,35 @@
2018
4D9036A91398FC0800CBC7F6 /* Scanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D90369D1398FC0800CBC7F6 /* Scanner.cpp */; };
2119
4D9036AA1398FC0800CBC7F6 /* Support.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D90369F1398FC0800CBC7F6 /* Support.mm */; };
2220
4D9036AB1398FC0800CBC7F6 /* Value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9036A01398FC0800CBC7F6 /* Value.cpp */; };
23-
4D99EA3D1363A92A0056938B /* libcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D99EA3C1363A9220056938B /* libcore.a */; };
2421
4D99EA5B1363AA530056938B /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D99EA5A1363AA530056938B /* CoreFoundation.framework */; };
2522
4DBA0E7E136799A3006EEA7D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBA0E7D136799A3006EEA7D /* Foundation.framework */; };
23+
BE17FEF919641315001CD184 /* EncodedJavaSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D332C3F178D7959005DFE92 /* EncodedJavaSupport.c */; };
24+
BE17FEFA19641315001CD184 /* EncodedSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D332C40178D7959005DFE92 /* EncodedSupport.c */; };
25+
BEDA8F381963210700479FA2 /* CString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEDA8F361963210700479FA2 /* CString.cpp */; };
26+
BEDA8F391963233400479FA2 /* libfoundation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F2819631D7800479FA2 /* libfoundation.a */; };
27+
BEDA8F41196323B800479FA2 /* libicudata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3A196323B800479FA2 /* libicudata.a */; };
28+
BEDA8F42196323B800479FA2 /* libicui18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3B196323B800479FA2 /* libicui18n.a */; };
29+
BEDA8F43196323B800479FA2 /* libicuio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3C196323B800479FA2 /* libicuio.a */; };
30+
BEDA8F44196323B800479FA2 /* libicule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3D196323B800479FA2 /* libicule.a */; };
31+
BEDA8F45196323B800479FA2 /* libiculx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3E196323B800479FA2 /* libiculx.a */; };
32+
BEDA8F46196323B800479FA2 /* libicutu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F3F196323B800479FA2 /* libicutu.a */; };
33+
BEDA8F47196323B800479FA2 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDA8F40196323B800479FA2 /* libicuuc.a */; };
2634
/* End PBXBuildFile section */
2735

2836
/* Begin PBXContainerItemProxy section */
29-
4D6B214915CFEAB900BAEBCE /* PBXContainerItemProxy */ = {
37+
BE17FF06196415C5001CD184 /* PBXContainerItemProxy */ = {
3038
isa = PBXContainerItemProxy;
31-
containerPortal = 4D99EA371363A9220056938B /* libcore.xcodeproj */;
39+
containerPortal = BEDA8F2319631D7700479FA2 /* libfoundation.xcodeproj */;
3240
proxyType = 1;
3341
remoteGlobalIDString = 4DF42A420B048617003F2D95;
34-
remoteInfo = core;
42+
remoteInfo = foundation;
3543
};
36-
4D99EA3B1363A9220056938B /* PBXContainerItemProxy */ = {
44+
BEDA8F2719631D7800479FA2 /* PBXContainerItemProxy */ = {
3745
isa = PBXContainerItemProxy;
38-
containerPortal = 4D99EA371363A9220056938B /* libcore.xcodeproj */;
46+
containerPortal = BEDA8F2319631D7700479FA2 /* libfoundation.xcodeproj */;
3947
proxyType = 2;
4048
remoteGlobalIDString = 4DF42A430B048617003F2D95;
41-
remoteInfo = core;
49+
remoteInfo = foundation;
4250
};
4351
/* End PBXContainerItemProxy section */
4452

@@ -69,22 +77,38 @@
6977
4D9036A01398FC0800CBC7F6 /* Value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Value.cpp; path = src/Value.cpp; sourceTree = "<group>"; };
7078
4D9036A11398FC0800CBC7F6 /* Value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Value.h; path = src/Value.h; sourceTree = "<group>"; };
7179
4D99EA321363A8E20056938B /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = ../rules/Debug.xcconfig; sourceTree = SOURCE_ROOT; };
72-
4D99EA371363A9220056938B /* libcore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libcore.xcodeproj; path = ../libcore/libcore.xcodeproj; sourceTree = SOURCE_ROOT; };
7380
4D99EA5A1363AA530056938B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
7481
4D99EEB5136496970056938B /* interface_error_test.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = interface_error_test.txt; sourceTree = "<group>"; };
7582
4DBA0CE813675585006EEA7D /* coverage_test.lcidl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coverage_test.lcidl; sourceTree = "<group>"; };
7683
4DBA0E7D136799A3006EEA7D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
7784
4DE553EC13A4D9E200C99D11 /* lclink.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = lclink.sh; sourceTree = "<group>"; };
7885
4DE553ED13A4D9E200C99D11 /* lclinktest.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = lclinktest.sh; sourceTree = "<group>"; };
7986
4DED6D131760ECD5001DEF0C /* Support.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = Support.java; path = src/Support.java; sourceTree = "<group>"; };
87+
BEDA8F2319631D7700479FA2 /* libfoundation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libfoundation.xcodeproj; path = ../libfoundation/libfoundation.xcodeproj; sourceTree = "<group>"; };
88+
BEDA8F361963210700479FA2 /* CString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CString.cpp; path = src/CString.cpp; sourceTree = "<group>"; };
89+
BEDA8F371963210700479FA2 /* CString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CString.h; path = src/CString.h; sourceTree = "<group>"; };
90+
BEDA8F3A196323B800479FA2 /* libicudata.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicudata.a; path = ../prebuilt/lib/mac/libicudata.a; sourceTree = "<group>"; };
91+
BEDA8F3B196323B800479FA2 /* libicui18n.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicui18n.a; path = ../prebuilt/lib/mac/libicui18n.a; sourceTree = "<group>"; };
92+
BEDA8F3C196323B800479FA2 /* libicuio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicuio.a; path = ../prebuilt/lib/mac/libicuio.a; sourceTree = "<group>"; };
93+
BEDA8F3D196323B800479FA2 /* libicule.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicule.a; path = ../prebuilt/lib/mac/libicule.a; sourceTree = "<group>"; };
94+
BEDA8F3E196323B800479FA2 /* libiculx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiculx.a; path = ../prebuilt/lib/mac/libiculx.a; sourceTree = "<group>"; };
95+
BEDA8F3F196323B800479FA2 /* libicutu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicutu.a; path = ../prebuilt/lib/mac/libicutu.a; sourceTree = "<group>"; };
96+
BEDA8F40196323B800479FA2 /* libicuuc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicuuc.a; path = ../prebuilt/lib/mac/libicuuc.a; sourceTree = "<group>"; };
8097
/* End PBXFileReference section */
8198

8299
/* Begin PBXFrameworksBuildPhase section */
83100
4D57DF441338F14B0044FFEC /* Frameworks */ = {
84101
isa = PBXFrameworksBuildPhase;
85102
buildActionMask = 2147483647;
86103
files = (
87-
4D99EA3D1363A92A0056938B /* libcore.a in Frameworks */,
104+
BEDA8F41196323B800479FA2 /* libicudata.a in Frameworks */,
105+
BEDA8F42196323B800479FA2 /* libicui18n.a in Frameworks */,
106+
BEDA8F43196323B800479FA2 /* libicuio.a in Frameworks */,
107+
BEDA8F44196323B800479FA2 /* libicule.a in Frameworks */,
108+
BEDA8F45196323B800479FA2 /* libiculx.a in Frameworks */,
109+
BEDA8F46196323B800479FA2 /* libicutu.a in Frameworks */,
110+
BEDA8F47196323B800479FA2 /* libicuuc.a in Frameworks */,
111+
BEDA8F391963233400479FA2 /* libfoundation.a in Frameworks */,
88112
4D99EA5B1363AA530056938B /* CoreFoundation.framework in Frameworks */,
89113
4DBA0E7E136799A3006EEA7D /* Foundation.framework in Frameworks */,
90114
);
@@ -104,6 +128,13 @@
104128
4D57DF281338F1280044FFEC = {
105129
isa = PBXGroup;
106130
children = (
131+
BEDA8F3A196323B800479FA2 /* libicudata.a */,
132+
BEDA8F3B196323B800479FA2 /* libicui18n.a */,
133+
BEDA8F3C196323B800479FA2 /* libicuio.a */,
134+
BEDA8F3D196323B800479FA2 /* libicule.a */,
135+
BEDA8F3E196323B800479FA2 /* libiculx.a */,
136+
BEDA8F3F196323B800479FA2 /* libicutu.a */,
137+
BEDA8F40196323B800479FA2 /* libicuuc.a */,
107138
4D99EA331363A9050056938B /* References */,
108139
4D99EA311363A8C90056938B /* Configurations */,
109140
4D57DF471338F14B0044FFEC /* Products */,
@@ -130,6 +161,8 @@
130161
4D9036AD1398FC0C00CBC7F6 /* Sources */ = {
131162
isa = PBXGroup;
132163
children = (
164+
BEDA8F361963210700479FA2 /* CString.cpp */,
165+
BEDA8F371963210700479FA2 /* CString.h */,
133166
4D4051A1176B2D340097F2D6 /* NativeType.cpp */,
134167
4D4051A2176B2D340097F2D6 /* NativeType.h */,
135168
4D9036911398FC0800CBC7F6 /* Error.cpp */,
@@ -176,15 +209,15 @@
176209
4D99EA331363A9050056938B /* References */ = {
177210
isa = PBXGroup;
178211
children = (
179-
4D99EA371363A9220056938B /* libcore.xcodeproj */,
212+
BEDA8F2319631D7700479FA2 /* libfoundation.xcodeproj */,
180213
);
181214
name = References;
182215
sourceTree = "<group>";
183216
};
184-
4D99EA381363A9220056938B /* Products */ = {
217+
BEDA8F2419631D7700479FA2 /* Products */ = {
185218
isa = PBXGroup;
186219
children = (
187-
4D99EA3C1363A9220056938B /* libcore.a */,
220+
BEDA8F2819631D7800479FA2 /* libfoundation.a */,
188221
);
189222
name = Products;
190223
sourceTree = "<group>";
@@ -204,7 +237,7 @@
204237
buildRules = (
205238
);
206239
dependencies = (
207-
4D6B214A15CFEAB900BAEBCE /* PBXTargetDependency */,
240+
BE17FF07196415C5001CD184 /* PBXTargetDependency */,
208241
);
209242
name = lcidlc;
210243
productName = lcidlc;
@@ -234,8 +267,8 @@
234267
projectDirPath = "";
235268
projectReferences = (
236269
{
237-
ProductGroup = 4D99EA381363A9220056938B /* Products */;
238-
ProjectRef = 4D99EA371363A9220056938B /* libcore.xcodeproj */;
270+
ProductGroup = BEDA8F2419631D7700479FA2 /* Products */;
271+
ProjectRef = BEDA8F2319631D7700479FA2 /* libfoundation.xcodeproj */;
239272
},
240273
);
241274
projectRoot = "";
@@ -246,11 +279,11 @@
246279
/* End PBXProject section */
247280

248281
/* Begin PBXReferenceProxy section */
249-
4D99EA3C1363A9220056938B /* libcore.a */ = {
282+
BEDA8F2819631D7800479FA2 /* libfoundation.a */ = {
250283
isa = PBXReferenceProxy;
251284
fileType = archive.ar;
252-
path = libcore.a;
253-
remoteRef = 4D99EA3B1363A9220056938B /* PBXContainerItemProxy */;
285+
path = libfoundation.a;
286+
remoteRef = BEDA8F2719631D7800479FA2 /* PBXContainerItemProxy */;
254287
sourceTree = BUILT_PRODUCTS_DIR;
255288
};
256289
/* End PBXReferenceProxy section */
@@ -270,7 +303,7 @@
270303
);
271304
runOnlyForDeploymentPostprocessing = 0;
272305
shellPath = /bin/sh;
273-
shellScript = "\"$SOLUTION_DIR/prebuilt/bin/Revolution.osx\" \"$SRCROOT/encode_source.rev\" \"$SRCROOT/src/Support.java\" \"$SRCROOT/src/EncodedJavaSupport.c\" \"g_java_support_template\"\n";
306+
shellScript = "#\"$SOLUTION_DIR/prebuilt/bin/Revolution.osx\" \"$SRCROOT/encode_source.rev\" \"$SRCROOT/src/Support.java\" \"$SRCROOT/src/EncodedJavaSupport.c\" \"g_java_support_template\"\n\"$SOLUTION_DIR/util/encode_source.pl\" \"$SRCROOT/src/Support.java\" \"$SRCROOT/src/EncodedJavaSupport.c\" \"g_java_support_template\"\n";
274307
showEnvVarsInLog = 0;
275308
};
276309
4DBA0EB113679A08006EEA7D /* Encode Support */ = {
@@ -287,7 +320,7 @@
287320
);
288321
runOnlyForDeploymentPostprocessing = 0;
289322
shellPath = /bin/sh;
290-
shellScript = "\"$SOLUTION_DIR/prebuilt/bin/Revolution.osx\" \"$SRCROOT/encode_source.rev\" \"$SRCROOT/src/Support.mm\" \"$SRCROOT/src/EncodedSupport.c\" \"g_support_template\"\n";
323+
shellScript = "#\"$SOLUTION_DIR/prebuilt/bin/Revolution.osx\" \"$SRCROOT/encode_source.rev\" \"$SRCROOT/src/Support.mm\" \"$SRCROOT/src/EncodedSupport.c\" \"g_support_template\"\n\"$SOLUTION_DIR/util/encode_source.pl\" \"$SRCROOT/src/Support.mm\" \"$SRCROOT/src/EncodedSupport.c\" \"g_support_template\"\n";
291324
showEnvVarsInLog = 0;
292325
};
293326
/* End PBXShellScriptBuildPhase section */
@@ -297,6 +330,8 @@
297330
isa = PBXSourcesBuildPhase;
298331
buildActionMask = 2147483647;
299332
files = (
333+
BE17FEF919641315001CD184 /* EncodedJavaSupport.c in Sources */,
334+
BE17FEFA19641315001CD184 /* EncodedSupport.c in Sources */,
300335
4D9036A31398FC0800CBC7F6 /* Error.cpp in Sources */,
301336
4D9036A41398FC0800CBC7F6 /* Interface.cpp in Sources */,
302337
4D9036A51398FC0800CBC7F6 /* InterfaceGenerate.cpp in Sources */,
@@ -307,19 +342,18 @@
307342
4D9036AA1398FC0800CBC7F6 /* Support.mm in Sources */,
308343
4D9036AB1398FC0800CBC7F6 /* Value.cpp in Sources */,
309344
4D4051A3176B2D340097F2D6 /* NativeType.cpp in Sources */,
310-
4D332C41178D7959005DFE92 /* EncodedJavaSupport.c in Sources */,
311-
4D332C42178D7959005DFE92 /* EncodedSupport.c in Sources */,
312345
4D12FFC817A3EF0F0004F700 /* Coder.cpp in Sources */,
346+
BEDA8F381963210700479FA2 /* CString.cpp in Sources */,
313347
);
314348
runOnlyForDeploymentPostprocessing = 0;
315349
};
316350
/* End PBXSourcesBuildPhase section */
317351

318352
/* Begin PBXTargetDependency section */
319-
4D6B214A15CFEAB900BAEBCE /* PBXTargetDependency */ = {
353+
BE17FF07196415C5001CD184 /* PBXTargetDependency */ = {
320354
isa = PBXTargetDependency;
321-
name = core;
322-
targetProxy = 4D6B214915CFEAB900BAEBCE /* PBXContainerItemProxy */;
355+
name = foundation;
356+
targetProxy = BE17FF06196415C5001CD184 /* PBXContainerItemProxy */;
323357
};
324358
/* End PBXTargetDependency section */
325359

@@ -345,6 +379,10 @@
345379
buildSettings = {
346380
GCC_ENABLE_FIX_AND_CONTINUE = YES;
347381
GCC_VERSION = "";
382+
LIBRARY_SEARCH_PATHS = (
383+
"$(inherited)",
384+
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
385+
);
348386
MACOSX_DEPLOYMENT_TARGET = 10.6;
349387
PRODUCT_NAME = lcidlc;
350388
SDKROOT = macosx;
@@ -355,6 +393,10 @@
355393
isa = XCBuildConfiguration;
356394
buildSettings = {
357395
GCC_ENABLE_FIX_AND_CONTINUE = NO;
396+
LIBRARY_SEARCH_PATHS = (
397+
"$(inherited)",
398+
"\"$(SRCROOT)/../prebuilt/lib/mac\"",
399+
);
358400
MACOSX_DEPLOYMENT_TARGET = 10.6;
359401
PRODUCT_NAME = lcidlc;
360402
SDKROOT = macosx;

0 commit comments

Comments
 (0)