10 files changed, 214 insertions, 0 deletions
diff --git a/releng/CAUTION b/releng/CAUTION
new file mode 100644
index 0000000..6418046
--- /dev/null
+++ b/releng/CAUTION
@@ -0,0 +1,4 @@
+!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
+DO NOT RUN ANY OF THE SCRIPTS IN THIS DIRECTORY WITHOUT
+READING THEM!!!!!!!!!!!!!
+!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/releng/README b/releng/README
new file mode 100644
index 0000000..e73f395
--- /dev/null
+++ b/releng/README
@@ -0,0 +1,3 @@
+This directory contains scripts etc for creating a tarball/package out of the SVN tree.
+Use makerel.sh to generate a tarball, do not use other scripts
+It is designed to be run before releases or by developers/users before a local install from source.
diff --git a/releng/createreldir.sh b/releng/createreldir.sh
new file mode 100644
index 0000000..eb470b0
--- /dev/null
+++ b/releng/createreldir.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# this script creates a new opensim-major.minor directory and copies all the relevant files into it
+# not designed for direct invocation from the command line
+mkdir opensim-$OPENSIMMAJOR.$OPENSIMMINOR
+cp -R dist/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR
+cp -R build/bin/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR/bin
diff --git a/releng/dist/INSTALL b/releng/dist/INSTALL
new file mode 100644
index 0000000..f67fe43
--- /dev/null
+++ b/releng/dist/INSTALL
@@ -0,0 +1,33 @@
+INSTALLING FROM SOURCE WITH WINDOWS
+1 - Ensure you have visual studio express (the C# edition)
+2 - Check you have a clean source tree with the latest VS2005 solution, if unsure run prebuild (See README file)
+3 - Open the solution in visual studio and build it
+4 - Look in bin/ for the output
+5 - ???
+6 - Profit
+INSTALLING FROM SOURCE WITH LINUX/BSD/*NIX
+1 - Ensure you have a clean source tree with latest nant build files, if not, get one or run prebuild (See README file)
+2 - Go to a shell prompt and change to the correct directory
+3 - Type the following:
+nant
+4 - Look in bin/ for the output
+5 - ???
+6 - Profit
+INSTALLING BINARY RELEASE
+Simply extract the tarball into a good location and run straight out of bin/. You may also wish to put all the binaries into /opt/opensim on *nix systems and adjust your path accordingly. At time of writing there is no official way yet to do this. Watch this space.
diff --git a/releng/dist/README b/releng/dist/README
new file mode 100644
index 0000000..125d5da
--- /dev/null
+++ b/releng/dist/README
@@ -0,0 +1,70 @@
+For installation notes, please read INSTALL
+RUNNING SANDBOX MODE (the standard way)
+To get up and running in sandbox mode, please start up opensim like this from the command line:
+(first ensure you are in the right directory)
+OpenSim.exe -sandbox (windows)
+mono OpenSim.exe -sandbox (linux/BSD/MacOS X)
+Then startup your second life viewer with the following parameters:
+-loginuri http://yourserver:9000/
+The method to do this is dependent upon your OS. "yourserver" will be 127.0.0.1 if you accept the defaults when starting opensim.
+RUNNING SANDBOX WITH USER ACCOUNTS
+* open cmd window, go to /bin and launch 
+OpenSim.exe -sandbox -loginserver -useraccounts
+* launch web browser, go to
+http://localhost:9000/Admin
+enter password 'Admin'
+* Select 'Accounts', enter credentials, press 'Create'
+* Now, log on thru your viewer (see above) with your newly created credentials.
+* Have Fun!
+PREBUILD
+We use Prebuild to generate vs2005 solutions and nant build scripts.
+=== Building Prebuild ===
+At the moment, the Prebuild exe is shipped as /bin/Prebuild.exe so you shouldn't really have to build it.
+But here's the instructions anyway :
+The Prebuild master project is /prebuild.xml
+To build it with vs2005 :
+* build the solution /Prebuild/Prebuild.sln
+To build it with nant :
+* cd to /Prebuild/
+* type 'nant'
+After you've built it, it will land in the root /bin/ directory,
+=== Modyfying the OpenSim solution ===
+When adding or changing projects, modify the prebuild.xml and then execute
+bin/Prebuild.exe /target {target}
+where target is either 
+vs2005 - to generate new vs2005 solutions and projects
+nant - to generate new nant build scripts
+Remember to run prebuild whenever you've added or removed files as well.
diff --git a/releng/dist/bin/OpenSim b/releng/dist/bin/OpenSim
new file mode 100644
index 0000000..9b46075
--- /dev/null
+++ b/releng/dist/bin/OpenSim
@@ -0,0 +1,3 @@
+#!/bin/sh
+mono OpenSim.exe $*
diff --git a/releng/dobuild.sh b/releng/dobuild.sh
new file mode 100644
index 0000000..0fbb979
--- /dev/null
+++ b/releng/dobuild.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# this script does a guaranteed clean build from SVN using a URL specified on the command line
+rm -rf build/
+mkdir build
+printf "Getting fresh source tree from SVN..."
+svn checkout $1 build
+printf "Updating templates..."
+./parsetmpl.sh templates/VersionInfo.cs.tmpl >build/OpenSim.RegionServer/VersionInfo.cs
+printf "Running prebuild..."
+cd build
+mono bin/Prebuild.exe /target nant
+printf "Doing the build..."
+nant
diff --git a/releng/makerel.sh b/releng/makerel.sh
new file mode 100644
index 0000000..b7bc568
--- /dev/null
+++ b/releng/makerel.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# This is the one!
+export OPENSIMMAJOR=0
+export OPENSIMMINOR=2
+export BUILD=`date +%s`
+export BRANCH=DEVEL
+export SVNURL=svn://openmetaverse.org/opensim/trunk
+# shouldn't have to change anything below here
+script dobuild.log -c "./dobuild.sh $SVNURL"
+if [ ! $? -eq 0 ]
+then
+  echo "Build failed!"
+else
+  script createrel.log -c ./createreldir.sh
+  rm -rf build
+  tar cvf opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar opensim-$OPENSIMMAJOR.$OPENSIMMINOR/*
+  gzip opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar
+fi
+rm -rf opensim-$OPENSIMMAJOR.$OPENSIMMINOR
+echo "Produced binary tarball ready for distribution."
diff --git a/releng/parsetmpl.sh b/releng/parsetmpl.sh
new file mode 100644
index 0000000..0ce6d24
--- /dev/null
+++ b/releng/parsetmpl.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# this script parses a template to replace @@ tokens
+cat $1 | sed s/@@VERSION/$OPENSIMMAJOR.$OPENSIMMINOR/g | sed s/@@BUILD/$BUILD/g | sed s/@@SVNREV/`svnversion`/g
diff --git a/releng/templates/VersionInfo.cs.tmpl b/releng/templates/VersionInfo.cs.tmpl
new file mode 100644
index 0000000..29159e2
--- /dev/null
+++ b/releng/templates/VersionInfo.cs.tmpl
@@ -0,0 +1,37 @@
+/*
+Copyright (c) OpenSim project, http://osgrid.org/
+*
+* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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 System;
+namespace OpenSim
+{
+    /// <summary>
+    /// </summary>
+    public class VersionInfo
+    {
+        public static string Version = "@@VERSION, Build @@BUILD, Revision @@SVNREV";
+    }
+}

diff --git a/releng/CAUTION b/releng/CAUTION new file mode 100644 index 0000000..6418046 --- /dev/null +++ b/releng/CAUTION
@@ -0,0 +1,4 @@
	1	!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
	2	DO NOT RUN ANY OF THE SCRIPTS IN THIS DIRECTORY WITHOUT
	3	READING THEM!!!!!!!!!!!!!
	4	!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!


diff --git a/releng/README b/releng/README new file mode 100644 index 0000000..e73f395 --- /dev/null +++ b/releng/README
@@ -0,0 +1,3 @@
	1	This directory contains scripts etc for creating a tarball/package out of the SVN tree.
	2	Use makerel.sh to generate a tarball, do not use other scripts
	3	It is designed to be run before releases or by developers/users before a local install from source.


diff --git a/releng/createreldir.sh b/releng/createreldir.sh new file mode 100644 index 0000000..eb470b0 --- /dev/null +++ b/releng/createreldir.sh
@@ -0,0 +1,9 @@
	1	#!/bin/sh
	2
	3	# this script creates a new opensim-major.minor directory and copies all the relevant files into it
	4	# not designed for direct invocation from the command line
	5
	6	mkdir opensim-$OPENSIMMAJOR.$OPENSIMMINOR
	7
	8	cp -R dist/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR
	9	cp -R build/bin/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR/bin


diff --git a/releng/dist/INSTALL b/releng/dist/INSTALL new file mode 100644 index 0000000..f67fe43 --- /dev/null +++ b/releng/dist/INSTALL
@@ -0,0 +1,33 @@
	1	INSTALLING FROM SOURCE WITH WINDOWS
	2
	3	1 - Ensure you have visual studio express (the C# edition)
	4
	5	2 - Check you have a clean source tree with the latest VS2005 solution, if unsure run prebuild (See README file)
	6
	7	3 - Open the solution in visual studio and build it
	8
	9	4 - Look in bin/ for the output
	10
	11	5 - ???
	12
	13	6 - Profit
	14
	15	INSTALLING FROM SOURCE WITH LINUX/BSD/*NIX
	16
	17	1 - Ensure you have a clean source tree with latest nant build files, if not, get one or run prebuild (See README file)
	18
	19	2 - Go to a shell prompt and change to the correct directory
	20
	21	3 - Type the following:
	22
	23	nant
	24
	25	4 - Look in bin/ for the output
	26
	27	5 - ???
	28
	29	6 - Profit
	30
	31	INSTALLING BINARY RELEASE
	32
	33	Simply extract the tarball into a good location and run straight out of bin/. You may also wish to put all the binaries into /opt/opensim on *nix systems and adjust your path accordingly. At time of writing there is no official way yet to do this. Watch this space.


diff --git a/releng/dist/README b/releng/dist/README new file mode 100644 index 0000000..125d5da --- /dev/null +++ b/releng/dist/README
@@ -0,0 +1,70 @@
	1	For installation notes, please read INSTALL
	2
	3	RUNNING SANDBOX MODE (the standard way)
	4
	5	To get up and running in sandbox mode, please start up opensim like this from the command line:
	6
	7	(first ensure you are in the right directory)
	8
	9	OpenSim.exe -sandbox (windows)
	10
	11	mono OpenSim.exe -sandbox (linux/BSD/MacOS X)
	12
	13	Then startup your second life viewer with the following parameters:
	14
	15	-loginuri http://yourserver:9000/
	16
	17	The method to do this is dependent upon your OS. "yourserver" will be 127.0.0.1 if you accept the defaults when starting opensim.
	18
	19
	20	RUNNING SANDBOX WITH USER ACCOUNTS
	21
	22	* open cmd window, go to /bin and launch
	23	OpenSim.exe -sandbox -loginserver -useraccounts
	24
	25	* launch web browser, go to
	26	http://localhost:9000/Admin
	27	enter password 'Admin'
	28
	29	* Select 'Accounts', enter credentials, press 'Create'
	30
	31	* Now, log on thru your viewer (see above) with your newly created credentials.
	32
	33	* Have Fun!
	34
	35
	36	PREBUILD
	37
	38	We use Prebuild to generate vs2005 solutions and nant build scripts.
	39
	40	=== Building Prebuild ===
	41
	42	At the moment, the Prebuild exe is shipped as /bin/Prebuild.exe so you shouldn't really have to build it.
	43
	44	But here's the instructions anyway :
	45
	46	The Prebuild master project is /prebuild.xml
	47
	48	To build it with vs2005 :
	49
	50	* build the solution /Prebuild/Prebuild.sln
	51
	52	To build it with nant :
	53
	54	* cd to /Prebuild/
	55	* type 'nant'
	56
	57	After you've built it, it will land in the root /bin/ directory,
	58
	59	=== Modyfying the OpenSim solution ===
	60
	61	When adding or changing projects, modify the prebuild.xml and then execute
	62
	63	bin/Prebuild.exe /target {target}
	64
	65	where target is either
	66	vs2005 - to generate new vs2005 solutions and projects
	67	nant - to generate new nant build scripts
	68
	69	Remember to run prebuild whenever you've added or removed files as well.
	70


diff --git a/releng/dist/bin/OpenSim b/releng/dist/bin/OpenSim new file mode 100644 index 0000000..9b46075 --- /dev/null +++ b/releng/dist/bin/OpenSim
@@ -0,0 +1,3 @@
	1	#!/bin/sh
	2
	3	mono OpenSim.exe $*


diff --git a/releng/dobuild.sh b/releng/dobuild.sh new file mode 100644 index 0000000..0fbb979 --- /dev/null +++ b/releng/dobuild.sh
@@ -0,0 +1,20 @@
	1	#!/bin/sh
	2
	3	# this script does a guaranteed clean build from SVN using a URL specified on the command line
	4
	5	rm -rf build/
	6	mkdir build
	7
	8	printf "Getting fresh source tree from SVN..."
	9	svn checkout $1 build
	10
	11	printf "Updating templates..."
	12	./parsetmpl.sh templates/VersionInfo.cs.tmpl >build/OpenSim.RegionServer/VersionInfo.cs
	13
	14	printf "Running prebuild..."
	15	cd build
	16	mono bin/Prebuild.exe /target nant
	17
	18	printf "Doing the build..."
	19	nant
	20


diff --git a/releng/makerel.sh b/releng/makerel.sh new file mode 100644 index 0000000..b7bc568 --- /dev/null +++ b/releng/makerel.sh
@@ -0,0 +1,30 @@
	1	#!/bin/sh
	2
	3	# This is the one!
	4
	5	export OPENSIMMAJOR=0
	6	export OPENSIMMINOR=2
	7	export BUILD=`date +%s`
	8	export BRANCH=DEVEL
	9	export SVNURL=svn://openmetaverse.org/opensim/trunk
	10
	11
	12
	13
	14
	15	# shouldn't have to change anything below here
	16
	17	script dobuild.log -c "./dobuild.sh $SVNURL"
	18	if [ ! $? -eq 0 ]
	19	then
	20	echo "Build failed!"
	21	else
	22	script createrel.log -c ./createreldir.sh
	23	rm -rf build
	24	tar cvf opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar opensim-$OPENSIMMAJOR.$OPENSIMMINOR/*
	25	gzip opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar
	26	fi
	27
	28	rm -rf opensim-$OPENSIMMAJOR.$OPENSIMMINOR
	29	echo "Produced binary tarball ready for distribution."
	30


diff --git a/releng/parsetmpl.sh b/releng/parsetmpl.sh new file mode 100644 index 0000000..0ce6d24 --- /dev/null +++ b/releng/parsetmpl.sh
@@ -0,0 +1,5 @@
	1	#!/bin/sh
	2
	3	# this script parses a template to replace @@ tokens
	4
	5	cat $1 \| sed s/@@VERSION/$OPENSIMMAJOR.$OPENSIMMINOR/g \| sed s/@@BUILD/$BUILD/g \| sed s/@@SVNREV/`svnversion`/g


diff --git a/releng/templates/VersionInfo.cs.tmpl b/releng/templates/VersionInfo.cs.tmpl new file mode 100644 index 0000000..29159e2 --- /dev/null +++ b/releng/templates/VersionInfo.cs.tmpl
@@ -0,0 +1,37 @@
	1	/*
	2	Copyright (c) OpenSim project, http://osgrid.org/
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are met:
	6	* * Redistributions of source code must retain the above copyright
	7	* notice, this list of conditions and the following disclaimer.
	8	* * Redistributions in binary form must reproduce the above copyright
	9	* notice, this list of conditions and the following disclaimer in the
	10	* documentation and/or other materials provided with the distribution.
	11	* * Neither the name of the <organization> nor the
	12	* names of its contributors may be used to endorse or promote products
	13	* derived from this software without specific prior written permission.
	14	*
	15	* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
	16	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	17	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	18	* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
	19	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	20	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	21	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	22	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	24	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	25	*/
	26
	27	using System;
	28
	29	namespace OpenSim
	30	{
	31	/// <summary>
	32	/// </summary>
	33	public class VersionInfo
	34	{
	35	public static string Version = "@@VERSION, Build @@BUILD, Revision @@SVNREV";
	36	}
	37	}