Skip to content

Commit aaad189

Browse files
jpsimjpsim
authored
Merge pull request #1 from jpsim/jp-remove-cyaml
Only build CYaml when building with SwiftPM
2 parents a14ba01 + 90168b0 commit aaad189

File tree

4 files changed

+40
-239
lines changed

4 files changed

+40
-239
lines changed

‎Sources/CYaml/include/module.modulemap

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Sources/Yams/Yams.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !COCOAPODS
1+
#if SWIFT_PACKAGE
22
import CYaml
33
#endif
44
import Foundation

‎Yams.xcodeproj/project.pbxproj

Lines changed: 39 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,21 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
OBJ_36 /* api.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* api.c */; };
11-
OBJ_37 /* dumper.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* dumper.c */; };
12-
OBJ_38 /* emitter.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* emitter.c */; };
13-
OBJ_39 /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* loader.c */; };
14-
OBJ_40 /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* parser.c */; };
15-
OBJ_41 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* reader.c */; };
16-
OBJ_42 /* scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* scanner.c */; };
17-
OBJ_43 /* writer.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* writer.c */; };
10+
E8EDB8851DE2181B0062268D /* api.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* api.c */; };
11+
E8EDB8861DE2181B0062268D /* dumper.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* dumper.c */; };
12+
E8EDB8871DE2181B0062268D /* emitter.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* emitter.c */; };
13+
E8EDB8881DE2181B0062268D /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* loader.c */; };
14+
E8EDB8891DE2181B0062268D /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* parser.c */; };
15+
E8EDB88A1DE2181B0062268D /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* reader.c */; };
16+
E8EDB88B1DE2181B0062268D /* scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* scanner.c */; };
17+
E8EDB88C1DE2181B0062268D /* writer.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* writer.c */; };
18+
E8EDB88E1DE218420062268D /* yaml.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* yaml.h */; settings = {ATTRIBUTES = (Public, ); }; };
1819
OBJ_50 /* Yams.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_22 /* Yams.swift */; };
19-
OBJ_52 /* CYaml.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_27 /* CYaml.framework */; };
2020
OBJ_59 /* YamsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_25 /* YamsTests.swift */; };
21-
OBJ_61 /* CYaml.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_27 /* CYaml.framework */; };
2221
OBJ_62 /* Yams.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_28 /* Yams.framework */; };
2322
/* End PBXBuildFile section */
2423

