Skip to content

Commit 036288a

Browse files
committed
Revert "Use single module map file for sqlite3 shim"
This reverts commit 2bf90d4. It looks like the module map's path is not relative to the SDK root after all (as seen by reporters of stephencelis#120).
1 parent cb71a43 commit 036288a

File tree

6 files changed

+27
-10
lines changed

6 files changed

+27
-10
lines changed

SQLite.xcodeproj/project.pbxproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@
140140
DCAD429919E2EE50004A51DF /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
141141
DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sqlite3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
142142
DCAE4D181ABE0B3300EFCE7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
143-
DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
143+
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlite3.xcconfig; sourceTree = "<group>"; };
144+
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphoneos.modulemap; sourceTree = "<group>"; };
145+
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphonesimulator.modulemap; sourceTree = "<group>"; };
146+
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = macosx.modulemap; sourceTree = "<group>"; };
144147
DCAFEAD21AABC818000C21A1 /* FTS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS.swift; sourceTree = "<group>"; };
145148
DCAFEAD61AABEFA7000C21A1 /* FTSTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTSTests.swift; sourceTree = "<group>"; };
146149
DCBE28401ABDF18F0042A3FC /* RTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTree.swift; sourceTree = "<group>"; };
@@ -316,7 +319,10 @@
316319
children = (
317320
DCAE4D181ABE0B3300EFCE7A /* Info.plist */,
318321
DC5B12121ABE3298000DA146 /* libsqlite3.dylib */,
319-
DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */,
322+
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */,
323+
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */,
324+
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */,
325+
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */,
320326
);
321327
name = "Supporting Files";
322328
sourceTree = "<group>";
@@ -795,7 +801,7 @@
795801
};
796802
DCAE4D291ABE0B3400EFCE7A /* Debug */ = {
797803
isa = XCBuildConfiguration;
798-
baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
804+
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
799805
buildSettings = {
800806
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
801807
DEFINES_MODULE = YES;
@@ -807,15 +813,14 @@
807813
INFOPLIST_FILE = sqlite3/Info.plist;
808814
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
809815
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
810-
MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
811816
PRODUCT_NAME = "$(TARGET_NAME)";
812817
SKIP_INSTALL = YES;
813818
};
814819
name = Debug;
815820
};
816821
DCAE4D2A1ABE0B3400EFCE7A /* Release */ = {
817822
isa = XCBuildConfiguration;
818-
baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
823+
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
819824
buildSettings = {
820825
COPY_PHASE_STRIP = NO;
821826
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -827,7 +832,6 @@
827832
INFOPLIST_FILE = sqlite3/Info.plist;
828833
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
829834
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
830-
MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
831835
PRODUCT_NAME = "$(TARGET_NAME)";
832836
SKIP_INSTALL = YES;
833837
};

sqlite3/iphoneos.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module sqlite3 [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

sqlite3/iphonesimulator.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module sqlite3 [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

sqlite3/macosx.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module sqlite3 [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

sqlite3/module.modulemap

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

sqlite3/sqlite3.xcconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include "../SQLite/SQLite.xcconfig"
2+
3+
MODULEMAP_FILE[sdk=iphoneos*] = $(SRCROOT)/sqlite3/iphoneos.modulemap
4+
MODULEMAP_FILE[sdk=iphonesimulator*] = $(SRCROOT)/sqlite3/iphonesimulator.modulemap
5+
MODULEMAP_FILE[sdk=macosx*] = $(SRCROOT)/sqlite3/macosx.modulemap

0 commit comments

Comments
 (0)