Rename GRDBCustomSQLite module to GRDB

This commit is contained in:
Gwendal Roué committed 2020-04-04 17:42:00 +02:00
1 parent d60fe3c22f
commit 65c009a018
20 files changed
+198 -200

No files matched your search

+2 -2
View File
@@ -97,8 +97,8 @@ xcuserdata
*.xcbaseline
# GRDBCustomSQLite USER configuration files
SQLiteCustom/GRDBCustomSQLite-USER.h
SQLiteCustom/GRDBCustomSQLite-USER.xcconfig
SQLiteCustom/GRDB-USER.h
SQLiteCustom/GRDB-USER.xcconfig
# CocoaPods test
Pods
+15 -15
View File
@@ -33,7 +33,7 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
CUSTOM_SQLLIBRARY_CFLAGS = -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_PREUPDATE_HOOK
```
- `GRDBCustomSQLite-USER.xcconfig`: this file lets GRDB know about extra compilation flags, and enables extra GRDB APIs.
- `GRDB-USER.xcconfig`: this file lets GRDB know about extra compilation flags, and enables extra GRDB APIs.
```xcconfig
// As many -D options as there are custom SQLite compilation options
@@ -41,7 +41,7 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
CUSTOM_OTHER_SWIFT_FLAGS = -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK
```
- `GRDBCustomSQLite-USER.h`: this file lets your application know about extra compilation flags.
- `GRDB-USER.h`: this file lets your application know about extra compilation flags.
```c
// As many #define as there are custom SQLite compilation options
@@ -49,7 +49,7 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
#define SQLITE_ENABLE_PREUPDATE_HOOK
```
- `GRDBCustomSQLite-INSTALL.sh`: this file installs the three other files.
- `GRDB-INSTALL.sh`: this file installs the three other files.
```sh
# License: MIT License
@@ -66,11 +66,11 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
# The path to your custom "SQLiteLib-USER.xcconfig":
SQLITELIB_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/SQLiteLib-USER.xcconfig"
# The path to your custom "GRDBCustomSQLite-USER.xcconfig":
CUSTOMSQLITE_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.xcconfig"
# The path to your custom "GRDB-USER.xcconfig":
CUSTOMSQLITE_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDB-USER.xcconfig"
# The path to your custom "GRDBCustomSQLite-USER.h":
CUSTOMSQLITE_H_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.h"
# The path to your custom "GRDB-USER.h":
CUSTOMSQLITE_H_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDB-USER.h"
#######################################################
#
@@ -99,27 +99,27 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
}
SyncFileChanges $SQLITELIB_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom/src" "SQLiteLib-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_H_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.h"
SyncFileChanges $CUSTOMSQLITE_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDB-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_H_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDB-USER.h"
echo "Finished syncing"
```
Modify the top of `GRDBCustomSQLite-INSTALL.sh` file so that it contains correct paths.
Modify the top of `GRDB-INSTALL.sh` file so that it contains correct paths.
5. Embed the `GRDBCustom.xcodeproj` project in your own project.
6. Add the `GRDBCustomSQLiteOSX` or `GRDBCustomSQLiteiOS` target in the **Target Dependencies** section of the **Build Phases** tab of your **application target**.
6. Add the `GRDBOSX` or `GRDBiOS` target in the **Target Dependencies** section of the **Build Phases** tab of your **application target**.
7. Add the `GRDBCustomSQLite.framework` from the targeted platform to the **Embedded Binaries** section of the **General** tab of your **application target**.
7. Add the `GRDB.framework` from the targeted platform to the **Embedded Binaries** section of the **General** tab of your **application target**.
8. Add a Run Script phase for your target in the **Pre-actions** section of the **Build** tab of your **application scheme**:
```sh
source "${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-INSTALL.sh"
source "${PROJECT_DIR}/GRDBCustomSQLite/GRDB-INSTALL.sh"
```
The path should be the path to your `GRDBCustomSQLite-INSTALL.sh` file.
The path should be the path to your `GRDB-INSTALL.sh` file.
Select your application target in the "Provide build settings from" menu.
@@ -128,7 +128,7 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
Now you can use GRDB with your custom SQLite build:
```swift
import GRDBCustomSQLite
import GRDB
let dbQueue = try DatabaseQueue(...)
```
+1 -1
View File
@@ -730,7 +730,7 @@ public protocol TransactionObserver: AnyObject {
///
/// As of OSX 10.11.5, and iOS 9.3.2, the built-in SQLite library
/// does not have this enabled, so you'll need to compile your own
/// copy using GRDBCustomSQLite.
/// version of SQLite:
/// See https://github.com/groue/GRDB.swift/blob/master/Documentation/CustomSQLiteBuilds.md
///
/// The databaseDidChangeWithEvent callback is always available,
+83 -83
View File
@@ -474,8 +474,8 @@
56FF455D1D2CDA5200F21EF9 /* RecordUniqueIndexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56FF45551D2CDA5200F21EF9 /* RecordUniqueIndexTests.swift */; };
6340BF831E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6340BF7F1E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift */; };
6340BF871E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6340BF7F1E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift */; };
EED476F21CFD17270026A4EC /* GRDBCustomSQLite-USER.h in Headers */ = {isa = PBXBuildFile; fileRef = EED476F11CFD16FF0026A4EC /* GRDBCustomSQLite-USER.h */; settings = {ATTRIBUTES = (Public, ); }; };
EED476F31CFD172C0026A4EC /* GRDBCustomSQLite-USER.h in Headers */ = {isa = PBXBuildFile; fileRef = EED476F11CFD16FF0026A4EC /* GRDBCustomSQLite-USER.h */; settings = {ATTRIBUTES = (Public, ); }; };
EED476F21CFD17270026A4EC /* GRDB-USER.h in Headers */ = {isa = PBXBuildFile; fileRef = EED476F11CFD16FF0026A4EC /* GRDB-USER.h */; settings = {ATTRIBUTES = (Public, ); }; };
EED476F31CFD172C0026A4EC /* GRDB-USER.h in Headers */ = {isa = PBXBuildFile; fileRef = EED476F11CFD16FF0026A4EC /* GRDB-USER.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA800A1CFB286A003DC1BA /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238701B9C75030082EB20 /* Configuration.swift */; };
F3BA800B1CFB286D003DC1BA /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238711B9C75030082EB20 /* Database.swift */; };
F3BA800C1CFB286F003DC1BA /* DatabaseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238731B9C75030082EB20 /* DatabaseError.swift */; };
@@ -505,11 +505,11 @@
F3BA80331CFB28A4003DC1BA /* PersistableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560D92441C672C4B00F4F92B /* PersistableRecord.swift */; };
F3BA80341CFB28A4003DC1BA /* Record.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238A11B9C753B0082EB20 /* Record.swift */; };
F3BA80361CFB28A4003DC1BA /* TableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560D92461C672C4B00F4F92B /* TableRecord.swift */; };
F3BA80381CFB2932003DC1BA /* GRDBCustomSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF11CFB23D3003DC1BA /* GRDBCustomSQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80391CFB2936003DC1BA /* GRDBCustomSQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF21CFB23DA003DC1BA /* GRDBCustomSQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80381CFB2932003DC1BA /* GRDB.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF11CFB23D3003DC1BA /* GRDB.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80391CFB2936003DC1BA /* GRDB-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF21CFB23DA003DC1BA /* GRDB-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA803A1CFB293A003DC1BA /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF01CFB23C9003DC1BA /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA803C1CFB2A20003DC1BA /* libsqlitecustom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA7FF81CFB23E4003DC1BA /* libsqlitecustom.a */; };
F3BA80461CFB2AD7003DC1BA /* GRDBCustomSQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA7FFE1CFB25E4003DC1BA /* GRDBCustomSQLite.framework */; };
F3BA80461CFB2AD7003DC1BA /* GRDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA7FFE1CFB25E4003DC1BA /* GRDB.framework */; };
F3BA804C1CFB2B24003DC1BA /* GRDBTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5623E0901B4AFACC00B20B7F /* GRDBTestCase.swift */; };
F3BA804F1CFB2B59003DC1BA /* DatabasePoolReleaseMemoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563363CF1C943D13000BE133 /* DatabasePoolReleaseMemoryTests.swift */; };
F3BA80501CFB2B59003DC1BA /* DatabasePoolSchemaCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 569531281C908A5B00CF1A2B /* DatabasePoolSchemaCacheTests.swift */; };
@@ -546,11 +546,11 @@
F3BA808F1CFB2E7A003DC1BA /* PersistableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560D92441C672C4B00F4F92B /* PersistableRecord.swift */; };
F3BA80901CFB2E7A003DC1BA /* Record.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238A11B9C753B0082EB20 /* Record.swift */; };
F3BA80921CFB2E7A003DC1BA /* TableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560D92461C672C4B00F4F92B /* TableRecord.swift */; };
F3BA80931CFB2F13003DC1BA /* GRDBCustomSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF11CFB23D3003DC1BA /* GRDBCustomSQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80941CFB2F15003DC1BA /* GRDBCustomSQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF21CFB23DA003DC1BA /* GRDBCustomSQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80931CFB2F13003DC1BA /* GRDB.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF11CFB23D3003DC1BA /* GRDB.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80941CFB2F15003DC1BA /* GRDB-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF21CFB23DA003DC1BA /* GRDB-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80951CFB2F18003DC1BA /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BA7FF01CFB23C9003DC1BA /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3BA80961CFB2F45003DC1BA /* libsqlitecustom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA7FF81CFB23E4003DC1BA /* libsqlitecustom.a */; };
F3BA80A01CFB2F6F003DC1BA /* GRDBCustomSQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA805A1CFB2BB2003DC1BA /* GRDBCustomSQLite.framework */; };
F3BA80A01CFB2F6F003DC1BA /* GRDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3BA805A1CFB2BB2003DC1BA /* GRDB.framework */; };
F3BA80A61CFB2F91003DC1BA /* GRDBTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5623E0901B4AFACC00B20B7F /* GRDBTestCase.swift */; };
F3BA80AC1CFB2FA6003DC1BA /* DatabaseQueueSchemaCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 569531231C90878D00CF1A2B /* DatabaseQueueSchemaCacheTests.swift */; };
F3BA80AD1CFB2FA6003DC1BA /* DataMemoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56EB0AB11BCD787300A3DC55 /* DataMemoryTests.swift */; };
@@ -698,14 +698,14 @@
containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */;
proxyType = 1;
remoteGlobalIDString = F3BA7FFD1CFB25E4003DC1BA;
remoteInfo = GRDBCustomSQLiteiOS;
remoteInfo = GRDBiOS;
};
F3BA80A11CFB2F6F003DC1BA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */;
proxyType = 1;
remoteGlobalIDString = F3BA80591CFB2BB2003DC1BA;
remoteInfo = GRDBCustomSQLiteOSX;
remoteInfo = GRDBOSX;
};
/* End PBXContainerItemProxy section */
@@ -1043,19 +1043,19 @@
DC3773F719C8CBB3004FCF85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DC3773F819C8CBB3004FCF85 /* GRDB.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GRDB.h; sourceTree = "<group>"; };
DC37740419C8CBB3004FCF85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EED476F11CFD16FF0026A4EC /* GRDBCustomSQLite-USER.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "GRDBCustomSQLite-USER.h"; path = "SQLiteCustom/GRDBCustomSQLite-USER.h"; sourceTree = "<group>"; };
EED476F11CFD16FF0026A4EC /* GRDB-USER.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "GRDB-USER.h"; path = "SQLiteCustom/GRDB-USER.h"; sourceTree = "<group>"; };
F3BA7FEE1CFB23B7003DC1BA /* GRDB.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = GRDB.xcconfig; path = SQLiteCustom/GRDB.xcconfig; sourceTree = "<group>"; };
F3BA7FEF1CFB23BF003DC1BA /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = SQLiteCustom/module.modulemap; sourceTree = "<group>"; };
F3BA7FF01CFB23C9003DC1BA /* sqlite3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = SQLiteCustom/src/sqlite3.h; sourceTree = "<group>"; };
F3BA7FF11CFB23D3003DC1BA /* GRDBCustomSQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GRDBCustomSQLite.h; path = SQLiteCustom/GRDBCustomSQLite.h; sourceTree = "<group>"; };
F3BA7FF21CFB23DA003DC1BA /* GRDBCustomSQLite-Bridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "GRDBCustomSQLite-Bridging.h"; path = "SQLiteCustom/GRDBCustomSQLite-Bridging.h"; sourceTree = "<group>"; };
F3BA7FF11CFB23D3003DC1BA /* GRDB.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GRDB.h; path = SQLiteCustom/GRDB.h; sourceTree = "<group>"; };
F3BA7FF21CFB23DA003DC1BA /* GRDB-Bridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "GRDB-Bridging.h"; path = "SQLiteCustom/GRDB-Bridging.h"; sourceTree = "<group>"; };
F3BA7FF31CFB23E4003DC1BA /* SQLiteLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SQLiteLib.xcodeproj; path = SQLiteCustom/src/SQLiteLib.xcodeproj; sourceTree = "<group>"; };
F3BA7FFE1CFB25E4003DC1BA /* GRDBCustomSQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDBCustomSQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA80411CFB2AD7003DC1BA /* GRDBCustomSQLiteiOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBCustomSQLiteiOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA805A1CFB2BB2003DC1BA /* GRDBCustomSQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDBCustomSQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA809B1CFB2F6F003DC1BA /* GRDBCustomSQLiteOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBCustomSQLiteOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA813A1CFB3402003DC1BA /* GRDBCustomSQLite-USER.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "GRDBCustomSQLite-USER.xcconfig"; path = "SQLiteCustom/GRDBCustomSQLite-USER.xcconfig"; sourceTree = "<group>"; };
F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "GRDBCustomSQLite-Testing.xcconfig"; path = "SQLiteCustom/GRDBCustomSQLite-Testing.xcconfig"; sourceTree = "<group>"; };
F3BA7FFE1CFB25E4003DC1BA /* GRDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDB.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA80411CFB2AD7003DC1BA /* GRDBiOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBiOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA805A1CFB2BB2003DC1BA /* GRDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDB.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA809B1CFB2F6F003DC1BA /* GRDBOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F3BA813A1CFB3402003DC1BA /* GRDB-USER.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "GRDB-USER.xcconfig"; path = "SQLiteCustom/GRDB-USER.xcconfig"; sourceTree = "<group>"; };
F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "GRDB-Testing.xcconfig"; path = "SQLiteCustom/GRDB-Testing.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1071,7 +1071,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F3BA80461CFB2AD7003DC1BA /* GRDBCustomSQLite.framework in Frameworks */,
F3BA80461CFB2AD7003DC1BA /* GRDB.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1087,7 +1087,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F3BA80A01CFB2F6F003DC1BA /* GRDBCustomSQLite.framework in Frameworks */,
F3BA80A01CFB2F6F003DC1BA /* GRDB.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1766,7 +1766,7 @@
isa = PBXGroup;
children = (
DC37742D19C8CC90004FCF85 /* GRDB */,
F3BA7FED1CFB21F8003DC1BA /* GRDBCustomSQLite */,
F3BA7FED1CFB21F8003DC1BA /* GRDBCustom */,
DC10500F19C904DD00D8CA30 /* Tests */,
DC3773F419C8CBB3004FCF85 /* Products */,
);
@@ -1778,10 +1778,10 @@
DC3773F419C8CBB3004FCF85 /* Products */ = {
isa = PBXGroup;
children = (
F3BA7FFE1CFB25E4003DC1BA /* GRDBCustomSQLite.framework */,
F3BA80411CFB2AD7003DC1BA /* GRDBCustomSQLiteiOSTests.xctest */,
F3BA805A1CFB2BB2003DC1BA /* GRDBCustomSQLite.framework */,
F3BA809B1CFB2F6F003DC1BA /* GRDBCustomSQLiteOSXTests.xctest */,
F3BA7FFE1CFB25E4003DC1BA /* GRDB.framework */,
F3BA80411CFB2AD7003DC1BA /* GRDBiOSTests.xctest */,
F3BA805A1CFB2BB2003DC1BA /* GRDB.framework */,
F3BA809B1CFB2F6F003DC1BA /* GRDBOSXTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -1828,26 +1828,26 @@
EED476F41CFD174D0026A4EC /* Customize */ = {
isa = PBXGroup;
children = (
F3BA813A1CFB3402003DC1BA /* GRDBCustomSQLite-USER.xcconfig */,
EED476F11CFD16FF0026A4EC /* GRDBCustomSQLite-USER.h */,
F3BA813A1CFB3402003DC1BA /* GRDB-USER.xcconfig */,
EED476F11CFD16FF0026A4EC /* GRDB-USER.h */,
);
name = Customize;
sourceTree = "<group>";
};
F3BA7FED1CFB21F8003DC1BA /* GRDBCustomSQLite */ = {
F3BA7FED1CFB21F8003DC1BA /* GRDBCustom */ = {
isa = PBXGroup;
children = (
EED476F41CFD174D0026A4EC /* Customize */,
F3BA7FEE1CFB23B7003DC1BA /* GRDB.xcconfig */,
F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */,
F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */,
56C494421ED726C500CC72AF /* GRDBDeploymentTarget.xcconfig */,
F3BA7FEF1CFB23BF003DC1BA /* module.modulemap */,
F3BA7FF01CFB23C9003DC1BA /* sqlite3.h */,
F3BA7FF11CFB23D3003DC1BA /* GRDBCustomSQLite.h */,
F3BA7FF21CFB23DA003DC1BA /* GRDBCustomSQLite-Bridging.h */,
F3BA7FF11CFB23D3003DC1BA /* GRDB.h */,
F3BA7FF21CFB23DA003DC1BA /* GRDB-Bridging.h */,
F3BA7FF31CFB23E4003DC1BA /* SQLiteLib.xcodeproj */,
);
name = GRDBCustomSQLite;
name = GRDBCustom;
sourceTree = "<group>";
};
F3BA7FF41CFB23E4003DC1BA /* Products */ = {
@@ -1865,11 +1865,11 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
F3BA80381CFB2932003DC1BA /* GRDBCustomSQLite.h in Headers */,
F3BA80391CFB2936003DC1BA /* GRDBCustomSQLite-Bridging.h in Headers */,
F3BA80381CFB2932003DC1BA /* GRDB.h in Headers */,
F3BA80391CFB2936003DC1BA /* GRDB-Bridging.h in Headers */,
F3BA803A1CFB293A003DC1BA /* sqlite3.h in Headers */,
567DAF211EAB61ED00FC0928 /* grdb_config.h in Headers */,
EED476F31CFD172C0026A4EC /* GRDBCustomSQLite-USER.h in Headers */,
EED476F31CFD172C0026A4EC /* GRDB-USER.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1877,20 +1877,20 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
F3BA80931CFB2F13003DC1BA /* GRDBCustomSQLite.h in Headers */,
F3BA80941CFB2F15003DC1BA /* GRDBCustomSQLite-Bridging.h in Headers */,
F3BA80931CFB2F13003DC1BA /* GRDB.h in Headers */,
F3BA80941CFB2F15003DC1BA /* GRDB-Bridging.h in Headers */,
F3BA80951CFB2F18003DC1BA /* sqlite3.h in Headers */,
567DAF1E1EAB61ED00FC0928 /* grdb_config.h in Headers */,
EED476F21CFD17270026A4EC /* GRDBCustomSQLite-USER.h in Headers */,
EED476F21CFD17270026A4EC /* GRDB-USER.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
F3BA7FFD1CFB25E4003DC1BA /* GRDBCustomSQLiteiOS */ = {
F3BA7FFD1CFB25E4003DC1BA /* GRDBiOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = F3BA80031CFB25E4003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteiOS" */;
buildConfigurationList = F3BA80031CFB25E4003DC1BA /* Build configuration list for PBXNativeTarget "GRDBiOS" */;
buildPhases = (
EED476F01CFD0B290026A4EC /* Copy .example configuration files (if no USER customizations exist) */,
F3BA7FF91CFB25E4003DC1BA /* Sources */,
@@ -1904,14 +1904,14 @@
dependencies = (
EED9F6461CFE39D1004BA2B8 /* PBXTargetDependency */,
);
name = GRDBCustomSQLiteiOS;
productName = GRDBCustomSQLite;
productReference = F3BA7FFE1CFB25E4003DC1BA /* GRDBCustomSQLite.framework */;
name = GRDBiOS;
productName = GRDB;
productReference = F3BA7FFE1CFB25E4003DC1BA /* GRDB.framework */;
productType = "com.apple.product-type.framework";
};
F3BA80401CFB2AD7003DC1BA /* GRDBCustomSQLiteiOSTests */ = {
F3BA80401CFB2AD7003DC1BA /* GRDBiOSTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = F3BA80491CFB2AD7003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteiOSTests" */;
buildConfigurationList = F3BA80491CFB2AD7003DC1BA /* Build configuration list for PBXNativeTarget "GRDBiOSTests" */;
buildPhases = (
F3BA803D1CFB2AD7003DC1BA /* Sources */,
F3BA803E1CFB2AD7003DC1BA /* Frameworks */,
@@ -1922,14 +1922,14 @@
dependencies = (
F3BA80481CFB2AD7003DC1BA /* PBXTargetDependency */,
);
name = GRDBCustomSQLiteiOSTests;
productName = GRDBCustomSQLiteiOSTests;
productReference = F3BA80411CFB2AD7003DC1BA /* GRDBCustomSQLiteiOSTests.xctest */;
name = GRDBiOSTests;
productName = GRDBiOSTests;
productReference = F3BA80411CFB2AD7003DC1BA /* GRDBiOSTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
F3BA80591CFB2BB2003DC1BA /* GRDBCustomSQLiteOSX */ = {
F3BA80591CFB2BB2003DC1BA /* GRDBOSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = F3BA805F1CFB2BB2003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteOSX" */;
buildConfigurationList = F3BA805F1CFB2BB2003DC1BA /* Build configuration list for PBXNativeTarget "GRDBOSX" */;
buildPhases = (
EED476F51CFD1A610026A4EC /* Copy .example configuration files (if no USER customizations exist) */,
F3BA80551CFB2BB2003DC1BA /* Sources */,
@@ -1943,14 +1943,14 @@
dependencies = (
EED9F6481CFE39D7004BA2B8 /* PBXTargetDependency */,
);
name = GRDBCustomSQLiteOSX;
productName = GRDBCustomSQLite;
productReference = F3BA805A1CFB2BB2003DC1BA /* GRDBCustomSQLite.framework */;
name = GRDBOSX;
productName = GRDB;
productReference = F3BA805A1CFB2BB2003DC1BA /* GRDB.framework */;
productType = "com.apple.product-type.framework";
};
F3BA809A1CFB2F6F003DC1BA /* GRDBCustomSQLiteOSXTests */ = {
F3BA809A1CFB2F6F003DC1BA /* GRDBOSXTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = F3BA80A31CFB2F6F003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteOSXTests" */;
buildConfigurationList = F3BA80A31CFB2F6F003DC1BA /* Build configuration list for PBXNativeTarget "GRDBOSXTests" */;
buildPhases = (
F3BA80971CFB2F6F003DC1BA /* Sources */,
F3BA80981CFB2F6F003DC1BA /* Frameworks */,
@@ -1961,9 +1961,9 @@
dependencies = (
F3BA80A21CFB2F6F003DC1BA /* PBXTargetDependency */,
);
name = GRDBCustomSQLiteOSXTests;
productName = GRDBCustomSQLiteOSXTests;
productReference = F3BA809B1CFB2F6F003DC1BA /* GRDBCustomSQLiteOSXTests.xctest */;
name = GRDBOSXTests;
productName = GRDBOSXTests;
productReference = F3BA809B1CFB2F6F003DC1BA /* GRDBOSXTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
@@ -2013,10 +2013,10 @@
);
projectRoot = "";
targets = (
F3BA80591CFB2BB2003DC1BA /* GRDBCustomSQLiteOSX */,
F3BA809A1CFB2F6F003DC1BA /* GRDBCustomSQLiteOSXTests */,
F3BA7FFD1CFB25E4003DC1BA /* GRDBCustomSQLiteiOS */,
F3BA80401CFB2AD7003DC1BA /* GRDBCustomSQLiteiOSTests */,
F3BA80591CFB2BB2003DC1BA /* GRDBOSX */,
F3BA809A1CFB2F6F003DC1BA /* GRDBOSXTests */,
F3BA7FFD1CFB25E4003DC1BA /* GRDBiOS */,
F3BA80401CFB2AD7003DC1BA /* GRDBiOSTests */,
);
};
/* End PBXProject section */
@@ -2109,15 +2109,15 @@
files = (
);
inputPaths = (
"$(SRCROOT)/SQLiteCustom/GRDBCustomSQLite-USER.xcconfig.example",
"$(SRCROOT)/SQLiteCustom/GRDBCustomSQLite-USER.h.example",
"$(SRCROOT)/SQLiteCustom/GRDB-USER.xcconfig.example",
"$(SRCROOT)/SQLiteCustom/GRDB-USER.h.example",
);
name = "Copy .example configuration files (if no USER customizations exist)";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "copiedfiles=false\nfor ((i=0; i < SCRIPT_INPUT_FILE_COUNT ; i++))\ndo\n INFILE=SCRIPT_INPUT_FILE_$i\n FILE=${!INFILE};\n OUTPUTFILE=${FILE%.example}\n echo \"${INFILE}=${FILE}\"\n if [ -f \"$FILE\" ]\n then\n if [ ! -f \"$OUTPUTFILE\" ];\n then\n echo \"Expected USER configuration file doesn't exist\"\n echo \"Copying .example file\"\n cp $FILE $OUTPUTFILE\n touch $OUTPUTFILE\n copiedfiles=true\n else\n echo \"USER Configuration file already exists: ${OUTPUTFILE}\"\n echo \"Skipping .example copy.\"\n fi\n else\n echo \"Missing input .example file: ${FILE}\"\n exit 1\n fi\ndone\n\nif [ \"$copiedfiles\" = true ] ; then\ntouch \"${SRCROOT}/SQLiteCustom/GRDB.xcconfig\"\ntouch \"${SRCROOT}/SQLiteCustom/GRDBCustomSQLite-Testing.xcconfig\"\nsleep 1\nfi\n";
shellScript = "copiedfiles=false\nfor ((i=0; i < SCRIPT_INPUT_FILE_COUNT ; i++))\ndo\n INFILE=SCRIPT_INPUT_FILE_$i\n FILE=${!INFILE};\n OUTPUTFILE=${FILE%.example}\n echo \"${INFILE}=${FILE}\"\n if [ -f \"$FILE\" ]\n then\n if [ ! -f \"$OUTPUTFILE\" ];\n then\n echo \"Expected USER configuration file doesn't exist\"\n echo \"Copying .example file\"\n cp $FILE $OUTPUTFILE\n touch $OUTPUTFILE\n copiedfiles=true\n else\n echo \"USER Configuration file already exists: ${OUTPUTFILE}\"\n echo \"Skipping .example copy.\"\n fi\n else\n echo \"Missing input .example file: ${FILE}\"\n exit 1\n fi\ndone\n\nif [ \"$copiedfiles\" = true ] ; then\ntouch \"${SRCROOT}/SQLiteCustom/GRDB.xcconfig\"\ntouch \"${SRCROOT}/SQLiteCustom/GRDB-Testing.xcconfig\"\nsleep 1\nfi\n";
showEnvVarsInLog = 0;
};
EED476F51CFD1A610026A4EC /* Copy .example configuration files (if no USER customizations exist) */ = {
@@ -2126,15 +2126,15 @@
files = (
);
inputPaths = (
"$(SRCROOT)/SQLiteCustom/GRDBCustomSQLite-USER.xcconfig.example",
"$(SRCROOT)/SQLiteCustom/GRDBCustomSQLite-USER.h.example",
"$(SRCROOT)/SQLiteCustom/GRDB-USER.xcconfig.example",
"$(SRCROOT)/SQLiteCustom/GRDB-USER.h.example",
);
name = "Copy .example configuration files (if no USER customizations exist)";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "copiedfiles=false\nfor ((i=0; i < SCRIPT_INPUT_FILE_COUNT ; i++))\ndo\n INFILE=SCRIPT_INPUT_FILE_$i\n FILE=${!INFILE};\n OUTPUTFILE=${FILE%.example}\n echo \"${INFILE}=${FILE}\"\n if [ -f \"$FILE\" ]\n then\n if [ ! -f \"$OUTPUTFILE\" ];\n then\n echo \"Expected USER configuration file doesn't exist\"\n echo \"Copying .example file\"\n cp $FILE $OUTPUTFILE\n touch $OUTPUTFILE\n copiedfiles=true\n else\n echo \"USER Configuration file already exists: ${OUTPUTFILE}\"\n echo \"Skipping .example copy.\"\n fi\n else\n echo \"Missing input .example file: ${FILE}\"\n exit 1\n fi\ndone\n\nif [ \"$copiedfiles\" = true ] ; then\ntouch \"${SRCROOT}/SQLiteCustom/GRDB.xcconfig\"\ntouch \"${SRCROOT}/SQLiteCustom/GRDBCustomSQLite-Testing.xcconfig\"\nsleep 1\nfi\n";
shellScript = "copiedfiles=false\nfor ((i=0; i < SCRIPT_INPUT_FILE_COUNT ; i++))\ndo\n INFILE=SCRIPT_INPUT_FILE_$i\n FILE=${!INFILE};\n OUTPUTFILE=${FILE%.example}\n echo \"${INFILE}=${FILE}\"\n if [ -f \"$FILE\" ]\n then\n if [ ! -f \"$OUTPUTFILE\" ];\n then\n echo \"Expected USER configuration file doesn't exist\"\n echo \"Copying .example file\"\n cp $FILE $OUTPUTFILE\n touch $OUTPUTFILE\n copiedfiles=true\n else\n echo \"USER Configuration file already exists: ${OUTPUTFILE}\"\n echo \"Skipping .example copy.\"\n fi\n else\n echo \"Missing input .example file: ${FILE}\"\n exit 1\n fi\ndone\n\nif [ \"$copiedfiles\" = true ] ; then\ntouch \"${SRCROOT}/SQLiteCustom/GRDB.xcconfig\"\ntouch \"${SRCROOT}/SQLiteCustom/GRDB-Testing.xcconfig\"\nsleep 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -2827,12 +2827,12 @@
};
F3BA80481CFB2AD7003DC1BA /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F3BA7FFD1CFB25E4003DC1BA /* GRDBCustomSQLiteiOS */;
target = F3BA7FFD1CFB25E4003DC1BA /* GRDBiOS */;
targetProxy = F3BA80471CFB2AD7003DC1BA /* PBXContainerItemProxy */;
};
F3BA80A21CFB2F6F003DC1BA /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F3BA80591CFB2BB2003DC1BA /* GRDBCustomSQLiteOSX */;
target = F3BA80591CFB2BB2003DC1BA /* GRDBOSX */;
targetProxy = F3BA80A11CFB2F6F003DC1BA /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -2998,7 +2998,7 @@
};
F3BA804A1CFB2AD7003DC1BA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -3007,7 +3007,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBCustomSQLite.GRDBCustomSQLiteiOSTests;
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBiOSTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
};
@@ -3015,7 +3015,7 @@
};
F3BA804B1CFB2AD7003DC1BA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -3025,7 +3025,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBCustomSQLite.GRDBCustomSQLiteiOSTests;
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBiOSTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -3082,7 +3082,7 @@
};
F3BA80A41CFB2F6F003DC1BA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -3092,7 +3092,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBCustomSQLiteOSXTests;
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBOSXTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
@@ -3100,7 +3100,7 @@
};
F3BA80A51CFB2F6F003DC1BA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDBCustomSQLite-Testing.xcconfig */;
baseConfigurationReference = F3BA813B1CFB3770003DC1BA /* GRDB-Testing.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -3111,7 +3111,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBCustomSQLiteOSXTests;
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBOSXTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -3130,7 +3130,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F3BA80031CFB25E4003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteiOS" */ = {
F3BA80031CFB25E4003DC1BA /* Build configuration list for PBXNativeTarget "GRDBiOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F3BA80041CFB25E4003DC1BA /* Debug */,
@@ -3139,7 +3139,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F3BA80491CFB2AD7003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteiOSTests" */ = {
F3BA80491CFB2AD7003DC1BA /* Build configuration list for PBXNativeTarget "GRDBiOSTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F3BA804A1CFB2AD7003DC1BA /* Debug */,
@@ -3148,7 +3148,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F3BA805F1CFB2BB2003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteOSX" */ = {
F3BA805F1CFB2BB2003DC1BA /* Build configuration list for PBXNativeTarget "GRDBOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F3BA80601CFB2BB2003DC1BA /* Debug */,
@@ -3157,7 +3157,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F3BA80A31CFB2F6F003DC1BA /* Build configuration list for PBXNativeTarget "GRDBCustomSQLiteOSXTests" */ = {
F3BA80A31CFB2F6F003DC1BA /* Build configuration list for PBXNativeTarget "GRDBOSXTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F3BA80A41CFB2F6F003DC1BA /* Debug */,
@@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA80591CFB2BB2003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteOSX"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBOSX"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -29,8 +29,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA809A1CFB2F6F003DC1BA"
BuildableName = "GRDBCustomSQLiteOSXTests.xctest"
BlueprintName = "GRDBCustomSQLiteOSXTests"
BuildableName = "GRDBOSXTests.xctest"
BlueprintName = "GRDBOSXTests"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -46,8 +46,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA80591CFB2BB2003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteOSX"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBOSX"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -57,8 +57,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA809A1CFB2F6F003DC1BA"
BuildableName = "GRDBCustomSQLiteOSXTests.xctest"
BlueprintName = "GRDBCustomSQLiteOSXTests"
BuildableName = "GRDBOSXTests.xctest"
BlueprintName = "GRDBOSXTests"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</TestableReference>
@@ -78,8 +78,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA80591CFB2BB2003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteOSX"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBOSX"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA7FFD1CFB25E4003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteiOS"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBiOS"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -29,8 +29,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA80401CFB2AD7003DC1BA"
BuildableName = "GRDBCustomSQLiteiOSTests.xctest"
BlueprintName = "GRDBCustomSQLiteiOSTests"
BuildableName = "GRDBiOSTests.xctest"
BlueprintName = "GRDBiOSTests"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -46,8 +46,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA7FFD1CFB25E4003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteiOS"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBiOS"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -57,8 +57,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA80401CFB2AD7003DC1BA"
BuildableName = "GRDBCustomSQLiteiOSTests.xctest"
BlueprintName = "GRDBCustomSQLiteiOSTests"
BuildableName = "GRDBiOSTests.xctest"
BlueprintName = "GRDBiOSTests"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</TestableReference>
@@ -78,8 +78,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA7FFD1CFB25E4003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteiOS"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBiOS"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -94,8 +94,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F3BA7FFD1CFB25E4003DC1BA"
BuildableName = "GRDBCustomSQLite.framework"
BlueprintName = "GRDBCustomSQLiteiOS"
BuildableName = "GRDB.framework"
BlueprintName = "GRDBiOS"
ReferencedContainer = "container:GRDBCustom.xcodeproj">
</BuildableReference>
</MacroExpansion>
+9 -9
View File
@@ -208,7 +208,7 @@ test_framework_GRDBtvOS_minTarget:
test_framework_GRDBCustomSQLiteOSX: SQLiteCustom
$(XCODEBUILD) \
-project GRDBCustom.xcodeproj \
-scheme GRDBCustomSQLiteOSX \
-scheme GRDBOSX \
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
$(TEST_ACTIONS) \
$(XCPRETTY)
@@ -219,7 +219,7 @@ test_framework_GRDBCustomSQLiteiOS_maxTarget: test_framework_GRDBCustomSQLiteiOS
test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift: SQLiteCustom
$(XCODEBUILD) \
-project GRDBCustom.xcodeproj \
-scheme GRDBCustomSQLiteiOS \
-scheme GRDBiOS \
-destination $(MAX_IOS_DESTINATION) \
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
$(TEST_ACTIONS) \
@@ -229,7 +229,7 @@ test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift: SQLiteCustom
ifdef MIN_SWIFT_VERSION
$(XCODEBUILD) \
-project GRDBCustom.xcodeproj \
-scheme GRDBCustomSQLiteiOS \
-scheme GRDBiOS \
-destination $(MAX_IOS_DESTINATION) \
SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
$(TEST_ACTIONS) \
@@ -239,7 +239,7 @@ endif
test_framework_GRDBCustomSQLiteiOS_minTarget: SQLiteCustom
$(XCODEBUILD) \
-project GRDBCustom.xcodeproj \
-scheme GRDBCustomSQLiteiOS \
-scheme GRDBiOS \
-destination $(MIN_IOS_DESTINATION) \
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
$(TEST_ACTIONS) \
@@ -383,11 +383,11 @@ Tests/Performance/SQLite.swift/SQLite.xcodeproj:
# Target that setups SQLite custom builds with extra compilation options.
SQLiteCustom: SQLiteCustom/src/sqlite3.h
echo '/* Makefile generated */' > SQLiteCustom/GRDBCustomSQLite-USER.h
echo '#define SQLITE_ENABLE_PREUPDATE_HOOK' >> SQLiteCustom/GRDBCustomSQLite-USER.h
echo '#define SQLITE_ENABLE_FTS5' >> SQLiteCustom/GRDBCustomSQLite-USER.h
echo '// Makefile generated' > SQLiteCustom/GRDBCustomSQLite-USER.xcconfig
echo 'CUSTOM_OTHER_SWIFT_FLAGS = -D SQLITE_ENABLE_PREUPDATE_HOOK -D SQLITE_ENABLE_FTS5' >> SQLiteCustom/GRDBCustomSQLite-USER.xcconfig
echo '/* Makefile generated */' > SQLiteCustom/GRDB-USER.h
echo '#define SQLITE_ENABLE_PREUPDATE_HOOK' >> SQLiteCustom/GRDB-USER.h
echo '#define SQLITE_ENABLE_FTS5' >> SQLiteCustom/GRDB-USER.h
echo '// Makefile generated' > SQLiteCustom/GRDB-USER.xcconfig
echo 'CUSTOM_OTHER_SWIFT_FLAGS = -D SQLITE_ENABLE_PREUPDATE_HOOK -D SQLITE_ENABLE_FTS5' >> SQLiteCustom/GRDB-USER.xcconfig
echo '// Makefile generated' > SQLiteCustom/src/SQLiteLib-USER.xcconfig
echo 'CUSTOM_SQLLIBRARY_CFLAGS = -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_FTS5' >> SQLiteCustom/src/SQLiteLib-USER.xcconfig
File renamed without changes.
@@ -5,7 +5,7 @@ CUSTOM_OTHER_SWIFT_FLAGS= // do not modify
#include "GRDBDeploymentTarget.xcconfig"
// Build once to generate this file:
#include "GRDBCustomSQLite-USER.xcconfig"
#include "GRDB-USER.xcconfig"
#include "src/SQLiteLib-USER.xcconfig"
OTHER_CFLAGS = -DUSING_BUILTIN_SQLITE -DGRDBCUSTOMSQLITE $(CUSTOM_SQLLIBRARY_CFLAGS) // Do not modify.
@@ -1,5 +1,5 @@
// DO NOT INCLUDE THIS FILE DIRECTLY
// INSTEAD, INCLUDE "GRDBCustomSQLite.h"
// INSTEAD, INCLUDE "GRDB.h"
//
// INSERT ANY ADDITIONAL SQLITE DEFINES HERE:
@@ -2,7 +2,7 @@
// To compile SQLite with additional compilation options:
// 1.) Add them to the "SQLiteLib-USER.xcconfig" in the SQLiteLib.xcodeproj
// 2.) Add them to the CUSTOM_OTHER_SWIFT_FLAGS line below.
// 3.) Optionally add them to "GRDBCustomSQLite-USER.h" to expose the appropriate SQLite APIs to framework consumers.
// 3.) Optionally add them to "GRDB-USER.h" to expose the appropriate SQLite APIs to framework consumers.
//
// See the README.md file for more details.
//
@@ -6,6 +6,6 @@ FOUNDATION_EXPORT double GRDB_VersionNumber;
//! Project version string for GRDB.
FOUNDATION_EXPORT const unsigned char GRDB_VersionString[];
#import <GRDBCustomSQLite/GRDBCustomSQLite-USER.h>
#import <GRDBCustomSQLite/GRDBCustomSQLite-Bridging.h>
#import <GRDBCustomSQLite/sqlite3.h>
#import <GRDB/GRDB-USER.h>
#import <GRDB/GRDB-Bridging.h>
#import <GRDB/sqlite3.h>
+2 -2
View File
@@ -2,11 +2,11 @@ CUSTOM_OTHER_SWIFT_FLAGS= // do not modify
#include "GRDBDeploymentTarget.xcconfig"
// Build once to generate this file:
#include "GRDBCustomSQLite-USER.xcconfig"
#include "GRDB-USER.xcconfig"
#include "src/SQLiteLib-USER.xcconfig"
INFOPLIST_FILE = Support/Info.plist
PRODUCT_NAME = GRDBCustomSQLite
PRODUCT_NAME = GRDB
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.$(PRODUCT_NAME:rfc1034identifier)
MODULEMAP_FILE = $(SRCROOT)/SQLiteCustom/module.modulemap
OTHER_CFLAGS = -DUSING_BUILTIN_SQLITE -DGRDBCUSTOMSQLITE $(CUSTOM_SQLLIBRARY_CFLAGS)
+2 -2
View File
@@ -1,5 +1,5 @@
framework module GRDBCustomSQLite {
umbrella header "GRDBCustomSQLite.h"
framework module GRDB {
umbrella header "GRDB.h"
export *
module * { export * }
@@ -7,49 +7,48 @@
objects = {
/* Begin PBXBuildFile section */
562697E32438E07700502C22 /* GRDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 562697DA2438E05F00502C22 /* GRDB.framework */; };
56F5F6C62349F11E00C4D9F7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56F5F6C52349F11E00C4D9F7 /* AppDelegate.swift */; };
56F5F6C82349F11E00C4D9F7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56F5F6C72349F11E00C4D9F7 /* ViewController.swift */; };
56F5F6CA2349F11F00C4D9F7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 56F5F6C92349F11F00C4D9F7 /* Assets.xcassets */; };
56F5F6CD2349F11F00C4D9F7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56F5F6CB2349F11F00C4D9F7 /* Main.storyboard */; };
56F5F6E82349F26400C4D9F7 /* GRDBCustomSQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56F5F6DE2349F22A00C4D9F7 /* GRDBCustomSQLite.framework */; };
56F5F6E92349F26500C4D9F7 /* GRDBCustomSQLite.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 56F5F6DE2349F22A00C4D9F7 /* GRDBCustomSQLite.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
56F5F6DD2349F22A00C4D9F7 /* PBXContainerItemProxy */ = {
562697D92438E05F00502C22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
containerPortal = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F3BA805A1CFB2BB2003DC1BA;
remoteInfo = GRDBCustomSQLiteOSX;
remoteInfo = GRDBOSX;
};
56F5F6DF2349F22A00C4D9F7 /* PBXContainerItemProxy */ = {
562697DB2438E05F00502C22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
containerPortal = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F3BA809B1CFB2F6F003DC1BA;
remoteInfo = GRDBCustomSQLiteOSXTests;
remoteInfo = GRDBOSXTests;
};
56F5F6E12349F22A00C4D9F7 /* PBXContainerItemProxy */ = {
562697DD2438E05F00502C22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
containerPortal = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F3BA7FFE1CFB25E4003DC1BA;
remoteInfo = GRDBCustomSQLiteiOS;
remoteInfo = GRDBiOS;
};
56F5F6E32349F22A00C4D9F7 /* PBXContainerItemProxy */ = {
562697DF2438E05F00502C22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
containerPortal = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F3BA80411CFB2AD7003DC1BA;
remoteInfo = GRDBCustomSQLiteiOSTests;
remoteInfo = GRDBiOSTests;
};
56F5F6E52349F24D00C4D9F7 /* PBXContainerItemProxy */ = {
562697E12438E06A00502C22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
containerPortal = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F3BA80591CFB2BB2003DC1BA;
remoteInfo = GRDBCustomSQLiteOSX;
remoteInfo = GRDBOSX;
};
/* End PBXContainerItemProxy section */
@@ -60,7 +59,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
56F5F6E92349F26500C4D9F7 /* GRDBCustomSQLite.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -68,6 +66,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GRDBCustom.xcodeproj; path = ../../GRDBCustom.xcodeproj; sourceTree = "<group>"; };
56F5F6C22349F11E00C4D9F7 /* CustomSQLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CustomSQLite.app; sourceTree = BUILT_PRODUCTS_DIR; };
56F5F6C52349F11E00C4D9F7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
56F5F6C72349F11E00C4D9F7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -75,7 +74,6 @@
56F5F6CC2349F11F00C4D9F7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
56F5F6CE2349F11F00C4D9F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56F5F6CF2349F11F00C4D9F7 /* CustomSQLite.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CustomSQLite.entitlements; sourceTree = "<group>"; };
56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GRDBCustom.xcodeproj; path = ../../GRDBCustom.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -83,17 +81,28 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
56F5F6E82349F26400C4D9F7 /* GRDBCustomSQLite.framework in Frameworks */,
562697E32438E07700502C22 /* GRDB.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
562697D22438E05F00502C22 /* Products */ = {
isa = PBXGroup;
children = (
562697DA2438E05F00502C22 /* GRDB.framework */,
562697DC2438E05F00502C22 /* GRDBOSXTests.xctest */,
562697DE2438E05F00502C22 /* GRDB.framework */,
562697E02438E05F00502C22 /* GRDBiOSTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
56F5F6B92349F11E00C4D9F7 = {
isa = PBXGroup;
children = (
56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */,
562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */,
56F5F6C42349F11E00C4D9F7 /* CustomSQLite */,
56F5F6C32349F11E00C4D9F7 /* Products */,
56F5F6E72349F26400C4D9F7 /* Frameworks */,
@@ -121,17 +130,6 @@
path = CustomSQLite;
sourceTree = "<group>";
};
56F5F6D62349F22A00C4D9F7 /* Products */ = {
isa = PBXGroup;
children = (
56F5F6DE2349F22A00C4D9F7 /* GRDBCustomSQLite.framework */,
56F5F6E02349F22A00C4D9F7 /* GRDBCustomSQLiteOSXTests.xctest */,
56F5F6E22349F22A00C4D9F7 /* GRDBCustomSQLite.framework */,
56F5F6E42349F22A00C4D9F7 /* GRDBCustomSQLiteiOSTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
56F5F6E72349F26400C4D9F7 /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -154,7 +152,7 @@
buildRules = (
);
dependencies = (
56F5F6E62349F24D00C4D9F7 /* PBXTargetDependency */,
562697E22438E06A00502C22 /* PBXTargetDependency */,
);
name = CustomSQLite;
productName = CustomSQLite;
@@ -190,8 +188,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 56F5F6D62349F22A00C4D9F7 /* Products */;
ProjectRef = 56F5F6D52349F22A00C4D9F7 /* GRDBCustom.xcodeproj */;
ProductGroup = 562697D22438E05F00502C22 /* Products */;
ProjectRef = 562697D12438E05F00502C22 /* GRDBCustom.xcodeproj */;
},
);
projectRoot = "";
@@ -202,32 +200,32 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
56F5F6DE2349F22A00C4D9F7 /* GRDBCustomSQLite.framework */ = {
562697DA2438E05F00502C22 /* GRDB.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = GRDBCustomSQLite.framework;
remoteRef = 56F5F6DD2349F22A00C4D9F7 /* PBXContainerItemProxy */;
path = GRDB.framework;
remoteRef = 562697D92438E05F00502C22 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
56F5F6E02349F22A00C4D9F7 /* GRDBCustomSQLiteOSXTests.xctest */ = {
562697DC2438E05F00502C22 /* GRDBOSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = GRDBCustomSQLiteOSXTests.xctest;
remoteRef = 56F5F6DF2349F22A00C4D9F7 /* PBXContainerItemProxy */;
path = GRDBOSXTests.xctest;
remoteRef = 562697DB2438E05F00502C22 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
56F5F6E22349F22A00C4D9F7 /* GRDBCustomSQLite.framework */ = {
562697DE2438E05F00502C22 /* GRDB.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = GRDBCustomSQLite.framework;
remoteRef = 56F5F6E12349F22A00C4D9F7 /* PBXContainerItemProxy */;
path = GRDB.framework;
remoteRef = 562697DD2438E05F00502C22 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
56F5F6E42349F22A00C4D9F7 /* GRDBCustomSQLiteiOSTests.xctest */ = {
562697E02438E05F00502C22 /* GRDBiOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = GRDBCustomSQLiteiOSTests.xctest;
remoteRef = 56F5F6E32349F22A00C4D9F7 /* PBXContainerItemProxy */;
path = GRDBiOSTests.xctest;
remoteRef = 562697DF2438E05F00502C22 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -257,10 +255,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
56F5F6E62349F24D00C4D9F7 /* PBXTargetDependency */ = {
562697E22438E06A00502C22 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = GRDBCustomSQLiteOSX;
targetProxy = 56F5F6E52349F24D00C4D9F7 /* PBXContainerItemProxy */;
name = GRDBOSX;
targetProxy = 562697E12438E06A00502C22 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -10,7 +10,7 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "source &quot;${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-INSTALL.sh&quot;&#10;">
scriptText = "source &quot;${PROJECT_DIR}/GRDBCustomSQLite/GRDB-INSTALL.sh&quot;&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
@@ -1,5 +1,5 @@
import Cocoa
import GRDBCustomSQLite
import GRDB
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
@@ -4,11 +4,11 @@ GRDB_SOURCE_PATH="${PROJECT_DIR}/GRDB"
# The path to your custom "SQLiteLib-USER.xcconfig":
SQLITELIB_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/SQLiteLib-USER.xcconfig"
# The path to your custom "GRDBCustomSQLite-USER.xcconfig":
CUSTOMSQLITE_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.xcconfig"
# The path to your custom "GRDB-USER.xcconfig":
CUSTOMSQLITE_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDB-USER.xcconfig"
# The path to your custom "GRDBCustomSQLite-USER.h":
CUSTOMSQLITE_H_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.h"
# The path to your custom "GRDB-USER.h":
CUSTOMSQLITE_H_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDB-USER.h"
#######################################################
#
@@ -37,7 +37,7 @@ SyncFileChanges () {
}
SyncFileChanges $SQLITELIB_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom/src" "SQLiteLib-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_H_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.h"
SyncFileChanges $CUSTOMSQLITE_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDB-USER.xcconfig"
SyncFileChanges $CUSTOMSQLITE_H_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDB-USER.h"
echo "Finished syncing"