Xcode build changed to use system version of sqlite3 rather than a custom one

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1369 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/SQLite3/ChangeLog b/sope-gdl1/SQLite3/ChangeLog
index 7bc845651709bae3ae09ee60ab4fa2b8ec061992..c13d1ab4ff5bdca42f49fb6eff7e31db4e4c970a 100644 (file)
--- a/sope-gdl1/SQLite3/ChangeLog
+++ b/sope-gdl1/SQLite3/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SQLite3.xcodeproj: link against the system version of sqlite3 rather
+         than a custom version in /usr/local.
+
 2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
 
        * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.21)

diff --git a/sope-gdl1/SQLite3/SQLite3-Info.plist b/sope-gdl1/SQLite3/SQLite3-Info.plist
index f36052eb1adc4061fc9a46474639a516adef0ede..87e4000b6917a08214fe836e46fd50549d7bbde5 100644 (file)
--- a/sope-gdl1/SQLite3/SQLite3-Info.plist
+++ b/sope-gdl1/SQLite3/SQLite3-Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>4.5.12</string>
+       <string>4.5.21</string>
        <key>NSPrincipalClass</key>
        <string>SQLite3Adaptor</string>
 </dict>

diff --git a/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj b/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj
index e03c085a171da5ca396b0164a140487a93fac3c9..c2add7eb246fc9b98d0a42a0f64804731b9cb630 100644 (file)
--- a/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj
+++ b/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj
@@ -29,55 +29,9 @@
                AD50D75707C9ED1E00C9F415 /* SQLiteExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = AD50D73F07C9ED1E00C9F415 /* SQLiteExpression.m */; };
                AD50D75907C9ED1E00C9F415 /* SQLiteValues.m in Sources */ = {isa = PBXBuildFile; fileRef = AD50D74107C9ED1E00C9F415 /* SQLiteValues.m */; };
                AD50D75B07C9ED9B00C9F415 /* README in Resources */ = {isa = PBXBuildFile; fileRef = AD013B8706E20AC5000910D8 /* README */; };
+               ADFF76200AF531A600AC953A /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF761F0AF531A600AC953A /* libsqlite3.dylib */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               ADD65B6806DA32D6007161CA /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                                       "DEBUG=1",
-                               );
-                       };
-                       name = Development;
-               };
-               ADD65B6906DA32D6007161CA /* Wrapper */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEPLOYMENT_LOCATION = NO;
-                               DEPLOYMENT_POSTPROCESSING = YES;
-                               DSTROOT = /;
-                               DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
-                               FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                               );
-                               SKIP_INSTALL = YES;
-                               SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build";
-                               UNSTRIPPED_PRODUCT = NO;
-                               ZERO_LINK = NO;
-                       };
-                       name = Wrapper;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXFileReference section */
                AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                AD013C2106E20D18000910D8 /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGStreams.framework"; sourceTree = "<absolute>"; };
@@ -121,6 +75,7 @@
                ADD65FE606DA3CDE007161CA /* SaxObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SaxObjC.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/SaxObjC.framework"; sourceTree = "<absolute>"; };
                ADD65FE706DA3CDE007161CA /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/XmlRpc.framework"; sourceTree = "<absolute>"; };
                ADD6610D06DA3D1F007161CA /* EOControl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EOControl.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/EOControl.framework"; sourceTree = "<absolute>"; };
+               ADFF761F0AF531A600AC953A /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = /usr/lib/libsqlite3.dylib; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -135,6 +90,7 @@
                                AD50D6AF07C9EC2A00C9F415 /* EOControl.framework in Frameworks */,
                                AD50D6C207C9EC2D00C9F415 /* NGExtensions.framework in Frameworks */,
                                AD50D72307C9EC9900C9F415 /* GDLAccess.framework in Frameworks */,
+                               ADFF76200AF531A600AC953A /* libsqlite3.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -180,6 +136,7 @@
                ADD65B6606DA32D6007161CA = {
                        isa = PBXGroup;
                        children = (
+                               ADFF761F0AF531A600AC953A /* libsqlite3.dylib */,
                                AD013B8706E20AC5000910D8 /* README */,
                                AD50D72707C9ECD600C9F415 /* COPYING.LIB */,
                                ADD65C6F06DA343C007161CA /* ChangeLog */,
@@ -278,45 +235,11 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = common.h;
-                               HEADER_SEARCH_PATHS = /usr/local/include;
-                               INFOPLIST_FILE = "SQLite3-Info.plist";
-                               INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5";
-                               LIBRARY_SEARCH_PATHS = /usr/local/lib;
-                               OTHER_LDFLAGS = "-lsqlite3";
-                               PRODUCT_NAME = SQLite3;
-                               WARNING_CFLAGS = "-Wmost";
-                               WRAPPER_EXTENSION = gdladaptor;
-                       };
                        dependencies = (
                        );
                        name = SQLite3;
                        productName = SQLite3;
                        productReference = AD50D60207C9EB8500C9F415 /* SQLite3.gdladaptor */;
-                       productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>SQLite3</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.SQLite3</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-</dict>
-</plist>
-";
                        productType = "com.apple.product-type.bundle";
                };
 /* End PBXNativeTarget section */
@@ -325,12 +248,6 @@
                ADD65B6A06DA32D6007161CA /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = ADA07A090857392D00993825 /* Build configuration list for PBXProject "SQLite3" */;
-                       buildSettings = {
-                       };
-                       buildStyles = (
-                               ADD65B6806DA32D6007161CA /* Development */,
-                               ADD65B6906DA32D6007161CA /* Wrapper */,
-                       );
                        hasScannedForEncodings = 0;
                        mainGroup = ADD65B6606DA32D6007161CA;
                        productRefGroup = ADD65D5906DA372D007161CA /* Products */;
@@ -394,11 +311,8 @@
                                        "COMPILE_AS_FRAMEWORK=1",
                                        "DEBUG=1",
                                );
-                               HEADER_SEARCH_PATHS = /usr/local/include;
                                INFOPLIST_FILE = "SQLite3-Info.plist";
                                INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5";
-                               LIBRARY_SEARCH_PATHS = /usr/local/lib;
-                               OTHER_LDFLAGS = "-lsqlite3";
                                PRODUCT_NAME = SQLite3;
                                WARNING_CFLAGS = "-Wmost";
                                WRAPPER_EXTENSION = gdladaptor;
@@ -426,11 +340,8 @@
                                        "NeXT_RUNTIME=1",
                                        "COMPILE_AS_FRAMEWORK=1",
                                );
-                               HEADER_SEARCH_PATHS = /usr/local/include;
                                INFOPLIST_FILE = "SQLite3-Info.plist";
                                INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5";
-                               LIBRARY_SEARCH_PATHS = /usr/local/lib;
-                               OTHER_LDFLAGS = "-lsqlite3";
                                PRODUCT_NAME = SQLite3;
                                SKIP_INSTALL = YES;
                                SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
@@ -448,11 +359,8 @@
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = common.h;
-                               HEADER_SEARCH_PATHS = /usr/local/include;
                                INFOPLIST_FILE = "SQLite3-Info.plist";
                                INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5";
-                               LIBRARY_SEARCH_PATHS = /usr/local/lib;
-                               OTHER_LDFLAGS = "-lsqlite3";
                                PRODUCT_NAME = SQLite3;
                                WARNING_CFLAGS = "-Wmost";
                                WRAPPER_EXTENSION = gdladaptor;