Menu
▾
▴
SF.net SVN: frontierkernel:[1789] Frontier/trunk
|
From: <and...@us...> - 2008-09-14 20:19:31
|
Revision: 1789
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1789&view=rev
Author: andreradke
Date: 2008-09-14 20:19:40 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
Add preprocessor macro for enabling/disabling sqlite and mysql support. Update OPML Editor build configuration for Xcode.
Modified Paths:
--------------
Frontier/trunk/Common/headers/frontierdefs.h
Frontier/trunk/Common/source/langmysql.c
Frontier/trunk/Common/source/langsqlite.c
Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
Modified: Frontier/trunk/Common/headers/frontierdefs.h
===================================================================
--- Frontier/trunk/Common/headers/frontierdefs.h 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/headers/frontierdefs.h 2008-09-14 20:19:40 UTC (rev 1789)
@@ -110,6 +110,10 @@
#define Rez true
#define DeRez false
+#ifndef OPMLEDITOR /*2008-09-08 aradke: keep opml editor lean and mean*/
+ #define FRONTIER_MYSQL 1 /*include mysql database client library*/
+ #define FRONTIER_SQLITE 1 /*include sqlite database code*/
+#endif
#define SystemSevenOrLater 1
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/source/langmysql.c 2008-09-14 20:19:40 UTC (rev 1789)
@@ -42,14 +42,11 @@
#include "oplist.h"
#include "langsystem7.h"
-// #ifdef WIN95VERSION
+#include "langmysql.h"
-// #include "my_global.h"
-
-// #endif // WIN95VERSION
-
+#ifdef FRONTIER_MYSQL
#include "mysql.h"
-#include "langmysql.h"
+#endif
/*
@@ -110,6 +107,8 @@
setbooleanvalue ( false, v ); // by default, sqlite functions return false
switch ( token ) {
+
+#ifdef FRONTIER_MYSQL
case initfunc: // initialize MySQL
@@ -218,6 +217,8 @@
case closefunc: // close a MySQL db
return ( mysqlcloseverb ( hp1, v, bserror ) );
+
+#endif
default:
@@ -236,6 +237,7 @@
} /* mysqlinitverbs */
+#ifdef FRONTIER_MYSQL
boolean mysqlinitverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
@@ -1776,3 +1778,5 @@
} /* mysqlisthreadsafeverb */
+#endif /*FRONTIER_MYSQL*/
+
Modified: Frontier/trunk/Common/source/langsqlite.c
===================================================================
--- Frontier/trunk/Common/source/langsqlite.c 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/Common/source/langsqlite.c 2008-09-14 20:19:40 UTC (rev 1789)
@@ -44,6 +44,9 @@
#include "langexternal.h"
#include "langsqlite.h"
+
+#ifdef FRONTIER_SQLITE
+
#include <sqlite3.h>
#ifdef MACVERSION
@@ -60,6 +63,7 @@
#endif // WIN95VERSION
+#endif
/* Building SQLite into Frontier
@@ -125,7 +129,9 @@
setbooleanvalue (false, v); /* by default, sqlite functions return false */
switch (token) {
-
+
+#ifdef FRONTIER_SQLITE
+
case openfunc: { /* 2006-03-14 gewirtz: open an SQLite db */
return (sqliteopenverb (hp1, v, bserror));
@@ -209,6 +215,8 @@
return ( getlastinsertrowidverb ( hp1, v, bserror ) );
+#endif
+
default:
getstringlist (langerrorlist, unimplementedverberror, bserror);
@@ -227,6 +235,7 @@
return (loadfunctionprocessor (idsqliteverbs, &sqlitefunctionvalue));
} /* sqliteinitverbs */
+#ifdef FRONTIER_SQLITE
static void sqliteOpenError (const char *errmsg, bigstring bserror) {
bigstring bserrmsg;
@@ -1218,3 +1227,5 @@
} // getlastinsertrowidverb
+#endif /*FRONTIER_SQLITE*/
+
Modified: Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2008-09-14 20:19:40 UTC (rev 1789)
@@ -1059,6 +1059,12 @@
65B70CEA0797CF78008C2F1A /* FastTimes.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B70CE90797CF78008C2F1A /* FastTimes.h */; };
65BBB662072E563B008E2F34 /* frontier.r in Rez */ = {isa = PBXBuildFile; fileRef = 65BBB661072E563B008E2F34 /* frontier.r */; };
65BBB664072E5643008E2F34 /* frontierdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BBB663072E5643008E2F34 /* frontierdefs.h */; };
+ 65C4999B0E7D8F2B0078B6DB /* FSCopyObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91000ADEDFA80000E67B /* FSCopyObject.c */; };
+ 65C4999E0E7D8F320078B6DB /* FSCopyObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91010ADEDFA80000E67B /* FSCopyObject.h */; };
+ 65C499A10E7D8F360078B6DB /* GenLinkedList.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0D91020ADEDFA80000E67B /* GenLinkedList.c */; };
+ 65C499A40E7D8F3A0078B6DB /* GenLinkedList.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D0D91030ADEDFA80000E67B /* GenLinkedList.h */; };
+ 65C499A70E7D8F450078B6DB /* langsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D4E1E470AAA17E900DF6890 /* langsqlite.c */; };
+ 65C499AA0E7D8F4C0078B6DB /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D8F1EF30C25B51A00927B97 /* langmysql.c */; };
65D516AB072CED430097D18E /* frontier.xcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D516AA072CED430097D18E /* frontier.xcode.h */; };
65F9C22009C4CD9800DCC29E /* sha_locl.h in Headers */ = {isa = PBXBuildFile; fileRef = 65F9C21E09C4CD9700DCC29E /* sha_locl.h */; };
65F9C22109C4CD9800DCC29E /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = 65F9C21F09C4CD9700DCC29E /* sha.h */; };
@@ -1155,7 +1161,7 @@
5D8F1EF30C25B51A00927B97 /* langmysql.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = langmysql.c; path = ../Common/source/langmysql.c; sourceTree = SOURCE_ROOT; };
5D8F1EF60C25B56600927B97 /* langmysql.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = langmysql.h; path = ../Common/headers/langmysql.h; sourceTree = SOURCE_ROOT; };
5DCA3B0B0AF552C700D6155D /* libpaigefat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpaigefat.a; path = tools/libpaigefat.a; sourceTree = SOURCE_ROOT; };
- 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; };
65059B760996945100410571 /* OPML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPML.icns; path = ../resources/OPML/OPML.icns; sourceTree = SOURCE_ROOT; };
65059B770996945100410571 /* OPMLdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPMLdoc.icns; path = ../resources/OPML/OPMLdoc.icns; sourceTree = SOURCE_ROOT; };
65059B800996958700410571 /* BNDL.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = BNDL.r; path = ../resources/OPML/BNDL.r; sourceTree = SOURCE_ROOT; };
@@ -2835,6 +2841,8 @@
65F9C22209C4CD9800DCC29E /* sha_locl.h in Headers */,
65F9C22309C4CD9800DCC29E /* sha.h in Headers */,
655A983709E929CC009EFFEA /* byteorder.h in Headers */,
+ 65C4999E0E7D8F320078B6DB /* FSCopyObject.h in Headers */,
+ 65C499A40E7D8F3A0078B6DB /* GenLinkedList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3575,6 +3583,10 @@
6599180809C494EA00F6F58C /* whirlpool.c in Sources */,
6599181509C4950300F6F58C /* langcrypt.c in Sources */,
65F9C22809C4CDDE00DCC29E /* sha1dgst.c in Sources */,
+ 65C4999B0E7D8F2B0078B6DB /* FSCopyObject.c in Sources */,
+ 65C499A10E7D8F360078B6DB /* GenLinkedList.c in Sources */,
+ 65C499A70E7D8F450078B6DB /* langsqlite.c in Sources */,
+ 65C499AA0E7D8F4C0078B6DB /* langmysql.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4016,58 +4028,6 @@
};
name = Deployment;
};
- 5D4E1D410AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_Frontier.plist;
- LIBRARY_SEARCH_PATHS = (
- tools,
- "$(SRCROOT)",
- "$(SRCROOT)/tools",
- "$(SRCROOT)/../Common/sqlite3",
- );
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers";
- PRODUCT_NAME = Frontier;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- };
- name = Default;
- };
5D4E1D430AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4142,59 +4102,8 @@
GCC_OPTIMIZATION_LEVEL = 2;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = frontier.xcode.h;
- GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
- GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
- GCC_WARN_UNUSED_FUNCTION = NO;
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_PARAMETER = NO;
- GCC_WARN_UNUSED_VALUE = NO;
- GCC_WARN_UNUSED_VARIABLE = NO;
- INFOPLIST_FILE = Info_OPML.plist;
- LIBRARY_SEARCH_PATHS = (
- tools,
- "$(SRCROOT)/tools",
- );
- OTHER_CFLAGS = (
- "-fno-inline",
- "-malign-mac68k",
- );
- OTHER_LDFLAGS = (
- "-multiply_defined",
- warning,
- );
- OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers -d PIKE=1 -d OPMLEDITOR=1";
- PRODUCT_NAME = OPML;
- REZ_PREPROCESSOR_DEFINITIONS = "";
- REZ_PREPROCESSOR_UNDEFINITIONS = "";
- REZ_SCRIPT_TYPE = Roman;
- REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 5D4E1D450AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = NO;
- GCC_CHAR_IS_UNSIGNED_CHAR = NO;
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = frontier.xcode.h;
GCC_PREPROCESSOR_DEFINITIONS = (
+ NDEBUG,
"PIKE=1",
"OPMLEDITOR=1",
);
@@ -4234,8 +4143,9 @@
"-Wno-unknown-pragmas",
"-Wno-long-double",
);
+ ZERO_LINK = NO;
};
- name = Default;
+ name = Deployment;
};
5D4E1D470AAA0B1400DF6890 /* Development */ = {
isa = XCBuildConfiguration;
@@ -4261,18 +4171,6 @@
};
name = Deployment;
};
- 5D4E1D490AAA0B1400DF6890 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- OTHER_CFLAGS = "";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Default;
- };
BB37A29E0AB826C60077C6A1 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4315,24 +4213,6 @@
};
name = Deployment;
};
- BB37A2A00AB826C60077C6A1 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- PREBINDING = NO;
- PRODUCT_NAME = SQLite3;
- SKIP_INSTALL = NO;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- "-Wno-long-double",
- );
- ZERO_LINK = NO;
- };
- name = Default;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -4341,40 +4221,36 @@
buildConfigurations = (
5D4E1D3F0AAA0B1400DF6890 /* Development */,
5D4E1D400AAA0B1400DF6890 /* Deployment */,
- 5D4E1D410AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D420AAA0B1400DF6890 /* Build configuration list for PBXNativeTarget "OPML" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D430AAA0B1400DF6890 /* Development */,
5D4E1D440AAA0B1400DF6890 /* Deployment */,
- 5D4E1D450AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier Universal Binary" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4E1D470AAA0B1400DF6890 /* Development */,
5D4E1D480AAA0B1400DF6890 /* Deployment */,
- 5D4E1D490AAA0B1400DF6890 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
BB37A29D0AB826C60077C6A1 /* Build configuration list for PBXNativeTarget "SQLite3" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BB37A29E0AB826C60077C6A1 /* Development */,
BB37A29F0AB826C60077C6A1 /* Deployment */,
- BB37A2A00AB826C60077C6A1 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
/* End XCConfigurationList section */
};
Modified: Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-01-07 19:28:28 UTC (rev 1788)
+++ Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2008-09-14 20:19:40 UTC (rev 1789)
@@ -1119,6 +1119,23 @@
};
/* End PBXBuildRule section */
+/* Begin PBXBuildStyle section */
+ 655E9E2B0E520A8600E41637 /* Development */ = {
+ isa = PBXBuildStyle;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ };
+ name = Development;
+ };
+ 655E9E2C0E520A8600E41637 /* Deployment */ = {
+ isa = PBXBuildStyle;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ };
+ name = Deployment;
+ };
+/* End PBXBuildStyle section */
+
/* Begin PBXContainerItemProxy section */
BB37A3170AB827EA0077C6A1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@@ -1701,7 +1718,7 @@
65B70CE90797CF78008C2F1A /* FastTimes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FastTimes.h; path = ../Common/headers/FastTimes.h; sourceTree = SOURCE_ROOT; };
65BBB661072E563B008E2F34 /* frontier.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = frontier.r; path = ../Common/headers/frontier.r; sourceTree = SOURCE_ROOT; };
65BBB663072E5643008E2F34 /* frontierdefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = frontierdefs.h; path = ../Common/headers/frontierdefs.h; sourceTree = SOURCE_ROOT; };
- 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 65CF0C7F099545A4006E3A79 /* Frontier.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Frontier.app; sourceTree = BUILT_PRODUCTS_DIR; };
65D516AA072CED430097D18E /* frontier.xcode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = frontier.xcode.h; sourceTree = SOURCE_ROOT; };
65F9C21E09C4CD9700DCC29E /* sha_locl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha_locl.h; path = ../Common/headers/sha_locl.h; sourceTree = SOURCE_ROOT; };
65F9C21F09C4CD9700DCC29E /* sha.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sha.h; path = ../Common/headers/sha.h; sourceTree = SOURCE_ROOT; };
@@ -3209,6 +3226,12 @@
65152560072BFC6500411831 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 5D4E1D460AAA0B1400DF6890 /* Build configuration list for PBXProject "Frontier" */;
+ buildSettings = {
+ };
+ buildStyles = (
+ 655E9E2B0E520A8600E41637 /* Development */,
+ 655E9E2C0E520A8600E41637 /* Deployment */,
+ );
hasScannedForEncodings = 1;
mainGroup = 6515255C072BFC6500411831;
productRefGroup = 6515255C072BFC6500411831;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