2524
/* Begin PBXContainerItemProxy section */
26-
E8C81DA81DE0FE6600D40FD7 /* PBXContainerItemProxy */ = {
27-
isa = PBXContainerItemProxy;
28-
containerPortal = OBJ_1 /* Project object */;
29-
proxyType = 1;
30-
remoteGlobalIDString = OBJ_30;
31-
remoteInfo = CYaml;
32-
};
33-
E8C81DA91DE0FE6600D40FD7 /* PBXContainerItemProxy */ = {
34-
isa = PBXContainerItemProxy;
35-
containerPortal = OBJ_1 /* Project object */;
36-
proxyType = 1;
37-
remoteGlobalIDString = OBJ_30;
38-
remoteInfo = CYaml;
39-
};
4025
E8C81DAA1DE0FE6600D40FD7 /* PBXContainerItemProxy */ = {
4126
isa = PBXContainerItemProxy;
4227
containerPortal = OBJ_1 /* Project object */;
@@ -56,36 +41,25 @@
5641
OBJ_16 /* scanner.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scanner.c; sourceTree = "<group>"; };
5742
OBJ_17 /* writer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = writer.c; sourceTree = "<group>"; };
5843
OBJ_19 /* yaml.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = yaml.h; sourceTree = "<group>"; };
59-
OBJ_20 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
6044
OBJ_22 /* Yams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Yams.swift; sourceTree = "<group>"; };
6145
OBJ_25 /* YamsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YamsTests.swift; sourceTree = "<group>"; };
62-
OBJ_27 /* CYaml.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CYaml.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6346
OBJ_28 /* Yams.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Yams.framework; sourceTree = BUILT_PRODUCTS_DIR; };
64-
OBJ_29 /* YamsTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = YamsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
47+
OBJ_29 /* YamsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = YamsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6548
OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
6649
/* End PBXFileReference section */
6750

6851
/* Begin PBXFrameworksBuildPhase section */
69-
OBJ_44 /* Frameworks */ = {
70-
isa = PBXFrameworksBuildPhase;
71-
buildActionMask = 0;
72-
files = (
73-
);
74-
runOnlyForDeploymentPostprocessing = 0;
75-
};
7652
OBJ_51 /* Frameworks */ = {
7753
isa = PBXFrameworksBuildPhase;
7854
buildActionMask = 0;
7955
files = (
80-
OBJ_52 /* CYaml.framework in Frameworks */,
8156
);
8257
runOnlyForDeploymentPostprocessing = 0;
8358
};
8459
OBJ_60 /* Frameworks */ = {
8560
isa = PBXFrameworksBuildPhase;
8661
buildActionMask = 0;
8762
files = (
88-
OBJ_61 /* CYaml.framework in Frameworks */,
8963
OBJ_62 /* Yams.framework in Frameworks */,
9064
);
9165
runOnlyForDeploymentPostprocessing = 0;
@@ -97,7 +71,6 @@
9771
isa = PBXGroup;
9872
children = (
9973
OBJ_19 /* yaml.h */,
100-
OBJ_20 /* module.modulemap */,
10174
);
10275
path = include;
10376
sourceTree = "<group>";
@@ -131,7 +104,6 @@
131104
OBJ_26 /* Products */ = {
132105
isa = PBXGroup;
133106
children = (
134-
OBJ_27 /* CYaml.framework */,
135107
OBJ_28 /* Yams.framework */,
136108
OBJ_29 /* YamsTests.xctest */,
137109
);
@@ -184,35 +156,29 @@
184156
};
185157
/* End PBXGroup section */
186158

187-
/* Begin PBXNativeTarget section */
188-
OBJ_30 /* CYaml */ = {
189-
isa = PBXNativeTarget;
190-
buildConfigurationList = OBJ_31 /* Build configuration list for PBXNativeTarget "CYaml" */;
191-
buildPhases = (
192-
OBJ_34 /* ShellScript */,
193-
OBJ_35 /* Sources */,
194-
OBJ_44 /* Frameworks */,
195-
);
196-
buildRules = (
197-
);
198-
dependencies = (
159+
/* Begin PBXHeadersBuildPhase section */
160+
E8EDB88D1DE2183E0062268D /* Headers */ = {
161+
isa = PBXHeadersBuildPhase;
162+
buildActionMask = 2147483647;
163+
files = (
164+
E8EDB88E1DE218420062268D /* yaml.h in Headers */,
199165
);
200-
name = CYaml;
201-
productName = CYaml;
202-
productReference = OBJ_27 /* CYaml.framework */;
203-
productType = "com.apple.product-type.framework";
166+
runOnlyForDeploymentPostprocessing = 0;
204167
};
168+
/* End PBXHeadersBuildPhase section */
169+
170+
/* Begin PBXNativeTarget section */
205171
OBJ_45 /* Yams */ = {
206172
isa = PBXNativeTarget;
207173
buildConfigurationList = OBJ_46 /* Build configuration list for PBXNativeTarget "Yams" */;
208174
buildPhases = (
209175
OBJ_49 /* Sources */,
210176
OBJ_51 /* Frameworks */,
177+
E8EDB88D1DE2183E0062268D /* Headers */,
211178
);
212179
buildRules = (
213180
);
214181
dependencies = (
215-
OBJ_53 /* PBXTargetDependency */,
216182
);
217183
name = Yams;
218184
productName = Yams;
@@ -229,7 +195,6 @@
229195
buildRules = (
230196
);
231197
dependencies = (
232-
OBJ_63 /* PBXTargetDependency */,
233198
OBJ_64 /* PBXTargetDependency */,
234199
);
235200
name = YamsTests;
@@ -257,46 +222,26 @@
257222
projectDirPath = "";
258223
projectRoot = "";
259224
targets = (
260-
OBJ_30 /* CYaml */,
261225
OBJ_45 /* Yams */,
262226
OBJ_54 /* YamsTests */,
263227
);
264228
};
265229
/* End PBXProject section */
266230

267-
/* Begin PBXShellScriptBuildPhase section */
268-
OBJ_34 /* ShellScript */ = {
269-
isa = PBXShellScriptBuildPhase;
270-
buildActionMask = 0;
271-
files = (
272-
);
273-
runOnlyForDeploymentPostprocessing = 0;
274-
shellPath = /bin/sh;
275-
shellScript = "mkdir -p \"${PROJECT_TEMP_DIR}/SymlinkLibs\"\nln -sf \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" \"${PROJECT_TEMP_DIR}/SymlinkLibs/lib${EXECUTABLE_NAME}.dylib\"\n";
276-
};
277-
/* End PBXShellScriptBuildPhase section */
278-
279231
/* Begin PBXSourcesBuildPhase section */
280-
OBJ_35 /* Sources */ = {
281-
isa = PBXSourcesBuildPhase;
282-
buildActionMask = 0;
283-
files = (
284-
OBJ_36 /* api.c in Sources */,
285-
OBJ_37 /* dumper.c in Sources */,
286-
OBJ_38 /* emitter.c in Sources */,
287-
OBJ_39 /* loader.c in Sources */,
288-
OBJ_40 /* parser.c in Sources */,
289-
OBJ_41 /* reader.c in Sources */,
290-
OBJ_42 /* scanner.c in Sources */,
291-
OBJ_43 /* writer.c in Sources */,
292-
);
293-
runOnlyForDeploymentPostprocessing = 0;
294-
};
295232
OBJ_49 /* Sources */ = {
296233
isa = PBXSourcesBuildPhase;
297234
buildActionMask = 0;
298235
files = (
236+
E8EDB8871DE2181B0062268D /* emitter.c in Sources */,
237+
E8EDB8851DE2181B0062268D /* api.c in Sources */,
238+
E8EDB8861DE2181B0062268D /* dumper.c in Sources */,
239+
E8EDB8881DE2181B0062268D /* loader.c in Sources */,
240+
E8EDB88C1DE2181B0062268D /* writer.c in Sources */,
241+
E8EDB88B1DE2181B0062268D /* scanner.c in Sources */,
242+
E8EDB8891DE2181B0062268D /* parser.c in Sources */,
299243
OBJ_50 /* Yams.swift in Sources */,
244+
E8EDB88A1DE2181B0062268D /* reader.c in Sources */,
300245
);
301246
runOnlyForDeploymentPostprocessing = 0;
302247
};
@@ -311,16 +256,6 @@
311256
/* End PBXSourcesBuildPhase section */
312257

313258
/* Begin PBXTargetDependency section */
314-
OBJ_53 /* PBXTargetDependency */ = {
315-
isa = PBXTargetDependency;
316-
target = OBJ_30 /* CYaml */;
317-
targetProxy = E8C81DA81DE0FE6600D40FD7 /* PBXContainerItemProxy */;
318-
};
319-
OBJ_63 /* PBXTargetDependency */ = {
320-
isa = PBXTargetDependency;
321-
target = OBJ_30 /* CYaml */;
322-
targetProxy = E8C81DA91DE0FE6600D40FD7 /* PBXContainerItemProxy */;
323-
};
324259
OBJ_64 /* PBXTargetDependency */ = {
325260
isa = PBXTargetDependency;
326261
target = OBJ_45 /* Yams */;
@@ -348,52 +283,6 @@
348283
};
349284
name = Debug;
350285
};
351-
OBJ_32 /* Debug */ = {
352-
isa = XCBuildConfiguration;
353-
buildSettings = {
354-
DEFINES_MODULE = YES;
355-
ENABLE_TESTABILITY = YES;
356-
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
357-
HEADER_SEARCH_PATHS = Sources/CYaml/include;
358-
INFOPLIST_FILE = Yams.xcodeproj/CYaml_Info.plist;
359-
LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
360-
MODULEMAP_FILE = Sources/CYaml/include/module.modulemap;
361-
OTHER_LDFLAGS = "$(inherited)";
362-
OTHER_SWIFT_FLAGS = "$(inherited)";
363-
PRODUCT_BUNDLE_IDENTIFIER = CYaml;
364-
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
365-
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
366-
SUPPORTED_PLATFORMS = macosx;
367-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
368-
SWIFT_VERSION = 3.0;
369-
TARGET_NAME = CYaml;
370-
WARNING_CFLAGS = "-Wall";
371-
};
372-
name = Debug;
373-
};
374-
OBJ_33 /* Release */ = {
375-
isa = XCBuildConfiguration;
376-
buildSettings = {
377-
DEFINES_MODULE = YES;
378-
ENABLE_TESTABILITY = YES;
379-
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
380-
HEADER_SEARCH_PATHS = Sources/CYaml/include;
381-
INFOPLIST_FILE = Yams.xcodeproj/CYaml_Info.plist;
382-
LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
383-
MODULEMAP_FILE = Sources/CYaml/include/module.modulemap;
384-
OTHER_LDFLAGS = "$(inherited)";
385-
OTHER_SWIFT_FLAGS = "$(inherited)";
386-
PRODUCT_BUNDLE_IDENTIFIER = CYaml;
387-
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
388-
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
389-
SUPPORTED_PLATFORMS = macosx;
390-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
391-
SWIFT_VERSION = 3.0;
392-
TARGET_NAME = CYaml;
393-
WARNING_CFLAGS = "-Wall";
394-
};
395-
name = Release;
396-
};
397286
OBJ_4 /* Release */ = {
398287
isa = XCBuildConfiguration;
399288
buildSettings = {
@@ -414,6 +303,7 @@
414303
OBJ_47 /* Debug */ = {
415304
isa = XCBuildConfiguration;
416305
buildSettings = {
306+
APPLICATION_EXTENSION_API_ONLY = YES;
417307
ENABLE_TESTABILITY = YES;
418308
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
419309
HEADER_SEARCH_PATHS = Sources/CYaml/include;
@@ -426,15 +316,18 @@
426316
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
427317
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
428318
SUPPORTED_PLATFORMS = macosx;
429-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
319+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
320+
SWIFT_OBJC_BRIDGING_HEADER = Sources/CYaml/include/yaml.h;
430321
SWIFT_VERSION = 3.0;
431322
TARGET_NAME = Yams;
323+
WARNING_CFLAGS = "-Wall";
432324
};
433325
name = Debug;
434326
};
435327
OBJ_48 /* Release */ = {
436328
isa = XCBuildConfiguration;
437329
buildSettings = {
330+
APPLICATION_EXTENSION_API_ONLY = YES;
438331
ENABLE_TESTABILITY = YES;
439332
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
440333
HEADER_SEARCH_PATHS = Sources/CYaml/include;
@@ -447,9 +340,11 @@
447340
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
448341
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
449342
SUPPORTED_PLATFORMS = macosx;
450-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
343+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
344+
SWIFT_OBJC_BRIDGING_HEADER = Sources/CYaml/include/yaml.h;
451345
SWIFT_VERSION = 3.0;
452346
TARGET_NAME = Yams;
347+
WARNING_CFLAGS = "-Wall";
453348
};
454349
name = Release;
455350
};
@@ -465,7 +360,7 @@
465360
OTHER_LDFLAGS = "$(inherited)";
466361
OTHER_SWIFT_FLAGS = "$(inherited)";
467362
SUPPORTED_PLATFORMS = macosx;
468-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
363+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
469364
SWIFT_VERSION = 3.0;
470365
TARGET_NAME = YamsTests;
471366
};
@@ -483,7 +378,7 @@
483378
OTHER_LDFLAGS = "$(inherited)";
484379
OTHER_SWIFT_FLAGS = "$(inherited)";
485380
SUPPORTED_PLATFORMS = macosx;
486-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
381+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
487382
SWIFT_VERSION = 3.0;
488383
TARGET_NAME = YamsTests;
489384
};
@@ -501,15 +396,6 @@
501396
defaultConfigurationIsVisible = 0;
502397
defaultConfigurationName = Debug;
503398
};
504-
OBJ_31 /* Build configuration list for PBXNativeTarget "CYaml" */ = {
505-
isa = XCConfigurationList;
506-
buildConfigurations = (
507-
OBJ_32 /* Debug */,
508-
OBJ_33 /* Release */,
509-
);
510-
defaultConfigurationIsVisible = 0;
511-
defaultConfigurationName = Debug;
512-
};
513399
OBJ_46 /* Build configuration list for PBXNativeTarget "Yams" */ = {
514400
isa = XCConfigurationList;
515401
buildConfigurations = (

0 commit comments

Comments
 (0)