otw - Fixed up a few issues for BuildBot. Not quite done yet though...

Assets/Editor/AutomationManager/AutomationManager.cs → Assets/Editor/AutomationManager/OCAutomatedPlayerBuilder.cs

@@ -5,7 +5,7 @@
 /// Example commandline usage:
 /// "C:\Program Files (x86)\Unity\Editor\Unity.exe" -batchMode -quit -nographics -projectPath C:\project -executeMethod AutomationManager.BuildAll
 /// </summary>
-public class AutomationManager
+public class OCAutomatedPlayerBuilder
 {
 	[MenuItem ("Build/BuildAll")]
 	static void BuildAll()

Assets/OpenCog Assets/Config/Resources/embodiment.txt

@@ -91,3 +91,4 @@ GOLD_STANDARD_FILENAME = GoldStandards.txt
 # This is the VisibilityMap tile side
 # half of the LocalSpaceMap2D grid side (xDim | yDim) is a good value
 VISIBILITY_MAP_TILES_PER_SIDE = 64
+

Assets/OpenCog Assets/Scripts/OpenCog/Editor/Automation/AutomationManager.cs → Assets/OpenCog Assets/Scripts/OpenCog/Editor/Automation/OCAutomatedPlayerBuilder.cs

@@ -32,8 +32,8 @@ namespace Automation
 /// </summary>
 #region Class Attributes
 
-#endregion
-public class AutomationManager //@TODO: coordinate with David and rename to OCAutomatedPlayerBuild
+#endregion 
+public class OCAutomatedPlayerBuilder //@TODO: coordinate with David and rename to OCAutomatedPlayerBuild
 {
 
   /////////////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ static void BuildAll()
 	[MenuItem ("Build/BuildStandaloneLinux64Player")]
 	static void BuildStandaloneLinux64Player()
 	{			
-		string[] scenes = { "Assets/Scenes/Game/Game.unity", "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
+		string[] scenes = { "Assets/Scenes/Game/Game.unity"};//, "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
 		EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneLinux64);
 		BuildPipeline.BuildPlayer(scenes
 								  , "../Players/Unity3DGameWorldPlayer_Linux64"
@@ -102,7 +102,7 @@ static void BuildStandaloneLinux64TestPlayer()
 	[MenuItem ("Build/BuildStandaloneLinuxPlayer")]
 	static void BuildStandaloneLinuxPlayer()
 	{
-		string[] scenes = { "Assets/Scenes/Game/Game.unity", "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
+		string[] scenes = { "Assets/Scenes/Game/Game.unity"};//, "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
 		EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneLinux);
 		BuildPipeline.BuildPlayer(scenes
 								  , "../Players/Unity3DGameWorldPlayer_Linux"
@@ -112,7 +112,7 @@ static void BuildStandaloneLinuxPlayer()
 	[MenuItem ("Build/BuildStandaloneWindowsPlayer")]
 	static void BuildStandaloneWindowsPlayer()
 	{
-		string[] scenes = { "Assets/Scenes/Game/Game.unity", "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
+		string[] scenes = { "Assets/Scenes/Game/Game.unity"};//, "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
 		EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows);
 		BuildPipeline.BuildPlayer(scenes
 								  , "../Players/Unity3DGameWorldPlayer_Windows.exe"
@@ -122,7 +122,7 @@ static void BuildStandaloneWindowsPlayer()
 	[MenuItem ("Build/BuildStandaloneWindows64Player")]
 	static void BuildStandaloneWindows64Player()
 	{	
-		string[] scenes = { "Assets/Scenes/Game/Game.unity", "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
+		string[] scenes = { "Assets/Scenes/Game/Game.unity"};//, "Assets/Scenes/MainMenu/MainMenu.unity", "Assets/Scenes/BlockSetViewer/BlockSetViewer.unity" };
 		EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows64);
 		BuildPipeline.BuildPlayer(scenes
 								  , "../Players/Unity3DGameWorldPlayer_Windows64.exe"

Assets/OpenCog Assets/Scripts/OpenCog/Generator/OCWorldGenerator.cs

@@ -49,10 +49,23 @@ void Awake() {
 			}	
 		}
 
-#if (TEST_AND_EXIT)
-		Console.WriteLine("Level Loaded...");
-		Application.Quit();
-#endif
+		TextAsset configFile = (TextAsset)Resources.Load("embodiment");
+        if(configFile != null) OCConfig.Instance.LoadFromTextAsset(configFile);
+				OCConfig.Instance.LoadFromCommandLine();
+
+		string testValue = OCConfig.Instance.get("test");
+		string quitValue = OCConfig.Instance.get("quit");
+
+		if(testValue == "internal_XGA")
+		{
+			Screen.SetResolution(1024, 768, false);
+			Console.WriteLine("Level Loaded...");
+		}
+
+		if(quitValue == "true")
+		{
+			Application.Quit();
+		}
 	}
 
 	void Update() {

Assets/OpenCog Assets/Scripts/OpenCog/Utility/OCConfig.cs

@@ -156,6 +156,8 @@ public void OnEnable()
 
 		// Testing and Buildbot Integration
 		//_settings["TEST_AND_EXIT"] = "false";  //Use #define TEST_AND_EXIT instead...
+		_settings["test"] = "";// will be "internal_XGA" in case of buildbot
+		_settings["quit"] = "false";// should be "true" in case of buildbot 
 	}
 
 	/// <summary>
@@ -187,7 +189,7 @@ public void LoadFromFile(string fileName)
           }
           if (_settings.ContainsKey(tokens[0])) 
           {
-              //if (Debug.isDebugBuild) Debug.Log(tokens[0] + "=" + tokens[1]);
+              if (Debug.isDebugBuild) Debug.Log(tokens[0] + "=" + tokens[1]);
               _settings[tokens[0]] = tokens[1];
           }
           else
@@ -243,7 +245,14 @@ public void LoadFromCommandLine()
 			string[] keyValuePair = arg.Split(':');
 			if(keyValuePair != null && _settings.ContainsKey(keyValuePair[0]))
 			{
-				_settings[keyValuePair[0]] = keyValuePair[1];
+				if(keyValuePair[0] != "quit")
+				{
+              		//if (Debug.isDebugBuild) Debug.Log(tokens[0] + "=" + tokens[1]);
+              		_settings[keyValuePair[0]] = keyValuePair[1];
+				}
+				else
+					_settings["quit"] = "true";
+
 			}
 			else
 			{