Merge 04e469b into e40e232

KjellSchubert · Feb 12, 2015 · db82fae · db82fae
2 parents e40e232 + 04e469b
commit db82fae
Show file tree

Hide file tree

Showing 51 changed files with 893 additions and 520 deletions.
diff --git a/bru.xcodeproj/project.pbxproj b/bru.xcodeproj/project.pbxproj
@@ -0,0 +1,112 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXFileReference section */
+		C60C157F1A8CED200084C042 /* autoupdate.last */ = {isa = PBXFileReference; lastKnownFileType = text; path = autoupdate.last; sourceTree = "<group>"; };
+		C60C15801A8CED200084C042 /* autoupdate.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = autoupdate.py; sourceTree = "<group>"; };
+		C60C15811A8CED200084C042 /* bru_common.gypi */ = {isa = PBXFileReference; lastKnownFileType = text; path = bru_common.gypi; sourceTree = "<group>"; };
+		C60C15821A8CED200084C042 /* bru.bat */ = {isa = PBXFileReference; lastKnownFileType = text; path = bru.bat; sourceTree = "<group>"; };
+		C60C15831A8CED200084C042 /* bru.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = bru.py; sourceTree = "<group>"; };
+		C60C15841A8CED200084C042 /* bru.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = bru.sh; sourceTree = "<group>"; };
+		C60C15851A8CED200084C042 /* brulib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = brulib; sourceTree = "<group>"; };
+		C60C15861A8CED200084C042 /* detect_cycles.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = detect_cycles.py; sourceTree = "<group>"; };
+		C60C15871A8CED200084C042 /* graph_cycles.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = graph_cycles.py; sourceTree = "<group>"; };
+		C60C15881A8CED200084C042 /* gyp_sources_intersect.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = gyp_sources_intersect.py; sourceTree = "<group>"; };
+		C60C15891A8CED200084C042 /* import_boost.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = import_boost.py; sourceTree = "<group>"; };
+		C60C158A1A8CED200084C042 /* library */ = {isa = PBXFileReference; lastKnownFileType = folder; path = library; sourceTree = "<group>"; };
+		C60C158B1A8CED200084C042 /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
+		C60C158C1A8CED200084C042 /* makefilelog2gyp.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = makefilelog2gyp.py; sourceTree = "<group>"; };
+		C60C158D1A8CED200084C042 /* merge_boost_cycles.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = merge_boost_cycles.py; sourceTree = "<group>"; };
+		C60C158E1A8CED200084C042 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = readme.md; sourceTree = "<group>"; };
+		C60C158F1A8CED200084C042 /* requirements-dev.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "requirements-dev.txt"; sourceTree = "<group>"; };
+		C60C15901A8CED200084C042 /* requirements.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = requirements.txt; sourceTree = "<group>"; };
+		C60C15911A8CED200084C042 /* scan_deps.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = scan_deps.py; sourceTree = "<group>"; };
+		C60C15921A8CED200084C042 /* tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tests; sourceTree = "<group>"; };
+		C60C15931A8CED200084C042 /* vcproj2gyp.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = vcproj2gyp.py; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+		C60C15781A8CECFE0084C042 = {
+			isa = PBXGroup;
+			children = (
+				C60C157F1A8CED200084C042 /* autoupdate.last */,
+				C60C15801A8CED200084C042 /* autoupdate.py */,
+				C60C15811A8CED200084C042 /* bru_common.gypi */,
+				C60C15821A8CED200084C042 /* bru.bat */,
+				C60C15831A8CED200084C042 /* bru.py */,
+				C60C15841A8CED200084C042 /* bru.sh */,
+				C60C15851A8CED200084C042 /* brulib */,
+				C60C15861A8CED200084C042 /* detect_cycles.py */,
+				C60C15871A8CED200084C042 /* graph_cycles.py */,
+				C60C15881A8CED200084C042 /* gyp_sources_intersect.py */,
+				C60C15891A8CED200084C042 /* import_boost.py */,
+				C60C158A1A8CED200084C042 /* library */,
+				C60C158B1A8CED200084C042 /* LICENSE.txt */,
+				C60C158C1A8CED200084C042 /* makefilelog2gyp.py */,
+				C60C158D1A8CED200084C042 /* merge_boost_cycles.py */,
+				C60C158E1A8CED200084C042 /* readme.md */,
+				C60C158F1A8CED200084C042 /* requirements-dev.txt */,
+				C60C15901A8CED200084C042 /* requirements.txt */,
+				C60C15911A8CED200084C042 /* scan_deps.py */,
+				C60C15921A8CED200084C042 /* tests */,
+				C60C15931A8CED200084C042 /* vcproj2gyp.py */,
+			);
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXProject section */
+		C60C15791A8CECFE0084C042 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0610;
+			};
+			buildConfigurationList = C60C157C1A8CECFE0084C042 /* Build configuration list for PBXProject "bru" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = C60C15781A8CECFE0084C042;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+			);
+		};
+/* End PBXProject section */
+
+/* Begin XCBuildConfiguration section */
+		C60C157D1A8CECFE0084C042 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		C60C157E1A8CECFE0084C042 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C60C157C1A8CECFE0084C042 /* Build configuration list for PBXProject "bru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C60C157D1A8CECFE0084C042 /* Debug */,
+				C60C157E1A8CECFE0084C042 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = C60C15791A8CECFE0084C042 /* Project object */;
+}
diff --git a/bru.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/bru.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/bru.xcodeproj/project.xcworkspace/xcshareddata/bru.xccheckout b/bru.xcodeproj/project.xcworkspace/xcshareddata/bru.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>B28081B4-A0B7-481B-86F3-695ACEE0C3A1</string>
+	<key>IDESourceControlProjectName</key>
+	<string>bru</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>621EFD65771BC8E2B0CA48A4BD6BAE0684B46621</key>
+		<string>https://github.com/um68/bru.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>bru.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>621EFD65771BC8E2B0CA48A4BD6BAE0684B46621</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/um68/bru.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>621EFD65771BC8E2B0CA48A4BD6BAE0684B46621</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>621EFD65771BC8E2B0CA48A4BD6BAE0684B46621</string>
+			<key>IDESourceControlWCCName</key>
+			<string>bru</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/library/boost-algorithm/1.57.0.gyp b/library/boost-algorithm/1.57.0.gyp
@@ -28,12 +28,8 @@
                 "../boost-exception/boost-exception.gyp:*",
                 "../boost-iterator/boost-iterator.gyp:*"
             ]
