Browse Source

Push uncommitted main header file. Some cleanup.

Seems the header file tailored for iOS was not pushed last time, thanks Alejandro for pointing out! This commit removes the Framework-style header paths for all Redland headers so the same header also works for iOS. Whether this has undesirable consequences for Mac frameworks, I don't know.
Pascal Pfiffner 10 years ago
parent
commit
b33cd8baae

+ 0 - 17
Makefile

@@ -1,17 +0,0 @@
-TARGETNAME=Redland
-BUILDSTYLE=Deployment
-OBJROOT=objects
-SYMROOT=products
-BDB_LDFLAGS=/usr/local/berkeleydb/lib/libdb-4.2.a
-REDLAND_LDFLAGS=/usr/local/lib/libraptor.a /usr/local/lib/librdf.a /usr/local/lib/librasqal.a
-PCRE_LDFLAGS=/usr/local/lib/libpcre.a
-
-# no need to change anything below this point
-XCODE_COMMAND=xcodebuild -target $(TARGETNAME) -buildstyle $(BUILDSTYLE)
-EXTRA_SETTINGS="REDLAND_LDFLAGS=$(REDLAND_LDFLAGS)" "PCRE_LDFLAGS=$(PCRE_LDFLAGS)" "BDB_LDFLAGS=$(BDB_LDFLAGS)" "SYMROOT=$(SYMROOT)" "OBJROOT=$(OBJROOT)"
-
-build:
-	$(XCODE_COMMAND) build $(EXTRA_SETTINGS)
-
-clean:
-	$(XCODE_COMMAND) clean $(EXTRA_SETTINGS)

+ 28 - 23
Redland-ObjC.h

@@ -3,6 +3,7 @@
 //  $Id: Redland-ObjC.h 319 2004-11-03 21:29:55Z kianga $
 //
 //  Copyright 2004 Rene Puls <http://purl.org/net/kianga/>
+//	Copyright 2012 Pascal Pfiffner <http://www.chip.org/>
 //
 //  This file is available under the following three licenses:
 //   1. GNU Lesser General Public License (LGPL), version 2.1
@@ -14,32 +15,36 @@
 //  for the complete terms and further details.
 //
 //  The most recent version of this software can be found here:
-//  <http://purl.org/net/kianga/latest/redland-objc>
+//  <https://github.com/p2/Redland-ObjC>
 //
 //  For information about the Redland RDF Application Framework, including
 //  the most recent version, see <http://librdf.org/>.
 //
 
-#define LIBRDF_OBJC_FRAMEWORK
+/**
+ *  Header file to be included in projects utilizing Redland.
+ *
+ *  This header file should include all headers a framework user might want to use.
+ */
 
-#import <Redland/redland.h>
-#import <Redland/RedlandException.h>
-#import <Redland/RedlandIterator.h>
-#import <Redland/RedlandIteratorEnumerator.h>
-#import <Redland/RedlandModel.h>
-#import <Redland/RedlandModel-Convenience.h>
-#import <Redland/RedlandNamespace.h>
-#import <Redland/RedlandNode.h>
-#import <Redland/RedlandNode-Convenience.h>
-#import <Redland/RedlandParser.h>
-#import <Redland/RedlandQuery.h>
-#import <Redland/RedlandQueryResults.h>
-#import <Redland/RedlandQueryResultsEnumerator.h>
-#import <Redland/RedlandSerializer.h>
-#import <Redland/RedlandStatement.h>
-#import <Redland/RedlandStorage.h>
-#import <Redland/RedlandStream.h>
-#import <Redland/RedlandStreamEnumerator.h>
-#import <Redland/RedlandURI.h>
-#import <Redland/RedlandWorld.h>
-#import <Redland/RedlandWrappedObject.h>
+#import <redland.h>
+#import <RedlandException.h>
+#import <RedlandIterator.h>
+#import <RedlandIteratorEnumerator.h>
+#import <RedlandModel.h>
+#import <RedlandModel-Convenience.h>
+#import <RedlandNamespace.h>
+#import <RedlandNode.h>
+#import <RedlandNode-Convenience.h>
+#import <RedlandParser.h>
+#import <RedlandQuery.h>
+#import <RedlandQueryResults.h>
+#import <RedlandQueryResultsEnumerator.h>
+#import <RedlandSerializer.h>
+#import <RedlandStatement.h>
+#import <RedlandStorage.h>
+#import <RedlandStream.h>
+#import <RedlandStreamEnumerator.h>
+#import <RedlandURI.h>
+#import <RedlandWorld.h>
+#import <RedlandWrappedObject.h>

