Browse code

* added MulleScionFoundationKey for `requires` to differentiate bundle identifiers based on runtime.

* disallow empty filename paths from mongoose.

Nat! authored on 18-05-2016 23:26:50
Showing 9 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+gitolite.mulle-kybernetik.com:MulleFoundation
... ...
@@ -138,6 +138,7 @@
138 138
 		41B4C8D91BAB2CA2002BFA33 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41B4C8D41BAB2C89002BFA33 /* Foundation.framework */; };
139 139
 		41B4C8DA1BAB2CA7002BFA33 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41B4C8D41BAB2C89002BFA33 /* Foundation.framework */; };
140 140
 		41C5E05F16DE6A5D00132904 /* MulleScionParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 41764B9E16DA51A200560FCF /* MulleScionParser.m */; };
141
+		41CC3F531CE3A63E001EFDB9 /* MulleScionObjectModel+NSCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 410B32DF16DB6A9E005D0EAD /* MulleScionObjectModel+NSCoding.m */; };
141 142
 		41CFAFFE1A93E1E500B0783A /* autolink.c in Sources */ = {isa = PBXBuildFile; fileRef = 41CFAFF51A93E1E500B0783A /* autolink.c */; };
142 143
 		41CFAFFF1A93E1E500B0783A /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 41CFAFF61A93E1E500B0783A /* buffer.c */; };
143 144
 		41CFB0001A93E1E500B0783A /* document.c in Sources */ = {isa = PBXBuildFile; fileRef = 41CFAFF71A93E1E500B0783A /* document.c */; };
... ...
@@ -163,7 +164,6 @@
163 164
 		41D6DF3016DE5270004833D6 /* MulleScion.m in Sources */ = {isa = PBXBuildFile; fileRef = 41764BCD16DAF4C600560FCF /* MulleScion.m */; };
164 165
 		41D6DF3E16DE52D6004833D6 /* MulleScionParser+Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 4121DAFC16DCFFD600BFD60C /* MulleScionParser+Parsing.m */; };
165 166
 		41DCAF7916DE576F00C5A74E /* libMulleScion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41D6DF2416DE523D004833D6 /* libMulleScion.a */; };
166
-		41DD0C99190025F6000F9CE2 /* NSObject+KVC_Compatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = 415DA5D4182BED2100F654F7 /* NSObject+KVC_Compatibility.m */; };
167 167
 		41DD569F16E376F600C4D68A /* mongoose.c in Sources */ = {isa = PBXBuildFile; fileRef = 41DD569E16E376F600C4D68A /* mongoose.c */; };
168 168
 		41DD56A216E376FF00C4D68A /* MulleMongoose.m in Sources */ = {isa = PBXBuildFile; fileRef = 41DD56A116E376FF00C4D68A /* MulleMongoose.m */; };
169 169
 		41DD56B716E3F7A700C4D68A /* MulleScionObjectModel+MulleMongoose.m in Sources */ = {isa = PBXBuildFile; fileRef = 41DD56B616E3F7A600C4D68A /* MulleScionObjectModel+MulleMongoose.m */; };
... ...
@@ -224,7 +224,6 @@
224 224
 		41FAED6F182D275E002CD114 /* NSData+ZLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 4121DB0116DD251900BFD60C /* NSData+ZLib.m */; };
225 225
 		41FAED70182D275E002CD114 /* GTMNSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 415DA599182BBB0000F654F7 /* GTMNSString+HTML.m */; settings = {COMPILER_FLAGS = "-Ofast"; }; };
226 226
 		41FAED71182D275E002CD114 /* NSString+HTMLEscape.m in Sources */ = {isa = PBXBuildFile; fileRef = 41DD56BD16E4145000C4D68A /* NSString+HTMLEscape.m */; };
227
-		41FAED72182D275E002CD114 /* MulleScionObjectModel+NSCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 410B32DF16DB6A9E005D0EAD /* MulleScionObjectModel+NSCoding.m */; };
228 227
 		41FAED74182D275E002CD114 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41764B8F16DA511200560FCF /* Foundation.framework */; };
229 228
 		41FE9FD718281F77005E7A41 /* RELEASENOTES.md in Resources */ = {isa = PBXBuildFile; fileRef = 41FE9FD618281F77005E7A41 /* RELEASENOTES.md */; };
230 229
 /* End PBXBuildFile section */
