More master.cfg updates

mworks-project · Feb 17, 2010 · b8511b9 · b8511b9
1 parent 5a7dcc3
commit b8511b9
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git a/buildbot_master/coxlab_config.py b/buildbot_master/coxlab_config.py
@@ -1,3 +1,4 @@
 repository_base_url = 'git://github.com/monkeyworks-project/' 
 installer_destination_path = '/home/coxlab/webapps/public/'
+project_url = 'http://monkeyworks-project.github.com'
 buildbot_hostname = 'monkeyworks.coxlab.org'
diff --git a/buildbot_master/dicarlolab_config.py b/buildbot_master/dicarlolab_config.py
@@ -1,3 +1,4 @@
 repository_base_url = 'git://github.com/dicarlolab-monkeyworks/' 
 installer_destination_path = '/Library/WebServer/Documents/mw/'
+project_url = 'http://github.com/dicarlolab-monkeyworks'
 buildbot_hostname = 'dicarlo-mwdev.mit.edu'
diff --git a/buildbot_master/master.cfg b/buildbot_master/master.cfg
@@ -52,7 +52,7 @@ c['slaves'] = [BuildSlave(standard_mac_arch, slave_pass)]
 c['slavePortnum'] = 7355
 
 c['projectName'] = mw_project_name
-c['projectURL'] = "http://monkeyworks-project.github.com"
+c['projectURL'] = project_url
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.Waterfall page) is visible. This
@@ -286,20 +286,6 @@ clean_monkeyworks_builder = {'name': builder_name,
 
 builders.append(clean_monkeyworks_builder)
 
-# ==========================================================
-# editor_factory
-# ==========================================================
-
-builder_name = "editor"
-editor_builder = {'name': builder_name,
-                  'slavename': standard_mac_arch,
-                  'builddir': builder_name,
-                  'factory': XCodeBuildFactory(source.Git(repository_base_url + "mw_editor.git", current_branch, mode=checkout_type),
-                                              ["MWEditor"], standard_xcode_build_config),
-                  }
-
-builders.append(editor_builder)
-
 # ==========================================================
 # required_libs_factory
 # ==========================================================
@@ -318,22 +304,6 @@ required_libs_builder = {'name': builder_name,
 
 builders.append(required_libs_builder)
 
-
-# ==========================================================
-# example_xml_factory
-# ==========================================================
-
-
-builder_name = "example_xml"
-example_xml_builder = {'name': builder_name,
-                          'slavename': standard_mac_arch,
-                          'builddir': builder_name,
-                          'factory': XCodeBuildFactory(source.Git(repository_base_url + "mw_examples.git", current_branch, mode=checkout_type),
-                                                       ["InstallTests"], 'Release'),
-                          }
-
-builders.append(example_xml_builder)
-
 # ==========================================================
 # scarab_factory
 # ==========================================================
@@ -386,6 +356,22 @@ cppunit_test_builder = {'name': builder_name,
 builders.append(cppunit_test_builder)
 
 
+# ==========================================================
+# example_xml_factory
+# ==========================================================
+
+
+builder_name = "example_xml"
+example_xml_builder = {'name': builder_name,
+                          'slavename': standard_mac_arch,
+                          'builddir': builder_name,
+                          'factory': XCodeBuildFactory(source.Git(repository_base_url + "mw_examples.git", current_branch, mode=checkout_type),
+                                                       ["InstallTests"], 'Release'),
+                          }
+
+builders.append(example_xml_builder)
+
+
 
 # ==========================================================
 # Marionette Test Builders
@@ -500,6 +486,25 @@ client_builder = {'name': builder_name,
       }
 builders.append(client_builder)
 
+# ==========================================================
+# editor_factory
+# ==========================================================
+
+builder_name = "editor"
+editor_builder = {'name': builder_name,
+                  'slavename': standard_mac_arch,
+                  'builddir': builder_name,
+                  'factory': XCodeBuildFactory(source.Git(repository_base_url + "mw_editor.git", current_branch, mode=checkout_type),
+                                              ["MWEditor"], standard_xcode_build_config),
+                  }
+
+builders.append(editor_builder)
+
+
+# add all of the plugin builders
+for pb in plugin_builders:
+    builders.append(pb)
+
 
 
 
@@ -535,11 +540,6 @@ installer_builder = {'name': builder_name,
 builders.append(installer_builder)
 
 
-# add all of the plugin builders
-for pb in plugin_builders:
-    builders.append(pb)
-
-
 c['builders'] = builders