+ 11 - 11
Redland.xcodeproj/project.pbxproj

@@ -181,6 +181,7 @@
 		EEC9C56715CADED300B7C568 /* librdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE0CB64915BE5CB4004BB6C9 /* librdf.a */; };
 		EEC9C56815CB051200B7C568 /* libraptor2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE0CB64715BE5CB4004BB6C9 /* libraptor2.a */; };
 		EEC9C56915CB051500B7C568 /* librasqal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE0CB64815BE5CB4004BB6C9 /* librasqal.a */; };
+		EEDD45FA162E14EF00ECA308 /* Redland-ObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEDE81BE15BF38C800AC2B64 /* libraptor2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EEDE81B715BF375F00AC2B64 /* libraptor2.dylib */; };
 		EEDE81BF15BF38C800AC2B64 /* librasqal.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EEDE81B815BF375F00AC2B64 /* librasqal.dylib */; };
 		EEDE81C015BF38C800AC2B64 /* librdf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EEDE81B915BF375F00AC2B64 /* librdf.dylib */; };
@@ -365,13 +366,13 @@
 		ED98630406FAE443009186B3 /* ModelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModelTests.m; sourceTree = "<group>"; };
 		ED9863F506FAEA05009186B3 /* ParserTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParserTests.h; sourceTree = "<group>"; };
 		ED9863F606FAEA05009186B3 /* ParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParserTests.m; sourceTree = "<group>"; };
-		ED98642206FAEE3C009186B3 /* rdf-syntax.rdf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "rdf-syntax.rdf"; sourceTree = "<group>"; };
+		ED98642206FAEE3C009186B3 /* rdf-syntax.rdf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "rdf-syntax.rdf"; path = "Resources/rdf-syntax.rdf"; sourceTree = "<group>"; };
 		ED98643806FAF064009186B3 /* SerializerTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializerTests.h; sourceTree = "<group>"; };
 		ED98643906FAF064009186B3 /* SerializerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SerializerTests.m; sourceTree = "<group>"; };
 		ED98645906FAF0D8009186B3 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
 		ED98651A06FB12E6009186B3 /* QueryTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryTests.h; sourceTree = "<group>"; };
 		ED98651B06FB12E6009186B3 /* QueryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryTests.m; sourceTree = "<group>"; };
-		ED98662B06FB3D05009186B3 /* rdf-schema.rdf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "rdf-schema.rdf"; sourceTree = "<group>"; };
+		ED98662B06FB3D05009186B3 /* rdf-schema.rdf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "rdf-schema.rdf"; path = "Resources/rdf-schema.rdf"; sourceTree = "<group>"; };
 		EDAC616406943C75007A085A /* RedlandStreamEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedlandStreamEnumerator.h; sourceTree = "<group>"; };
 		EDAC616506943C75007A085A /* RedlandStreamEnumerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RedlandStreamEnumerator.m; sourceTree = "<group>"; };
 		EDAC63810694506E007A085A /* RedlandNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedlandNamespace.h; sourceTree = "<group>"; };
@@ -381,7 +382,6 @@
 		EDB09D2A0688D50F0071464A /* RedlandIteratorEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedlandIteratorEnumerator.h; sourceTree = "<group>"; };
 		EDB09D2B0688D50F0071464A /* RedlandIteratorEnumerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RedlandIteratorEnumerator.m; sourceTree = "<group>"; };
 		EDBA0E4807379BDD00610CB1 /* NOTICE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NOTICE.txt; sourceTree = "<group>"; };
-		EDF2FEA9071FE41900B18942 /* ChangeLog.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog.txt; sourceTree = "<group>"; };
 		EE0CB61A15BDD0AD004BB6C9 /* pp-configure.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "pp-configure.sh"; sourceTree = "<group>"; };
 		EE0CB61B15BDD0AD004BB6C9 /* rasqal-0.9.29.patch */ = {isa = PBXFileReference; lastKnownFileType = text; path = "rasqal-0.9.29.patch"; sourceTree = "<group>"; };
 		EE0CB61C15BDD0AD004BB6C9 /* cross-compile.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = "cross-compile.py"; sourceTree = "<group>"; };
@@ -525,22 +525,22 @@
 			isa = PBXGroup;
 			children = (
 				EE1DDDF215BEDCC700882BDA /* README.md */,
