Began integrating console and version management

ServerConsole/ServerConsole/AssemblyInfo.cs

@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("ServerConsole")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ServerConsole")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]

ServerConsole/ServerConsole/ServerConsole.csproj

@@ -1,35 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ServerConsole</RootNamespace>
-    <AssemblyName>ServerConsole</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ServerConsole.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>

ServerConsole/ServerConsole/ServerConsole.sln

@@ -1,7 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.2017
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole.csproj", "{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}"
-EndProject
-Global
-EndGlobal

ServerConsole/default.build

@@ -3,7 +3,8 @@
         <description>nant buildfile for OpenSim</description>
         <property name="debug" value="true" overwrite="false" />
         <target name="clean" description="remove all generated files">
-            <delete file="../../bin/ServerConsole.dll" failonerror="false" />
+            <delete file="../common/bin/ServerConsole.dll" failonerror="false" />
+	    <delete file="../common/bin/ServerConsole.dll.mdb" failonerror="false" />
         </target>
 
 	<target name="svnupdate" description="updates to latest SVN">
@@ -18,8 +19,8 @@
 	
 	<target name="build" description="compiles the source code">
 	
-	<loadfile file="../../VERSION" property="svnver"/>
+	<loadfile file="../VERSION" property="svnver"/>
-	<asminfo output="ServerConsole/AssemblyInfo.cs" language="CSharp">
+	<asminfo output="AssemblyInfo.cs" language="CSharp">
 		<imports>
 			<import namespace="System" />
 			<import namespace="System.Reflection" />
@@ -29,18 +30,18 @@
 			<attribute type="ComVisibleAttribute" value="false" />
 			<attribute type="CLSCompliantAttribute" value="false" />
 			<attribute type="AssemblyVersionAttribute" value="${svnver}" />
-			<attribute type="AssemblyTitleAttribute" value="opensim-serverconsole" />
+			<attribute type="AssemblyTitleAttribute" value="ogs-serverconsole" />
 			<attribute type="AssemblyDescriptionAttribute" value="The default server console" />
 			<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
 		</attributes>
 	</asminfo>
 
-	<csc target="library" output="../../bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
+	<csc target="library" output="../common/bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
 			<references>
 				<include name="System" />
 				<include name="System.Xml" />
 			</references>
-			<sources basedir="ServerConsole/">
+			<sources>
 				<include name="*.cs" />
 			</sources>
 		</csc>

genvers.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+MAJOR=0
+MINOR=1
+BUILD=`date +%s`
+REVISION=`svnversion . | sed s/:// | sed s/M//`
+REALREVISION=`svnversion`
+cat common/src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >common/src/VersionInfo.cs
+echo -n $MAJOR.$MINOR.*.$REVISION >VERSION