Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iOS builds from command line #1

Closed
wants to merge 10 commits into from
Closed

Fix iOS builds from command line #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5801f0
Xcode: extract OTHER_CFLAGS into xcconfig file
groue Apr 4, 2016
53dae01
Xcode: add the -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT compilation option
groue Apr 4, 2016
0be84c5
Use the same compilation options as Apple-provided sqlite3.
groue Apr 4, 2016
0b82b2f
Adapt deployment targets for GRDB
groue Apr 5, 2016
d1e8afc
README.md
groue Apr 5, 2016
4f5bec0
https://github.com/groue/GRDB.swift/issues/41
groue Apr 25, 2016
36cad0b
Merge commit '85a407e259d9ac73de3937e1f0bc25771a0509eb'
groue Jul 30, 2016
01b0517
Revert "https://github.com/groue/GRDB.swift/issues/41"
groue May 4, 2017
c0f2d70
Fix iOS builds from command line (xcodebuild)
darrenclark Oct 9, 2017
5276bcd
Project file changes
darrenclark Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
This repository is a fork of https://github.com/sqlcipher/sqlcipher which adapts SQLCipher for https://github.com/groue/GRDB.swift.

---

## SQLCipher

SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of
Expand Down
15 changes: 15 additions & 0 deletions sqlcipher.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// GRDBCipherOSX targets OS X 10.9
MACOSX_DEPLOYMENT_TARGET = 10.9

// GRDBCipheriOS targets iOS 8.0
IPHONEOS_DEPLOYMENT_TARGET = 8.0

// Compiler flags used by stock sqlite3 shipped with Apple operating systems
SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_CC -DSQLITE_ENABLE_API_ARMOR -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=1 -DSQLITE_ENABLE_RTREE -DSQLITE_OMIT_AUTORESET -DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_SYSTEM_MALLOC -DSQLITE_THREADSAFE=2
SQLCIPHER_RELEASE_CFLAGS = -DNDEBUG -DSQLITE_OS_UNIX=1
SQLCIPHER_ARMV6_CFLAGS = -mno-thumb

OTHER_CFLAGS = $(SQLCIPHER_CFLAGS)
OTHER_CFLAGS[arch=armv6] = $(SQLCIPHER_ARMV6_CFLAGS) $(SQLCIPHER_CFLAGS)
OTHER_CFLAGS[config=Release] = $(SQLCIPHER_CFLAGS) $(SQLCIPHER_RELEASE_CFLAGS)
OTHER_CFLAGS[config=Release][arch=armv6] = $(SQLCIPHER_ARMV6_CFLAGS) $(SQLCIPHER_CFLAGS) $(SQLCIPHER_RELEASE_CFLAGS)
978 changes: 10 additions & 968 deletions sqlcipher.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 0 additions & 80 deletions sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme
View file
Open in desktop

This file was deleted.

22 changes: 12 additions & 10 deletions ...areddata/xcschemes/SQLCipher OSX.xcscheme → ...xcshareddata/xcschemes/sqlcipher.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C0041B01BFC3B2200ED2AD5"
BuildableName = "SQLCipher.framework"
BlueprintName = "SQLCipher OSX"
BlueprintIdentifier = "D2AAC045055464E500DB518D"
BuildableName = "libsqlcipher.a"
BlueprintName = "sqlcipher"
ReferencedContainer = "container:sqlcipher.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -36,6 +37,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -45,9 +47,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C0041B01BFC3B2200ED2AD5"
BuildableName = "SQLCipher.framework"
BlueprintName = "SQLCipher OSX"
BlueprintIdentifier = "D2AAC045055464E500DB518D"
BuildableName = "libsqlcipher.a"
BlueprintName = "sqlcipher"
ReferencedContainer = "container:sqlcipher.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -63,9 +65,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C0041B01BFC3B2200ED2AD5"
BuildableName = "SQLCipher.framework"
BlueprintName = "SQLCipher OSX"
BlueprintIdentifier = "D2AAC045055464E500DB518D"
BuildableName = "libsqlcipher.a"
BlueprintName = "sqlcipher"
ReferencedContainer = "container:sqlcipher.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down