-				EDF2FEA9071FE41900B18942 /* ChangeLog.txt */,
 				ED98645906FAF0D8009186B3 /* LICENSE.txt */,
 				EDBA0E4807379BDD00610CB1 /* NOTICE.txt */,
+				ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */,
 				ED699E3406F9CBBF00A624F7 /* Basic Wrapper Classes */,
 				08FB77AEFE84172EC02AAC07 /* Additional Classes */,
 				ED69A3BB06F9DCA400A624F7 /* Tests */,
 				089C1665FE841158C02AAC07 /* Resources */,
 				EE74747115B90143004A456E /* Redland Source */,
 				32C88DFF0371C24200C91783 /* Other Sources */,
-				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+				0867D69AFE84028FC02AAC07 /* Frameworks */,
 				034768DFFF38A50411DB9C8B /* Products */,
 			);
 			name = Redland;
 			sourceTree = "<group>";
 		};
-		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				ED48EB8108BB596300ACF14F /* SenTestingKit.framework */,
@@ -553,7 +553,7 @@
 				ED66E3DC081EA37600951AB6 /* libcurl.3.dylib */,
 				EE555EE215C873B000F26A1A /* libz.dylib */,
 			);
-			name = "External Frameworks and Libraries";
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		089C1665FE841158C02AAC07 /* Resources */ = {
@@ -600,7 +600,6 @@
 			isa = PBXGroup;
 			children = (
 				32DBCF5E0370ADEE00C91783 /* Redland_Prefix.pch */,
-				ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -931,6 +930,7 @@
 				EE5144F915DAEFD400DA9BA2 /* RedlandSerializer.h in Headers */,
 				EE5144FA15DAEFD400DA9BA2 /* RedlandQuery.h in Headers */,
 				EE5144FB15DAEFD400DA9BA2 /* RedlandQueryResults.h in Headers */,
+				EEDD45FA162E14EF00ECA308 /* Redland-ObjC.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1766,7 +1766,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "Tests-iOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				LIBRARY_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)\"";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Redland-source/Universal\"";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1802,7 +1802,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "Tests-iOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				LIBRARY_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)\"";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Redland-source/Universal\"";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1831,7 +1831,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "Tests-iOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				LIBRARY_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)\"";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Redland-source/Universal\"";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

+ 1 - 1
Redland.xcodeproj/xcshareddata/xcschemes/Redland C Library.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0440"
+   LastUpgradeVersion = "0450"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 1 - 1
Redland.xcodeproj/xcshareddata/xcschemes/Redland Documentation.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0440"
+   LastUpgradeVersion = "0450"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 1 - 1
Redland.xcodeproj/xcshareddata/xcschemes/Redland.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0440"
+   LastUpgradeVersion = "0450"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 1 - 1
Redland.xcodeproj/xcshareddata/xcschemes/redland-ios.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0440"
+   LastUpgradeVersion = "0450"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

+ 0 - 0
ChangeLog.txt → Resources/ChangeLog.txt


+ 0 - 0
rdf-schema.rdf → Resources/rdf-schema.rdf


+ 0 - 0
rdf-syntax.rdf → Resources/rdf-syntax.rdf