diff --git a/README.md b/README.md index fcba998dcf..d9544f8d18 100644 --- a/README.md +++ b/README.md @@ -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 extends the [SQLite](https://www.sqlite.org) database library to add security enhancements that make it more suitable for encrypted local data storage such as on-the-fly encryption, tamper evidence, and key derivation. Based on SQLite, SQLCipher closely tracks SQLite and periodically integrates stable SQLite release features. diff --git a/sqlcipher.xcconfig b/sqlcipher.xcconfig new file mode 100644 index 0000000000..eb641714cf --- /dev/null +++ b/sqlcipher.xcconfig @@ -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_FTS5 -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) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index b15edccc5b..cba798d642 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -22,21 +22,6 @@ /* Begin PBXBuildFile section */ 4C0041A61BFC3A5000ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041A51BFC3A5000ED2AD5 /* Security.framework */; }; - 4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041BC1BFC3C7500ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041BB1BFC3C7500ED2AD5 /* Security.framework */; }; - 4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041CE1BFC3D3900ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041CD1BFC3D3900ED2AD5 /* Security.framework */; }; - 4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041E01BFC3F0800ED2AD5 /* Security.framework */; }; - 4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; 9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; /* End PBXBuildFile section */ @@ -48,85 +33,23 @@ remoteGlobalIDString = 9069D08B0FCE185A0042E34C; remoteInfo = amalgamation; }; - 4C0041A11BFC392D00ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041B91BFC3C6E00ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041CB1BFC3D3000ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041DE1BFC3F0100ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041A51BFC3A5000ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4C0041A81BFC3A7E00ED2AD5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = macosx/Info.plist; sourceTree = ""; }; 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLCipher.h; path = macosx/SQLCipher.h; sourceTree = ""; }; - 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041BB1BFC3C7500ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041CD1BFC3D3900ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 4C0041D01BFC3D9A00ED2AD5 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "macosx/Info-tvOS.plist"; sourceTree = ""; }; - 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041E01BFC3F0800ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; - 9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; + 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlcipher.xcconfig; sourceTree = ""; }; + 9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../sqlite/sqlite3.c; sourceTree = BUILT_PRODUCTS_DIR; }; D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 4C0041941BFC382400ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AD1BFC3B2200ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041BC1BFC3C7500ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041BF1BFC3CC000ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041CE1BFC3D3900ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D21BFC3E2500ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -141,6 +64,7 @@ 08FB7794FE84155DC02AAC07 /* sqlcipher */ = { isa = PBXGroup; children = ( + 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */, 08FB7795FE84155DC02AAC07 /* Source */, 4C0041A41BFC3A3800ED2AD5 /* Supporting Files */, 4C0041A71BFC3A5400ED2AD5 /* Frameworks */, @@ -162,10 +86,6 @@ isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libsqlcipher.a */, - 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */, - 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */, - 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */, - 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */, ); name = Products; sourceTree = ""; @@ -194,42 +114,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 4C0041951BFC382400ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AE1BFC3B2200ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041C01BFC3CC000ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D31BFC3E2500ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -240,82 +124,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4C0041971BFC382400ED2AD5 /* SQLCipher iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C00419D1BFC382500ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher iOS" */; - buildPhases = ( - 4C0041931BFC382400ED2AD5 /* Sources */, - 4C0041941BFC382400ED2AD5 /* Frameworks */, - 4C0041951BFC382400ED2AD5 /* Headers */, - 4C0041961BFC382400ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041A21BFC392D00ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher iOS"; - productName = SQLCipher; - productReference = 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041B01BFC3B2200ED2AD5 /* SQLCipher OSX */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */; - buildPhases = ( - 4C0041AC1BFC3B2200ED2AD5 /* Sources */, - 4C0041AD1BFC3B2200ED2AD5 /* Frameworks */, - 4C0041AE1BFC3B2200ED2AD5 /* Headers */, - 4C0041AF1BFC3B2200ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041BA1BFC3C6E00ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher OSX"; - productName = "SQLCipher OSX"; - productReference = 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041C21BFC3CC000ED2AD5 /* SQLCipher tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */; - buildPhases = ( - 4C0041BE1BFC3CC000ED2AD5 /* Sources */, - 4C0041BF1BFC3CC000ED2AD5 /* Frameworks */, - 4C0041C01BFC3CC000ED2AD5 /* Headers */, - 4C0041C11BFC3CC000ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041CC1BFC3D3000ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher tvOS"; - productName = "SQLCipher tvOS"; - productReference = 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041D51BFC3E2500ED2AD5 /* SQLCipher watchOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */; - buildPhases = ( - 4C0041D11BFC3E2500ED2AD5 /* Sources */, - 4C0041D21BFC3E2500ED2AD5 /* Frameworks */, - 4C0041D31BFC3E2500ED2AD5 /* Headers */, - 4C0041D41BFC3E2500ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041DF1BFC3F0100ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher watchOS"; - productName = SQLCipher; - productReference = 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; D2AAC045055464E500DB518D /* sqlcipher */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "sqlcipher" */; @@ -341,20 +149,6 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0710; - TargetAttributes = { - 4C0041971BFC382400ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041B01BFC3B2200ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041C21BFC3CC000ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041D51BFC3E2500ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - }; }; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */; compatibilityVersion = "Xcode 3.2"; @@ -370,47 +164,12 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 4C0041971BFC382400ED2AD5 /* SQLCipher iOS */, - 4C0041B01BFC3B2200ED2AD5 /* SQLCipher OSX */, - 4C0041C21BFC3CC000ED2AD5 /* SQLCipher tvOS */, - 4C0041D51BFC3E2500ED2AD5 /* SQLCipher watchOS */, D2AAC045055464E500DB518D /* sqlcipher */, 9069D08B0FCE185A0042E34C /* amalgamation */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 4C0041961BFC382400ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AF1BFC3B2200ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041C11BFC3CC000ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D41BFC3E2500ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXShellScriptBuildPhase section */ 9069D08A0FCE185A0042E34C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -424,43 +183,11 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nmake sqlite3.c\nexit 0"; + shellScript = "set -e\n\necho \"Configure and generate SQLite amalgamation files\"\n\npattern=\" |'\"\nif [[ ${PROJECT_DIR} =~ $pattern ]]\nthen\necho \"Unsafe PROJECT_DIR for make - contains spaces.\"\necho \"PROJECT_DIR=${PROJECT_DIR}\"\nexit 1\nfi\n\n# Ensure we always run configure/make as if we were compiling for macOS (as parts of the\n# configure/make process require building & running an executable)\n#\n# The generated sqlite3.c will be built for the correct platform by Xcode via the\n# 'sqlitecustom' target\nSDK_PLATFORM_NAME=\"macosx\"\nMACOSX_VERSION_MIN=\"$(sw_vers -productVersion | cut -d '.' -f 1,2)\"\n\n\nSDKROOT=\"$(xcrun --sdk $SDK_PLATFORM_NAME --show-sdk-path)\"\nCC=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang)\"\nCXX=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang++)\"\nCFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_VERSION_MIN $OTHER_CFLAGS\"\nCXXFLAGS=$CFLAGS\nexport CC CXX CFLAGS CXXFLAGS\n\nmkdir -p \"${DERIVED_SOURCES_DIR}\"\ncd \"${DERIVED_SOURCES_DIR}\"\n\necho \"Clean-up previous files if necessary\"\n[ -e Makefile ] && make distclean\n\necho \"Configure makefile\"\n\"${PROJECT_DIR}/configure\" --srcdir=\"${PROJECT_DIR}/\" --enable-tempstore=yes --with-crypto-lib=commoncrypto\n\necho \"Make SQLite amalgamation\"\nmake sqlite3.c\n\n# copy generated amalgamation files (sqlite3.c and sqlite3.h)\n# to BUILD_DIR/sqlite\nSQLITE_OUTPUT_DIR=\"${BUILD_DIR}/sqlite\"\nmkdir -p \"${SQLITE_OUTPUT_DIR}\"\necho \"Copying sqlite3.c to ${SQLITE_OUTPUT_DIR}/sqlite3.c\"\ncp ./sqlite3.c \"${SQLITE_OUTPUT_DIR}/sqlite3.c\"\necho \"Copying sqlite3.h to ${PROJECT_DIR}/sqlite3.h\"\ncp ./sqlite3.h \"${PROJECT_DIR}/sqlite3.h\"\n\necho \"Finished generating SQLite amalgamation files\"\n"; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 4C0041931BFC382400ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AC1BFC3B2200ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041BE1BFC3CC000ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D11BFC3E2500ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -477,31 +204,12 @@ target = 9069D08B0FCE185A0042E34C /* amalgamation */; targetProxy = 289BE0E7180C4930003E52DA /* PBXContainerItemProxy */; }; - 4C0041A21BFC392D00ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041A11BFC392D00ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041BA1BFC3C6E00ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041B91BFC3C6E00ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041CC1BFC3D3000ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041CB1BFC3D3000ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041DF1BFC3F0100ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041DE1BFC3F0100ED2AD5 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; @@ -511,19 +219,6 @@ GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)"; INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); - "OTHER_CFLAGS[arch=armv6]" = ( - "-mno-thumb", - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; }; @@ -531,6 +226,7 @@ }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; @@ -538,23 +234,6 @@ GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)"; INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DNDEBUG", - "-DSQLITE_OS_UNIX=1", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); - "OTHER_CFLAGS[arch=armv6]" = ( - "-mno-thumb", - "-DSQLITE_HAS_CODEC", - "-DNDEBUG", - "-DSQLITE_OS_UNIX=1", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; }; @@ -580,13 +259,11 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; - "IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386"; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos appletvsimulator appletvos watchsimulator watchos"; + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386 armv7k"; }; name = Debug; }; @@ -608,609 +285,10 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; - "IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386"; - }; - name = Release; - }; - 4C00419E1BFC382500ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VALUE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "arm64 armv7 armv7s"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C00419F1BFC382500ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VALUE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "arm64 armv7 armv7s"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041B71BFC3B2200ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "i386 x86_64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041B81BFC3B2200ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = macosx; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "i386 x86_64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041C91BFC3CC000ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "macosx/Info-tvOS.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = arm64; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041CA1BFC3CC000ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "macosx/Info-tvOS.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = arm64; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041DC1BFC3E2600ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = armv7k; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041DD1BFC3E2600ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos"; - TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = armv7k; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos appletvsimulator appletvos watchsimulator watchos"; + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386 armv7k"; }; name = Release; }; @@ -1261,42 +339,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4C00419D1BFC382500ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C00419E1BFC382500ED2AD5 /* Debug */, - 4C00419F1BFC382500ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041B71BFC3B2200ED2AD5 /* Debug */, - 4C0041B81BFC3B2200ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041C91BFC3CC000ED2AD5 /* Debug */, - 4C0041CA1BFC3CC000ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041DC1BFC3E2600ED2AD5 /* Debug */, - 4C0041DD1BFC3E2600ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9069D0900FCE18970042E34C /* Build configuration list for PBXAggregateTarget "amalgamation" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme deleted file mode 100644 index a988b2bcd4..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme deleted file mode 100644 index 9104d67653..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme deleted file mode 100644 index db6e6d9502..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme similarity index 82% rename from sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme rename to sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme index a1b6956eb0..cbc2bfc99d 100644 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme +++ b/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme @@ -1,6 +1,6 @@ @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -45,9 +47,9 @@ @@ -63,9 +65,9 @@