From 9cb0c7c86ec48225710fee940ad5347d48634e46 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 10 Nov 2009 18:58:28 +0000
Subject: Stop OpenSim.Grid.GridServer.exe from building to reduce
 user/developer confusion, since only the ROBUST grid service now works
 GridServer dll still building for now due to unresolved dependencies with the
 remaining OpenSim.Grid.UserServer.exe

---
 OpenSim/Grid/GridServer/Program.cs | 65 --------------------------------------
 prebuild.xml                       |  2 +-
 2 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 OpenSim/Grid/GridServer/Program.cs

diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
deleted file mode 100644
index 741a01b..0000000
--- a/OpenSim/Grid/GridServer/Program.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using log4net.Config;
-using Nini.Config;
-
-namespace OpenSim.Grid.GridServer
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            ArgvConfigSource argvSource = new ArgvConfigSource(args);
-            argvSource.AddSwitch("Startup", "console", "c");
-            argvSource.AddSwitch("Startup", "xmlfile", "x");
-
-            XmlConfigurator.Configure();
-
-            GridServerBase app = new GridServerBase();
-
-            IConfig startupConfig = argvSource.Configs["Startup"];
-            if (startupConfig != null)
-            {
-                app.m_consoleType = startupConfig.GetString("console", "local");
-                app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
-            }
-
-            app.m_configSource = argvSource;
-
-//            if (args.Length > 0 && args[0] == "-setuponly")
-//            {
-//                app.Config();
-//            }
-//            else
-//            {
-                app.Startup();
-                app.Work();
-//            }
-        }
-    }
-}
diff --git a/prebuild.xml b/prebuild.xml
index 33cb647..b7ce93c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -909,7 +909,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
-- 
cgit v1.1