... ...
@@ -519,12 +518,32 @@
519 518
 		41348F94182E56E900367335 /* gcrt1.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = gcrt1.o; path = usr/lib/gcrt1.o; sourceTree = SDKROOT; };
520 519
 		41348F97182E577D00367335 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = usr/lib/libobjc.dylib; sourceTree = SDKROOT; };
521 520
 		41348F99182E57C900367335 /* libgcc_s.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgcc_s.1.dylib; path = usr/lib/libgcc_s.1.dylib; sourceTree = SDKROOT; };
521
+		413C515E1CC284CA00F62468 /* Common.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = Common.cmake; sourceTree = "<group>"; };
522
+		413C515F1CC284CA00F62468 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
523
+		413C51601CC284CA00F62468 /* Debug.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = Debug.cmake; sourceTree = "<group>"; };
524
+		413C51611CC284CA00F62468 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
525
+		413C51621CC284CA00F62468 /* DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DynamicLibrary.xcconfig; sourceTree = "<group>"; };
526
+		413C51631CC284CA00F62468 /* DynamicLibraryOSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DynamicLibraryOSX.xcconfig; sourceTree = "<group>"; };
527
+		413C51641CC284CA00F62468 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = "<group>"; };
528
+		413C51651CC284CA00F62468 /* FrameworkOSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = FrameworkOSX.xcconfig; sourceTree = "<group>"; };
529
+		413C51661CC284CA00F62468 /* IOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = IOS.xcconfig; sourceTree = "<group>"; };
530
+		413C51671CC284CA00F62468 /* Library.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Library.xcconfig; sourceTree = "<group>"; };
531
+		413C51681CC284CA00F62468 /* OSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OSX.xcconfig; sourceTree = "<group>"; };
532
+		413C51691CC284CA00F62468 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
533
+		413C516A1CC284CA00F62468 /* Release.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = Release.cmake; sourceTree = "<group>"; };
534
+		413C516B1CC284CA00F62468 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
535
+		413C516C1CC284CA00F62468 /* StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibrary.xcconfig; sourceTree = "<group>"; };
536
+		413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibraryIOS.xcconfig; sourceTree = "<group>"; };
537
+		413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibraryOSX.xcconfig; sourceTree = "<group>"; };
538
+		413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ToolOSX.xcconfig; sourceTree = "<group>"; };
539
+		413C51701CC284CA00F62468 /* _Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = _Common.xcconfig; sourceTree = "<group>"; };
540
+		413C51711CC284CA00F62468 /* generate-dot.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-dot.sh"; sourceTree = "<group>"; };
541
+		413C51721CC284CA00F62468 /* update-all-configurations.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "update-all-configurations.sh"; sourceTree = "<group>"; };
522 542
 		414A435119040A120020C6FF /* log.scion */ = {isa = PBXFileReference; lastKnownFileType = text; path = log.scion; sourceTree = "<group>"; };
523 543
 		414A842516E528890084AE1E /* MulleScionDataFlow.graffle */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = MulleScionDataFlow.graffle; sourceTree = "<group>"; };