-        } 
-    ],
-
-    "conditions": [
-      ["OS!='iOS'", {
-
+        },
+        {
             "target_name": "boost-algorithm_partition_copy_test1",
             "type": "executable",
             "test": {},
@@ -43,7 +39,15 @@
             "dependencies": [ 
                 "boost-algorithm",
                 "../boost-test/boost-test.gyp:*"
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
-        }]
+        }
     ]
 }
diff --git a/library/boost-any/1.57.0.gyp b/library/boost-any/1.57.0.gyp
@@ -19,10 +19,7 @@
                 "../boost-mpl/boost-mpl.gyp:*",
                 "../boost-type_index/boost-type_index.gyp:*"
             ]
-        }        
-    ],    
-    "conditions": [
-      ["OS!='iOS'", 
+        },
         {
             "target_name": "boost-any_test",
             "type": "executable",
@@ -31,8 +28,15 @@
                 "1.57.0/any-boost-1.57.0/test/any_test.cpp"
             ],
             "dependencies": [ "boost-any" 
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
         }
-      ] 
     ]
 }
diff --git a/library/boost-array/1.57.0.gyp b/library/boost-array/1.57.0.gyp
@@ -18,18 +18,22 @@
                 "../boost-assert/boost-assert.gyp:*",
                 "../boost-core/boost-core.gyp:*"
             ]
-        }        
-    ],    
-    "conditions": [
-      ["OS!='iOS'", 
+        },
         {
             "target_name": "boost-array_array2",
             "type": "executable",
             "test": {},
             "sources": [ "1.57.0/array-boost-1.57.0/test/array2.cpp" ],
             "dependencies": [ "boost-array" 
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
         }
-      ] 
     ]
 }
diff --git a/library/boost-chrono/1.57.0.gyp b/library/boost-chrono/1.57.0.gyp
@@ -36,30 +36,42 @@
                 "../boost-mpl/boost-mpl.gyp:*",
                 "../boost-ratio/boost-ratio.gyp:*"
             ]
-        }
-    ],    
-    "conditions": [
-      ["OS!='iOS'", 
+        },
         {
             "target_name": "boost-chrono_example_test_duration",
             "type": "executable",
             "test": {},
             "sources": [
                 "1.57.0/chrono-boost-1.57.0/example/test_duration.cpp"
             ],
-            "dependencies": [ "boost-chrono" ]
+            "dependencies": [ "boost-chrono" ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
+            ]
         },
-
         {
             "target_name": "boost-chrono_example_test_clock",
             "type": "executable",
             "test": {},
             "sources": [
                 "1.57.0/chrono-boost-1.57.0/example/test_clock.cpp"
             ],
-            "dependencies": [ "boost-chrono" 
+            "dependencies": [
+                "boost-chrono"
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
         }
-      ] 
     ]
 }
diff --git a/library/boost-circular_buffer/1.57.0.gyp b/library/boost-circular_buffer/1.57.0.gyp
@@ -23,20 +23,25 @@
                 "../boost-mpl/boost-mpl.gyp:*",
                 "../boost-iterator/boost-iterator.gyp:*"
             ]
-        }        
-    ],    
-    "conditions": [
-      ["OS!='iOS'", 
+        },
         {
             "target_name": "boost-circular_buffer_example",
             "type": "executable",
             "test": {},
             "sources": [ 
                 "1.57.0/circular_buffer-boost-1.57.0/example/circular_buffer_example.cpp" 
             ],
-            "dependencies": [ "boost-circular_buffer" 
+            "dependencies": [
+                "boost-circular_buffer"
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
         }
-      ] 
     ]
 }
diff --git a/library/boost-container/1.57.0.gyp b/library/boost-container/1.57.0.gyp
@@ -31,10 +31,7 @@
                 "../boost-mpl/boost-mpl.gyp:*",
                 "../boost-intrusive/boost-intrusive.gyp:*"
             ]
-        }
-    ],    
-    "conditions": [
-      ["OS!='iOS'", 
+        },
         # this test compiles ridiculously slowly btw (about 1min)
         # So I disabled it for now.
         #{
@@ -44,15 +41,22 @@
         #    "sources": [ "1.57.0/container-boost-1.57.0/test/vector_test.cpp" ],
         #    "dependencies": [ "boost-container" ]
         #},
-
         {
             "target_name": "boost-container_string_test",
             "type": "executable",
             "test": {},
             "sources": [ "1.57.0/container-boost-1.57.0/test/string_test.cpp" ],
-            "dependencies": [ "boost-container" 
+            "dependencies": [
+                "boost-container"
+            ],
+            # this disables building the example on iOS
+            "conditions": [
+                ["OS=='iOS'",
+                    {
+                        "type": "none"
+                    }
+                ]
             ]
         }
-      ] 
     ]
 }