Skip to content

Commit 0b132f7

Browse files
welsonlawelsonla
committed
run on the OSX 10.9 and build with Xcode5
1 parent 3bc09b8 commit 0b132f7

File tree

367 files changed

+47859
-7748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+47859
-7748
lines changed

‎SQLCipherManager.xcodeproj/project.pbxproj‎

Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,44 @@
2121
0E7551D0178D321B004DF8FC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0E7551CE178D321B004DF8FC /* InfoPlist.strings */; };
2222
0E7551D3178D321B004DF8FC /* SQLCipherManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E7551D2178D321B004DF8FC /* SQLCipherManagerTests.m */; };
2323
0E7BEA8B17979BDD00444DFB /* app.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0E7BEA8A17979BDD00444DFB /* app.icns */; };
24-
0EB01ECD178E9AC400752D12 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB01ECC178E9AC300752D12 /* libsqlite3.dylib */; };
25-
0EE008F3185AE1B70033A622 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E12A6AC183DAE0800192C6B /* libcrypto.a */; };
26-
0EE008F4185AE1B70033A622 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E9F807A185ADD550096C269 /* libsqlcipher.a */; };
24+
8BAC2EC61866E78800C85A4C /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B2138531866DC0300BEB00D /* libsqlcipher.a */; };
25+
8BAC2ECC1866EA8E00C85A4C /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B2138531866DC0300BEB00D /* libsqlcipher.a */; };
26+
8BAC2ED01866EDE600C85A4C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BAC2ECF1866EDE600C85A4C /* Security.framework */; };
27+
8BAC2ED11866EDEE00C85A4C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E7551AD178D321A004DF8FC /* Foundation.framework */; };
2728
/* End PBXBuildFile section */
2829