524 544
 		414A842616E5288A0084AE1E /* MulleScionDataFlow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MulleScionDataFlow.png; sourceTree = "<group>"; };
525 545
 		414A842816E52DF50084AE1E /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
526 546
 		415918001A974419006ECD52 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
527
-		415918011A974419006ECD52 /* TemplateIcon2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TemplateIcon2x.png; sourceTree = "<group>"; };
528 547
 		415918031A976C2A006ECD52 /* Environment_Variables.scion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Environment_Variables.scion; sourceTree = "<group>"; };
529 548
 		415C401D1A9641010072B73A /* __demo.scion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = __demo.scion; sourceTree = "<group>"; };
530 549
 		415DA598182BBB0000F654F7 /* GTMNSString+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "GTMNSString+HTML.h"; path = "../google-toolbox-for-mac/Foundation/GTMNSString+HTML.h"; sourceTree = "<group>"; };
... ...
@@ -754,6 +773,34 @@
754 773
 			name = MulleScionLibrary;
755 774
 			sourceTree = "<group>";
756 775
 		};
776
+		413C515D1CC284CA00F62468 /* mulle-configuration */ = {
777
+			isa = PBXGroup;
778
+			children = (
779
+				413C515E1CC284CA00F62468 /* Common.cmake */,
780
+				413C515F1CC284CA00F62468 /* Common.xcconfig */,
781
+				413C51601CC284CA00F62468 /* Debug.cmake */,
782
+				413C51611CC284CA00F62468 /* Debug.xcconfig */,
783
+				413C51621CC284CA00F62468 /* DynamicLibrary.xcconfig */,
784
+				413C51631CC284CA00F62468 /* DynamicLibraryOSX.xcconfig */,
785
+				413C51641CC284CA00F62468 /* Framework.xcconfig */,
786
+				413C51651CC284CA00F62468 /* FrameworkOSX.xcconfig */,
787
+				413C51661CC284CA00F62468 /* IOS.xcconfig */,
788
+				413C51671CC284CA00F62468 /* Library.xcconfig */,
789
+				413C51681CC284CA00F62468 /* OSX.xcconfig */,
790
+				413C51691CC284CA00F62468 /* README.md */,
791
+				413C516A1CC284CA00F62468 /* Release.cmake */,
792
+				413C516B1CC284CA00F62468 /* Release.xcconfig */,
793
+				413C516C1CC284CA00F62468 /* StaticLibrary.xcconfig */,
794
+				413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */,
795
+				413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */,
796
+				413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */,
797
+				413C51701CC284CA00F62468 /* _Common.xcconfig */,
798
+				413C51711CC284CA00F62468 /* generate-dot.sh */,
799
+				413C51721CC284CA00F62468 /* update-all-configurations.sh */,
800
+			);
801
+			path = "mulle-configuration";
802
+			sourceTree = "<group>";
803
+		};
757 804
 		415918021A974436006ECD52 /* mongoose */ = {
758 805
 			isa = PBXGroup;
759 806
 			children = (
... ...
@@ -770,6 +817,7 @@
770 817
 				41FE9FD618281F77005E7A41 /* RELEASENOTES.md */,
771 818
 				41CD2F0D181FE17300FBBEB4 /* BUILD.md */,
772 819
 				414A842816E52DF50084AE1E /* LICENSE */,
820
+				413C515D1CC284CA00F62468 /* mulle-configuration */,
773 821
 				41764B9116DA511200560FCF /* src */,
774 822
 				41764B9416DA511200560FCF /* dox */,
775 823
 				41CCC55C18254FB00081FA1C /* tests */,
... ...
@@ -969,7 +1017,6 @@
969 1017
 				41CFAFFC1A93E1E500B0783A /* stack.c */,
970 1018
 				41CFAFFD1A93E1E500B0783A /* version.c */,
971 1019
 				415918001A974419006ECD52 /* LICENSE */,
972
-				415918011A974419006ECD52 /* TemplateIcon2x.png */,
973 1020
 			);
974 1021
 			path = hoedown;
975 1022
 			sourceTree = "<group>";
... ...
@@ -1593,13 +1640,12 @@
1593 1640
 			buildActionMask = 2147483647;
1594 1641
 			files = (
1595 1642
 				41FAED6B182D275E002CD114 /* NSFileHandle+MulleOutputFileHandle.m in Sources */,
1643
+				41CC3F531CE3A63E001EFDB9 /* MulleScionObjectModel+NSCoding.m in Sources */,
1596 1644
 				41FAED6D182D275E002CD114 /* MulleScionTemplate+CompressedArchive.m in Sources */,
1597 1645
 				41FAED6E182D275E002CD114 /* MulleScionObjectModel.m in Sources */,
1598 1646
 				41FAED6F182D275E002CD114 /* NSData+ZLib.m in Sources */,
1599 1647
 				41FAED70182D275E002CD114 /* GTMNSString+HTML.m in Sources */,
1600 1648
 				41FAED71182D275E002CD114 /* NSString+HTMLEscape.m in Sources */,
1601
-				41FAED72182D275E002CD114 /* MulleScionObjectModel+NSCoding.m in Sources */,
1602
-				41DD0C99190025F6000F9CE2 /* NSObject+KVC_Compatibility.m in Sources */,
1603 1649
 				41FAED6A182D275E002CD114 /* MulleScionObjectModel+TraceDescription.m in Sources */,
1604 1650
 			);
1605 1651
 			runOnlyForDeploymentPostprocessing = 0;
... ...
@@ -1747,6 +1793,7 @@
1747 1793
 /* Begin XCBuildConfiguration section */
1748 1794
 		4103007B1701DBE200197713 /* Debug */ = {
1749 1795
 			isa = XCBuildConfiguration;
1796
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1750 1797
 			buildSettings = {
1751 1798
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1752 1799
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
... ...
@@ -1759,6 +1806,7 @@
1759 1806
 		};
1760 1807
 		4103007C1701DBE200197713 /* Release */ = {
1761 1808
 			isa = XCBuildConfiguration;
1809
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1762 1810
 			buildSettings = {
1763 1811
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1764 1812
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
... ...
@@ -1771,6 +1819,7 @@
1771 1819
 		};
1772 1820
 		4103007D1701DBE200197713 /* Profile */ = {
1773 1821
 			isa = XCBuildConfiguration;
1822
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1774 1823
 			buildSettings = {
1775 1824
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1776 1825
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
... ...
@@ -1783,6 +1832,7 @@
1783 1832
 		};
1784 1833
 		411EEA97182D30B600361ADF /* Debug */ = {
1785 1834
 			isa = XCBuildConfiguration;
1835
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1786 1836
 			buildSettings = {
1787 1837
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1788 1838
 				PRODUCT_NAME = MulleScionPrinter;
... ...
@@ -1792,6 +1842,7 @@
1792 1842
 		};
1793 1843
 		411EEA98182D30B600361ADF /* Release */ = {
1794 1844
 			isa = XCBuildConfiguration;
1845
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1795 1846
 			buildSettings = {
1796 1847
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1797 1848
 				PRODUCT_NAME = MulleScionPrinter;
... ...
@@ -1801,6 +1852,7 @@
1801 1852
 		};
1802 1853
 		411EEA99182D30B600361ADF /* Profile */ = {
1803 1854
 			isa = XCBuildConfiguration;
1855
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1804 1856
 			buildSettings = {
1805 1857
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1806 1858
 				PRODUCT_NAME = MulleScionPrinter;
... ...
@@ -1810,6 +1862,7 @@
1810 1862
 		};
1811 1863
 		411EEAB2182D311F00361ADF /* Debug */ = {
1812 1864
 			isa = XCBuildConfiguration;
1865
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1813 1866
 			buildSettings = {
1814 1867
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1815 1868
 				PRODUCT_NAME = MulleScionFoundation;
... ...
@@ -1819,6 +1872,7 @@
1819 1872
 		};
1820 1873
 		411EEAB3182D311F00361ADF /* Release */ = {
1821 1874
 			isa = XCBuildConfiguration;
1875
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1822 1876
 			buildSettings = {
1823 1877
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1824 1878
 				PRODUCT_NAME = MulleScionFoundation;
... ...
@@ -1828,6 +1882,7 @@
1828 1882
 		};
1829 1883
 		411EEAB4182D311F00361ADF /* Profile */ = {
1830 1884
 			isa = XCBuildConfiguration;
1885
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1831 1886
 			buildSettings = {
1832 1887
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1833 1888
 				PRODUCT_NAME = MulleScionFoundation;
... ...
@@ -1837,6 +1892,7 @@
1837 1892
 		};
1838 1893
 		412E8003182D2F80008A7FCC /* Debug */ = {
1839 1894
 			isa = XCBuildConfiguration;
1895
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1840 1896
 			buildSettings = {
1841 1897
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1842 1898
 				PRODUCT_NAME = MulleScionGraphviz;
... ...
@@ -1847,6 +1903,7 @@
1847 1903
 		};
1848 1904
 		412E8004182D2F80008A7FCC /* Release */ = {
1849 1905
 			isa = XCBuildConfiguration;
1906
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1850 1907
 			buildSettings = {
1851 1908
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1852 1909
 				PRODUCT_NAME = MulleScionGraphviz;
... ...
@@ -1857,6 +1914,7 @@
1857 1914
 		};
1858 1915
 		412E8005182D2F80008A7FCC /* Profile */ = {
1859 1916
 			isa = XCBuildConfiguration;
1917
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
1860 1918
 			buildSettings = {
1861 1919
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
1862 1920
 				PRODUCT_NAME = MulleScionGraphviz;
... ...
@@ -1939,6 +1997,7 @@
1939 1997
 		};
1940 1998
 		41764B9816DA511200560FCF /* Debug */ = {
1941 1999
 			isa = XCBuildConfiguration;
2000
+			baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */;
1942 2001
 			buildSettings = {
1943 2002
 				CLANG_WARN_INT_CONVERSION = YES;
1944 2003
 				CURRENT_PROJECT_VERSION = 1853.2;
... ...
@@ -1963,6 +2022,7 @@
1963 2022
 				OTHER_CFLAGS = (
1964 2023
 					"-DPROJECT_VERSION=${CURRENT_PROJECT_VERSION}",
1965 2024
 					"$(inherited)",
2025
+					"-H",
1966 2026
 				);
1967 2027
 				OTHER_LDFLAGS = "-ObjC";
1968 2028
 				SKIP_INSTALL = YES;
... ...
@@ -1972,6 +2032,7 @@
1972 2032
 		};
1973 2033
 		41764B9916DA511200560FCF /* Release */ = {
1974 2034
 			isa = XCBuildConfiguration;
2035
+			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
1975 2036
 			buildSettings = {
1976 2037
 				CLANG_WARN_INT_CONVERSION = YES;
1977 2038
 				CURRENT_PROJECT_VERSION = 1853.2;
... ...
@@ -1994,6 +2055,7 @@
1994 2055
 				OTHER_CFLAGS = (
1995 2056
 					"-DPROJECT_VERSION=${CURRENT_PROJECT_VERSION}",
1996 2057
 					"$(inherited)",
2058
+					"-H",
1997 2059
 				);
1998 2060
 				OTHER_LDFLAGS = "-ObjC";
1999 2061
 				SKIP_INSTALL = YES;
... ...
@@ -2003,8 +2065,8 @@
2003 2065
 		};
2004 2066
 		41764B9B16DA511200560FCF /* Debug */ = {
2005 2067
 			isa = XCBuildConfiguration;
2068
+			baseConfigurationReference = 413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */;
2006 2069
 			buildSettings = {
2007
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2008 2070
 				PRODUCT_NAME = "mulle-scion";
2009 2071
 				SKIP_INSTALL = NO;
2010 2072
 			};
... ...
@@ -2012,8 +2074,8 @@
2012 2074
 		};
2013 2075
 		41764B9C16DA511200560FCF /* Release */ = {
2014 2076
 			isa = XCBuildConfiguration;
2077
+			baseConfigurationReference = 413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */;
2015 2078
 			buildSettings = {
2016
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2017 2079
 				PRODUCT_NAME = "mulle-scion";
2018 2080
 				SKIP_INSTALL = NO;
2019 2081
 			};
... ...
@@ -2042,6 +2104,7 @@
2042 2104
 		};
2043 2105
 		4178D2FE16E00263001C9FB0 /* Profile */ = {
2044 2106
 			isa = XCBuildConfiguration;
2107
+			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
2045 2108
 			buildSettings = {
2046 2109
 				CLANG_WARN_INT_CONVERSION = YES;
2047 2110
 				CURRENT_PROJECT_VERSION = 1853.2;
... ...
@@ -2065,6 +2128,7 @@
2065 2128
 				OTHER_CFLAGS = (
2066 2129
 					"-DPROJECT_VERSION=${CURRENT_PROJECT_VERSION}",
2067 2130
 					"$(inherited)",
2131
+					"-H",
2068 2132
 				);
2069 2133
 				OTHER_LDFLAGS = "-ObjC";
2070 2134
 				SKIP_INSTALL = YES;
... ...
@@ -2074,8 +2138,8 @@
2074 2138
 		};
2075 2139
 		4178D2FF16E00263001C9FB0 /* Profile */ = {
2076 2140
 			isa = XCBuildConfiguration;
2141
+			baseConfigurationReference = 413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */;
2077 2142
 			buildSettings = {
2078
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2079 2143
 				PRODUCT_NAME = "mulle-scion";
2080 2144
 				SKIP_INSTALL = NO;
2081 2145
 			};
... ...
@@ -2083,8 +2147,8 @@
2083 2147
 		};
2084 2148
 		4178D30116E00263001C9FB0 /* Profile */ = {
2085 2149
 			isa = XCBuildConfiguration;
2150
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2086 2151
 			buildSettings = {
2087
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2088 2152
 				COMBINE_HIDPI_IMAGES = YES;
2089 2153
 				PRODUCT_NAME = MulleScionParser;
2090 2154
 			};
... ...
@@ -2092,8 +2156,8 @@
2092 2156
 		};
2093 2157
 		4178D30216E00263001C9FB0 /* Profile */ = {
2094 2158
 			isa = XCBuildConfiguration;
2159
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2095 2160
 			buildSettings = {
2096
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2097 2161
 				COMBINE_HIDPI_IMAGES = YES;
2098 2162
 				PRODUCT_NAME = MulleScionPrinter;
2099 2163
 			};
... ...
@@ -2101,8 +2165,8 @@
2101 2165
 		};
2102 2166
 		4178D30416E00263001C9FB0 /* Profile */ = {
2103 2167
 			isa = XCBuildConfiguration;
2168
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2104 2169
 			buildSettings = {
2105
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2106 2170
 				COMBINE_HIDPI_IMAGES = YES;
2107 2171
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
2108 2172
 				PRODUCT_NAME = MulleScion;
... ...
@@ -2113,11 +2177,20 @@
2113 2177
 		};
2114 2178
 		4178D30516E00263001C9FB0 /* Profile */ = {
2115 2179
 			isa = XCBuildConfiguration;
2180
+			baseConfigurationReference = 413C51651CC284CA00F62468 /* FrameworkOSX.xcconfig */;
2116 2181
 			buildSettings = {
2117
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2118 2182
 				COMBINE_HIDPI_IMAGES = YES;
2119 2183
 				FRAMEWORK_VERSION = A;
2120 2184
 				INFOPLIST_FILE = "src/MulleScion-Info.plist";
2185
+				OTHER_LDFLAGS = (
2186
+					"-all_load",
2187
+					"-t",
2188
+					"-Z",
2189
+					"-L/usr/lib",
2190
+					"-F$(BUILT_PRODUCTS_DIR)",
2191
+					"-F$(DEPENDENCIES_DIR)/Frameworks/$(CONFIGURATION)",
2192
+					"$(inherited)",
2193
+				);
2121 2194
 				PRODUCT_NAME = MulleScion;
2122 2195
 				SKIP_INSTALL = NO;
2123 2196
 				WRAPPER_EXTENSION = framework;
... ...
@@ -2126,8 +2199,8 @@
2126 2199
 		};
2127 2200
 		41AEA211182D097300840887 /* Debug */ = {
2128 2201
 			isa = XCBuildConfiguration;
2202
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2129 2203
 			buildSettings = {
2130
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2131 2204
 				COMBINE_HIDPI_IMAGES = YES;
2132 2205
 				PRODUCT_NAME = MulleScionGraphviz;
2133 2206
 				SKIP_INSTALL = NO;
... ...
@@ -2136,8 +2209,8 @@
2136 2209
 		};
2137 2210
 		41AEA212182D097300840887 /* Release */ = {
2138 2211
 			isa = XCBuildConfiguration;
2212
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2139 2213
 			buildSettings = {
2140
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2141 2214
 				COMBINE_HIDPI_IMAGES = YES;
2142 2215
 				PRODUCT_NAME = MulleScionGraphviz;
2143 2216
 				SKIP_INSTALL = NO;
... ...
@@ -2146,8 +2219,8 @@
2146 2219
 		};
2147 2220
 		41AEA213182D097300840887 /* Profile */ = {
2148 2221
 			isa = XCBuildConfiguration;
2222
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2149 2223
 			buildSettings = {
2150
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2151 2224
 				COMBINE_HIDPI_IMAGES = YES;
2152 2225
 				PRODUCT_NAME = MulleScionGraphviz;
2153 2226
 				SKIP_INSTALL = NO;
... ...
@@ -2156,8 +2229,8 @@
2156 2229
 		};
2157 2230
 		41D6DEE316DE509F004833D6 /* Debug */ = {
2158 2231
 			isa = XCBuildConfiguration;
2232
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2159 2233
 			buildSettings = {
2160
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2161 2234
 				COMBINE_HIDPI_IMAGES = YES;
2162 2235
 				PRODUCT_NAME = MulleScionPrinter;
2163 2236
 			};
... ...
@@ -2165,8 +2238,8 @@
2165 2238
 		};
2166 2239
 		41D6DEE416DE509F004833D6 /* Release */ = {
2167 2240
 			isa = XCBuildConfiguration;
2241
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2168 2242
 			buildSettings = {
2169
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2170 2243
 				COMBINE_HIDPI_IMAGES = YES;
2171 2244
 				PRODUCT_NAME = MulleScionPrinter;
2172 2245
 			};
... ...
@@ -2174,8 +2247,8 @@
2174 2247
 		};
2175 2248
 		41D6DF0E16DE51C9004833D6 /* Debug */ = {
2176 2249
 			isa = XCBuildConfiguration;
2250
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2177 2251
 			buildSettings = {
2178
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2179 2252
 				COMBINE_HIDPI_IMAGES = YES;
2180 2253
 				PRODUCT_NAME = MulleScionParser;
2181 2254
 			};
... ...
@@ -2183,8 +2256,8 @@
2183 2256
 		};
2184 2257
 		41D6DF0F16DE51C9004833D6 /* Release */ = {
2185 2258
 			isa = XCBuildConfiguration;
2259
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2186 2260
 			buildSettings = {
2187
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2188 2261
 				COMBINE_HIDPI_IMAGES = YES;
2189 2262
 				PRODUCT_NAME = MulleScionParser;
2190 2263
 			};
... ...
@@ -2192,8 +2265,8 @@
2192 2265
 		};
2193 2266
 		41D6DF2E16DE523E004833D6 /* Debug */ = {
2194 2267
 			isa = XCBuildConfiguration;
2268
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2195 2269
 			buildSettings = {
2196
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2197 2270
 				COMBINE_HIDPI_IMAGES = YES;
2198 2271
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
2199 2272
 				PRODUCT_NAME = MulleScion;
... ...
@@ -2204,8 +2277,8 @@
2204 2277
 		};
2205 2278
 		41D6DF2F16DE523E004833D6 /* Release */ = {
2206 2279
 			isa = XCBuildConfiguration;
2280
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2207 2281
 			buildSettings = {
2208
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2209 2282
 				COMBINE_HIDPI_IMAGES = YES;
2210 2283
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/${PRODUCT_NAME}/private";
2211 2284
 				PRODUCT_NAME = MulleScion;
... ...
@@ -2216,11 +2289,20 @@
2216 2289
 		};
2217 2290
 		41D6DF6E16DE53AE004833D6 /* Debug */ = {
2218 2291
 			isa = XCBuildConfiguration;
2292
+			baseConfigurationReference = 413C51651CC284CA00F62468 /* FrameworkOSX.xcconfig */;
2219 2293
 			buildSettings = {
2220
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2221 2294
 				COMBINE_HIDPI_IMAGES = YES;
2222 2295
 				FRAMEWORK_VERSION = A;
2223 2296
 				INFOPLIST_FILE = "src/MulleScion-Info.plist";
2297
+				OTHER_LDFLAGS = (
2298
+					"-all_load",
2299
+					"-t",
2300
+					"-Z",
2301
+					"-L/usr/lib",
2302
+					"-F$(BUILT_PRODUCTS_DIR)",
2303
+					"-F$(DEPENDENCIES_DIR)/Frameworks/$(CONFIGURATION)",
2304
+					"$(inherited)",
2305
+				);
2224 2306
 				PRODUCT_NAME = MulleScion;
2225 2307
 				SKIP_INSTALL = NO;
2226 2308
 				WRAPPER_EXTENSION = framework;
... ...
@@ -2229,11 +2311,20 @@
2229 2311
 		};
2230 2312
 		41D6DF6F16DE53AE004833D6 /* Release */ = {
2231 2313
 			isa = XCBuildConfiguration;
2314
+			baseConfigurationReference = 413C51651CC284CA00F62468 /* FrameworkOSX.xcconfig */;
2232 2315
 			buildSettings = {
2233
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2234 2316
 				COMBINE_HIDPI_IMAGES = YES;
2235 2317
 				FRAMEWORK_VERSION = A;
2236 2318
 				INFOPLIST_FILE = "src/MulleScion-Info.plist";
2319
+				OTHER_LDFLAGS = (
2320
+					"-all_load",
2321
+					"-t",
2322
+					"-Z",
2323
+					"-L/usr/lib",
2324
+					"-F$(BUILT_PRODUCTS_DIR)",
2325
+					"-F$(DEPENDENCIES_DIR)/Frameworks/$(CONFIGURATION)",
2326
+					"$(inherited)",
2327
+				);
2237 2328
 				PRODUCT_NAME = MulleScion;
2238 2329
 				SKIP_INSTALL = NO;
2239 2330
 				WRAPPER_EXTENSION = framework;
... ...
@@ -2242,6 +2333,7 @@
2242 2333
 		};
2243 2334
 		41EC0146182D301A00A17DBD /* Debug */ = {
2244 2335
 			isa = XCBuildConfiguration;
2336
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
2245 2337
 			buildSettings = {
2246 2338
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
2247 2339
 				PRODUCT_NAME = MulleScionParser;
... ...
@@ -2251,6 +2343,7 @@
2251 2343
 		};
2252 2344
 		41EC0147182D301A00A17DBD /* Release */ = {
2253 2345
 			isa = XCBuildConfiguration;
2346
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
2254 2347
 			buildSettings = {
2255 2348
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
2256 2349
 				PRODUCT_NAME = MulleScionParser;
... ...
@@ -2260,6 +2353,7 @@
2260 2353
 		};
2261 2354
 		41EC0148182D301A00A17DBD /* Profile */ = {
2262 2355
 			isa = XCBuildConfiguration;
2356
+			baseConfigurationReference = 413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */;
2263 2357
 			buildSettings = {
2264 2358
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
2265 2359
 				PRODUCT_NAME = MulleScionParser;
... ...
@@ -2269,8 +2363,8 @@
2269 2363
 		};
2270 2364
 		41FAED7E182D275E002CD114 /* Debug */ = {
2271 2365
 			isa = XCBuildConfiguration;
2366
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2272 2367
 			buildSettings = {
2273
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2274 2368
 				COMBINE_HIDPI_IMAGES = YES;
2275 2369
 				PRODUCT_NAME = MulleScionFoundation;
2276 2370
 			};
... ...
@@ -2278,8 +2372,8 @@
2278 2372
 		};
2279 2373
 		41FAED7F182D275E002CD114 /* Release */ = {
2280 2374
 			isa = XCBuildConfiguration;
2375
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2281 2376
 			buildSettings = {
2282
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2283 2377
 				COMBINE_HIDPI_IMAGES = YES;
2284 2378
 				PRODUCT_NAME = MulleScionFoundation;
2285 2379
 			};
... ...
@@ -2287,8 +2381,8 @@
2287 2381
 		};
2288 2382
 		41FAED80182D275E002CD114 /* Profile */ = {
2289 2383
 			isa = XCBuildConfiguration;
2384
+			baseConfigurationReference = 413C516E1CC284CA00F62468 /* StaticLibraryOSX.xcconfig */;
2290 2385
 			buildSettings = {
2291
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
2292 2386
 				COMBINE_HIDPI_IMAGES = YES;
2293 2387
 				PRODUCT_NAME = MulleScionFoundation;
2294 2388
 			};
... ...
@@ -70,6 +70,7 @@ This is the general architecture of *MulleScion*
70 70
 *MulleScion* is happily used in a commercial project and has gone through
71 71
 enough iterations to pronounce it "ready for production".
72 72
 
73
+
73 74
 TOOLS
74 75
 =============
75 76
 There is an interactive editor available for OS X called [MulleScionist](http://www.mulle-kybernetik.com/software/git/MulleScionist/),
... ...
@@ -4,7 +4,11 @@ load available functionality to a standalone script.
4 4
 
5 5
 #### Example
6 6
 ```
7
+{% if __FOUNDATION__ == "Mulle" %}
8
+{% requires "com.mulle-kybernetik.foundation" %}
9
+{% else %}
7 10
 {% requires "com.apple.Foundation" %}
11
+{% endif %}
8 12
 ```
9 13
 
10 14
 requires searches in the following places:
... ...
@@ -81,9 +81,9 @@ static NSURL   *_mulle_scion_url_from_request_info( struct mg_request_info   *in
81 81
       s = [s substringFromIndex:1];
82 82
    s    = [s urlEscapedString];
83 83
    if( ! [s length])
84
-      return( [NSURL URLWithString:@"index.scion"]);
85
-
86
-   url  = [NSURL URLWithString:s];
84
+      url = [NSURL URLWithString:@"index.scion"];
85
+   else
86
+      url = [NSURL URLWithString:s];
87 87
    return( url);
88 88
 }
89 89
 
... ...
@@ -97,7 +97,7 @@ static int   _mulle_mongoose_begin_request( struct mg_connection *conn)
97 97
    MulleScionTemplate       *template;
98 98
    NSString                 *response;
99 99
    NSData                   *utf8Data;
100
-   
100
+
101 101
    info = mg_get_request_info( conn);
102 102
    url  = _mulle_scion_url_from_request_info( info);
103 103
    
... ...
@@ -44,6 +44,9 @@ static BOOL fileExists( NSString *fileName)
44 44
    NSFileManager  *manager;
45 45
    NSString       *dir;
46 46
    NSString       *path;
47
+
48
+   if( ! [fileName length])
49
+      return( NO);
47 50
    
48 51
    manager = [NSFileManager defaultManager];
49 52
    dir     = [manager currentDirectoryPath];
... ...
@@ -52,6 +52,7 @@ extern NSString   *MulleScionRenderOutputKey;
52 52
 extern NSString   *MulleScionCurrentFileKey;
53 53
 extern NSString   *MulleScionCurrentLineKey;
54 54
 extern NSString   *MulleScionCurrentFunctionKey;
55
+extern NSString   *MulleScionFoundationKey;
55 56
 extern NSString   *MulleScionFunctionTableKey;
56 57
 extern NSString   *MulleScionArgumentsKey;
57 58
 extern NSString   *MulleScionVersionKey;
... ...
@@ -75,6 +75,7 @@ NSString   *MulleScionCurrentFilterKey        = @"__FILTER__";
75 75
 NSString   *MulleScionCurrentFilterModeKey    = @"__FILTER_MODE__";
76 76
 NSString   *MulleScionPreviousFiltersKey      = @"__FILTER_STACK__";
77 77
 NSString   *MulleScionPreviousFilterModesKey  = @"__FILTER_MODE_STACK__";
78
+NSString   *MulleScionFoundationKey           = @"__FOUNDATION__";
78 79
 NSString   *MulleScionCurrentFunctionKey      = @"__FUNCTION__";
79 80
 NSString   *MulleScionFunctionTableKey        = @"__FUNCTION_TABLE__";
80 81
 NSString   *MulleScionCurrentLineKey          = @"__LINE__";
... ...
@@ -547,6 +548,13 @@ static id  f_NSLocalizedString( id self, NSArray *arguments, NSMutableDictionary
547 548
               forKey:MulleScionRenderOutputKey];
548 549
    [locals setObject:value_
549 550
               forKey:MulleScionCurrentFileKey];
551
+#if __MULLE_OBJC_RUNTIME__
552
+   [locals setObject:@"Mulle"
553
+             forKey:MulleScionFoundationKey];
554
+#else
555
+   [locals setObject:@"Apple"
556
+             forKey:MulleScionFoundationKey];
557
+#endif
550 558
    [locals setObject:[NSNumber numberWithDouble:PROJECT_VERSION]
551 559
               forKey:MulleScionVersionKey];
552 560
 
... ...
@@ -366,6 +366,9 @@ absolute_path_if_relative()
366 366
 
367 367
 
368 368
 MULLE_SCION=`absolute_path_if_relative "$MULLE_SCION"`
369
+DYLD_FALLBACK_FRAMEWORK_PATH="`pwd`/../dependencies/Frameworks/Debug"
370
+export DYLD_FALLBACK_FRAMEWORK_PATH
371
+
369 372
 
370 373
 test_binary "$MULLE_SCION"
371 374