2930
/* Begin PBXContainerItemProxy section */
30-
0E12A6AB183DAE0800192C6B /* PBXContainerItemProxy */ = {
31-
isa = PBXContainerItemProxy;
32-
containerPortal = 0E12A6A7183DAE0800192C6B /* openssl.xcodeproj */;
33-
proxyType = 2;
34-
remoteGlobalIDString = 9069D28C0FCE659A0042E34C;
35-
remoteInfo = crypto;
36-
};
37-
0E12A6B8183DAE7300192C6B /* PBXContainerItemProxy */ = {
38-
isa = PBXContainerItemProxy;
39-
containerPortal = 0E12A6A7183DAE0800192C6B /* openssl.xcodeproj */;
40-
proxyType = 1;
41-
remoteGlobalIDString = 9069D28B0FCE659A0042E34C;
42-
remoteInfo = crypto;
43-
};
4431
0E7551C9178D321B004DF8FC /* PBXContainerItemProxy */ = {
4532
isa = PBXContainerItemProxy;
4633
containerPortal = 0E75519D178D3219004DF8FC /* Project object */;
4734
proxyType = 1;
4835
remoteGlobalIDString = 0E7551A4178D3219004DF8FC;
4936
remoteInfo = SQLCipherManager;
5037
};
51-
0E9F8079185ADD550096C269 /* PBXContainerItemProxy */ = {
38+
8B2138521866DC0300BEB00D /* PBXContainerItemProxy */ = {
5239
isa = PBXContainerItemProxy;
53-
containerPortal = 0E9F8074185ADD550096C269 /* sqlcipher.xcodeproj */;
40+
containerPortal = 8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */;
5441
proxyType = 2;
5542
remoteGlobalIDString = D2AAC046055464E500DB518D;
5643
remoteInfo = sqlcipher;
5744
};
58-
0EE008EF185AE1B10033A622 /* PBXContainerItemProxy */ = {
45+
8BAC2EC71866E78D00C85A4C /* PBXContainerItemProxy */ = {
46+
isa = PBXContainerItemProxy;
47+
containerPortal = 8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */;
48+
proxyType = 1;
49+
remoteGlobalIDString = D2AAC045055464E500DB518D;
50+
remoteInfo = sqlcipher;
51+
};
52+
8BAC2ECA1866EA8B00C85A4C /* PBXContainerItemProxy */ = {
5953
isa = PBXContainerItemProxy;
60-
containerPortal = 0E9F8074185ADD550096C269 /* sqlcipher.xcodeproj */;
54+
containerPortal = 8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */;
6155
proxyType = 1;
6256
remoteGlobalIDString = D2AAC045055464E500DB518D;
6357
remoteInfo = sqlcipher;
6458
};
6559
/* End PBXContainerItemProxy section */
6660

6761
/* Begin PBXFileReference section */
68-
0E12A6A7183DAE0800192C6B /* openssl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openssl.xcodeproj; path = "openssl-xcode/openssl.xcodeproj"; sourceTree = "<group>"; };
6962
0E12A6BA183DAFEB00192C6B /* Utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utility.h; sourceTree = "<group>"; };
7063
0E12A6BB183DAFEB00192C6B /* Utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utility.m; sourceTree = "<group>"; };
7164
0E59C12617B4E7FB00124089 /* SQLExcuteWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLExcuteWindow.h; sourceTree = "<group>"; };
@@ -91,18 +84,20 @@
9184
0E7551D1178D321B004DF8FC /* SQLCipherManagerTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLCipherManagerTests.h; sourceTree = "<group>"; };
9285
0E7551D2178D321B004DF8FC /* SQLCipherManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SQLCipherManagerTests.m; sourceTree = "<group>"; };
9386
0E7BEA8A17979BDD00444DFB /* app.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = app.icns; sourceTree = "<group>"; };
94-
0E9F8074185ADD550096C269 /* sqlcipher.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlcipher.xcodeproj; path = "sqlcipher-2.1.1/sqlcipher.xcodeproj"; sourceTree = "<group>"; };
9587
0EB01ECC178E9AC300752D12 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
88+
8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlcipher.xcodeproj; path = sqlcipher/sqlcipher.xcodeproj; sourceTree = "<group>"; };
89+
8BAC2ECF1866EDE600C85A4C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
90+
8BAC2ED21866EDF900C85A4C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
9691
/* End PBXFileReference section */
9792

9893
/* Begin PBXFrameworksBuildPhase section */
9994
0E7551A2178D3219004DF8FC /* Frameworks */ = {
10095
isa = PBXFrameworksBuildPhase;
10196
buildActionMask = 2147483647;
10297
files = (
103-
0EE008F3185AE1B70033A622 /* libcrypto.a in Frameworks */,
104-
0EE008F4185AE1B70033A622 /* libsqlcipher.a in Frameworks */,
105-
0EB01ECD178E9AC400752D12 /* libsqlite3.dylib in Frameworks */,
98+
8BAC2ED11866EDEE00C85A4C /* Foundation.framework in Frameworks */,
99+
8BAC2ED01866EDE600C85A4C /* Security.framework in Frameworks */,
100+
8BAC2ECC1866EA8E00C85A4C /* libsqlcipher.a in Frameworks */,
106101
0E7551A9178D321A004DF8FC /* Cocoa.framework in Frameworks */,
107102
);
108103
runOnlyForDeploymentPostprocessing = 0;
@@ -111,6 +106,7 @@
111106
isa = PBXFrameworksBuildPhase;
112107
buildActionMask = 2147483647;
113108
files = (
109+
8BAC2EC61866E78800C85A4C /* libsqlcipher.a in Frameworks */,
114110
0E7551C7178D321B004DF8FC /* SenTestingKit.framework in Frameworks */,
115111
0E7551C8178D321B004DF8FC /* Cocoa.framework in Frameworks */,
116112
);
@@ -122,20 +118,11 @@
122118
0E129EA1183DADC300192C6B /* lib */ = {
123119
isa = PBXGroup;
124120
children = (
125-
0E9F8074185ADD550096C269 /* sqlcipher.xcodeproj */,
126-
0E12A6A7183DAE0800192C6B /* openssl.xcodeproj */,
121+
8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */,
127122
);
128123
path = lib;
129124
sourceTree = "<group>";
130125
};
131-
0E12A6A8183DAE0800192C6B /* Products */ = {
132-
isa = PBXGroup;
133-
children = (
134-
0E12A6AC183DAE0800192C6B /* libcrypto.a */,
135-
);
136-
name = Products;
137-
sourceTree = "<group>";
138-
};
139126
0E75519C178D3219004DF8FC = {
140127
isa = PBXGroup;
141128
children = (
@@ -160,6 +147,8 @@
160147
0E7551A7178D3219004DF8FC /* Frameworks */ = {
161148
isa = PBXGroup;
162149
children = (
150+
8BAC2ED21866EDF900C85A4C /* CoreGraphics.framework */,
151+
8BAC2ECF1866EDE600C85A4C /* Security.framework */,
163152
0EB01ECC178E9AC300752D12 /* libsqlite3.dylib */,
164153
0E7551A8178D3219004DF8FC /* Cocoa.framework */,
165154
0E7551C6178D321A004DF8FC /* SenTestingKit.framework */,
@@ -225,10 +214,10 @@
225214
name = "Supporting Files";
226215
sourceTree = "<group>";
227216
};
228-
0E9F8075185ADD550096C269 /* Products */ = {
217+
8B21384E1866DC0300BEB00D /* Products */ = {
229218
isa = PBXGroup;
230219
children = (
231-
0E9F807A185ADD550096C269 /* libsqlcipher.a */,
220+
8B2138531866DC0300BEB00D /* libsqlcipher.a */,
232221
);
233222
name = Products;
234223
sourceTree = "<group>";
@@ -247,8 +236,7 @@
247236
buildRules = (
248237
);
249238
dependencies = (
250-
0EE008F0185AE1B10033A622 /* PBXTargetDependency */,
251-
0E12A6B9183DAE7300192C6B /* PBXTargetDependency */,
239+
8BAC2ECB1866EA8B00C85A4C /* PBXTargetDependency */,
252240
);
253241
name = SQLCipherManager;
254242
productName = SQLCipherManager;
@@ -267,6 +255,7 @@
267255
buildRules = (
268256
);
269257
dependencies = (
258+
8BAC2EC81866E78D00C85A4C /* PBXTargetDependency */,
270259
0E7551CA178D321B004DF8FC /* PBXTargetDependency */,
271260
);
272261
name = SQLCipherManagerTests;
@@ -295,12 +284,8 @@
295284
projectDirPath = "";
296285
projectReferences = (
297286
{
298-
ProductGroup = 0E12A6A8183DAE0800192C6B /* Products */;
299-
ProjectRef = 0E12A6A7183DAE0800192C6B /* openssl.xcodeproj */;
300-
},
301-
{
302-
ProductGroup = 0E9F8075185ADD550096C269 /* Products */;
303-
ProjectRef = 0E9F8074185ADD550096C269 /* sqlcipher.xcodeproj */;
287+
ProductGroup = 8B21384E1866DC0300BEB00D /* Products */;
288+
ProjectRef = 8B21384D1866DC0300BEB00D /* sqlcipher.xcodeproj */;
304289
},
305290
);
306291
projectRoot = "";
@@ -312,18 +297,11 @@
312297
/* End PBXProject section */
313298

314299
/* Begin PBXReferenceProxy section */
315-
0E12A6AC183DAE0800192C6B /* libcrypto.a */ = {
316-
isa = PBXReferenceProxy;
317-
fileType = archive.ar;
318-
path = libcrypto.a;
319-
remoteRef = 0E12A6AB183DAE0800192C6B /* PBXContainerItemProxy */;
320-
sourceTree = BUILT_PRODUCTS_DIR;
321-
};
322-
0E9F807A185ADD550096C269 /* libsqlcipher.a */ = {
300+
8B2138531866DC0300BEB00D /* libsqlcipher.a */ = {
323301
isa = PBXReferenceProxy;
324302
fileType = archive.ar;
325303
path = libsqlcipher.a;
326-
remoteRef = 0E9F8079185ADD550096C269 /* PBXContainerItemProxy */;
304+
remoteRef = 8B2138521866DC0300BEB00D /* PBXContainerItemProxy */;
327305
sourceTree = BUILT_PRODUCTS_DIR;
328306
};
329307
/* End PBXReferenceProxy section */
@@ -390,20 +368,20 @@
390368
/* End PBXSourcesBuildPhase section */
391369

392370
/* Begin PBXTargetDependency section */
393-
0E12A6B9183DAE7300192C6B /* PBXTargetDependency */ = {
394-
isa = PBXTargetDependency;
395-
name = crypto;
396-
targetProxy = 0E12A6B8183DAE7300192C6B /* PBXContainerItemProxy */;
397-
};
398371
0E7551CA178D321B004DF8FC /* PBXTargetDependency */ = {
399372
isa = PBXTargetDependency;
400373
target = 0E7551A4178D3219004DF8FC /* SQLCipherManager */;
401374
targetProxy = 0E7551C9178D321B004DF8FC /* PBXContainerItemProxy */;
402375
};
403-
0EE008F0185AE1B10033A622 /* PBXTargetDependency */ = {
376+
8BAC2EC81866E78D00C85A4C /* PBXTargetDependency */ = {
377+
isa = PBXTargetDependency;
378+
name = sqlcipher;
379+
targetProxy = 8BAC2EC71866E78D00C85A4C /* PBXContainerItemProxy */;
380+
};
381+
8BAC2ECB1866EA8B00C85A4C /* PBXTargetDependency */ = {
404382
isa = PBXTargetDependency;
405383
name = sqlcipher;
406-
targetProxy = 0EE008EF185AE1B10033A622 /* PBXContainerItemProxy */;
384+
targetProxy = 8BAC2ECA1866EA8B00C85A4C /* PBXContainerItemProxy */;
407385
};
408386
/* End PBXTargetDependency section */
409387

@@ -469,6 +447,8 @@
469447
GCC_WARN_ABOUT_RETURN_TYPE = YES;
470448
GCC_WARN_UNINITIALIZED_AUTOS = YES;
471449
GCC_WARN_UNUSED_VARIABLE = YES;
450+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/lib/sqlcipher\"";
451+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
472452
MACOSX_DEPLOYMENT_TARGET = 10.7;
473453
ONLY_ACTIVE_ARCH = YES;
474454
SDKROOT = macosx;
@@ -495,6 +475,8 @@
495475
GCC_WARN_ABOUT_RETURN_TYPE = YES;
496476
GCC_WARN_UNINITIALIZED_AUTOS = YES;
497477
GCC_WARN_UNUSED_VARIABLE = YES;
478+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/lib/sqlcipher\"";
479+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
498480
MACOSX_DEPLOYMENT_TARGET = 10.7;
499481
SDKROOT = macosx;
500482
};
@@ -506,10 +488,15 @@
506488
COMBINE_HIDPI_IMAGES = YES;
507489
GCC_PRECOMPILE_PREFIX_HEADER = YES;
508490
GCC_PREFIX_HEADER = "SQLCipherManager/SQLCipherManager-Prefix.pch";
509-
HEADER_SEARCH_PATHS = sqlcipher;
491+
HEADER_SEARCH_PATHS = "$(SRCROOT)/lib/sqlcipher";
510492
INFOPLIST_FILE = "SQLCipherManager/SQLCipherManager-Info.plist";
493+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
511494
MACOSX_DEPLOYMENT_TARGET = 10.7;
512-
OTHER_CFLAGS = "-DSQLITE_HAS_CODEC";
495+
OTHER_CFLAGS = "";
496+
OTHER_LDFLAGS = (
497+
"-ObjC",
498+
"-all_load",
499+
);
513500
PRODUCT_NAME = SQLCipherTools;
514501
WRAPPER_EXTENSION = app;
515502
};
@@ -521,10 +508,15 @@
521508
COMBINE_HIDPI_IMAGES = YES;
522509
GCC_PRECOMPILE_PREFIX_HEADER = YES;
523510
GCC_PREFIX_HEADER = "SQLCipherManager/SQLCipherManager-Prefix.pch";
524-
HEADER_SEARCH_PATHS = sqlcipher;
511+
HEADER_SEARCH_PATHS = "$(SRCROOT)/lib/sqlcipher";
525512
INFOPLIST_FILE = "SQLCipherManager/SQLCipherManager-Info.plist";
513+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
526514
MACOSX_DEPLOYMENT_TARGET = 10.7;
527-
OTHER_CFLAGS = "-DSQLITE_HAS_CODEC";
515+
OTHER_CFLAGS = "";
516+
OTHER_LDFLAGS = (
517+
"-ObjC",
518+
"-all_load",
519+
);
528520
PRODUCT_NAME = SQLCipherTools;
529521
WRAPPER_EXTENSION = app;
530522
};
@@ -538,7 +530,13 @@
538530
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
539531
GCC_PRECOMPILE_PREFIX_HEADER = YES;
540532
GCC_PREFIX_HEADER = "SQLCipherManager/SQLCipherManager-Prefix.pch";
533+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/lib/sqlcipher\"";
541534
INFOPLIST_FILE = "SQLCipherManagerTests/SQLCipherManagerTests-Info.plist";
535+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
536+
OTHER_LDFLAGS = (
537+
"-ObjC",
538+
"-all_load",
539+
);
542540
PRODUCT_NAME = "$(TARGET_NAME)";
543541
TEST_HOST = "$(BUNDLE_LOADER)";
544542
WRAPPER_EXTENSION = octest;
@@ -553,7 +551,13 @@
553551
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
554552
GCC_PRECOMPILE_PREFIX_HEADER = YES;
555553
GCC_PREFIX_HEADER = "SQLCipherManager/SQLCipherManager-Prefix.pch";
554+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/lib/sqlcipher\"";
556555
INFOPLIST_FILE = "SQLCipherManagerTests/SQLCipherManagerTests-Info.plist";
556+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
557+
OTHER_LDFLAGS = (
558+
"-ObjC",
559+
"-all_load",
560+
);
557561
PRODUCT_NAME = "$(TARGET_NAME)";
558562
TEST_HOST = "$(BUNDLE_LOADER)";
559563
WRAPPER_EXTENSION = octest;

‎lib/sqlcipher-2.1.1/.gitignore‎

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

‎lib/sqlcipher-2.1.1/VERSION‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/sqlcipher-2.1.1/manifest.uuid‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)