aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-06-19 04:04:28 +0000
committerAdam Frisby2007-06-19 04:04:28 +0000
commitb34d1c210e6cc599d0eb74c653dafd6bbb362770 (patch)
treea847917ad05728f1be62fc8e7b78e81dc76ef674
parent*Added some missing files from last commit (diff)
downloadopensim-SC_OLD-b34d1c210e6cc599d0eb74c653dafd6bbb362770.zip
opensim-SC_OLD-b34d1c210e6cc599d0eb74c653dafd6bbb362770.tar.gz
opensim-SC_OLD-b34d1c210e6cc599d0eb74c653dafd6bbb362770.tar.bz2
opensim-SC_OLD-b34d1c210e6cc599d0eb74c653dafd6bbb362770.tar.xz
* Cleaning up unused zircon branch.
* Removed releng from sugilite.
-rw-r--r--releng/CAUTION4
-rw-r--r--releng/README3
-rw-r--r--releng/createreldir.sh9
-rw-r--r--releng/dist/INSTALL33
-rw-r--r--releng/dist/README70
-rw-r--r--releng/dist/bin/OpenSim3
-rw-r--r--releng/dobuild.sh20
-rw-r--r--releng/makerel.sh30
-rw-r--r--releng/parsetmpl.sh5
-rw-r--r--releng/templates/VersionInfo.cs.tmpl37
10 files changed, 0 insertions, 214 deletions
diff --git a/releng/CAUTION b/releng/CAUTION
deleted file mode 100644
index 6418046..0000000
--- a/releng/CAUTION
+++ /dev/null
@@ -1,4 +0,0 @@
1!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
2DO NOT RUN ANY OF THE SCRIPTS IN THIS DIRECTORY WITHOUT
3READING THEM!!!!!!!!!!!!!
4!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/releng/README b/releng/README
deleted file mode 100644
index e73f395..0000000
--- a/releng/README
+++ /dev/null
@@ -1,3 +0,0 @@
1This directory contains scripts etc for creating a tarball/package out of the SVN tree.
2Use makerel.sh to generate a tarball, do not use other scripts
3It 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
deleted file mode 100644
index eb470b0..0000000
--- a/releng/createreldir.sh
+++ /dev/null
@@ -1,9 +0,0 @@
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
6mkdir opensim-$OPENSIMMAJOR.$OPENSIMMINOR
7
8cp -R dist/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR
9cp -R build/bin/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR/bin
diff --git a/releng/dist/INSTALL b/releng/dist/INSTALL
deleted file mode 100644
index f67fe43..0000000
--- a/releng/dist/INSTALL
+++ /dev/null
@@ -1,33 +0,0 @@
1INSTALLING FROM SOURCE WITH WINDOWS
2
31 - Ensure you have visual studio express (the C# edition)
4
52 - Check you have a clean source tree with the latest VS2005 solution, if unsure run prebuild (See README file)
6
73 - Open the solution in visual studio and build it
8
94 - Look in bin/ for the output
10
115 - ???
12
136 - Profit
14
15INSTALLING FROM SOURCE WITH LINUX/BSD/*NIX
16
171 - Ensure you have a clean source tree with latest nant build files, if not, get one or run prebuild (See README file)
18
192 - Go to a shell prompt and change to the correct directory
20
213 - Type the following:
22
23nant
24
254 - Look in bin/ for the output
26
275 - ???
28
296 - Profit
30
31INSTALLING BINARY RELEASE
32
33Simply 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
deleted file mode 100644
index 125d5da..0000000
--- a/releng/dist/README
+++ /dev/null
@@ -1,70 +0,0 @@
1For installation notes, please read INSTALL
2
3RUNNING SANDBOX MODE (the standard way)
4
5To 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
9OpenSim.exe -sandbox (windows)
10
11mono OpenSim.exe -sandbox (linux/BSD/MacOS X)
12
13Then startup your second life viewer with the following parameters:
14
15-loginuri http://yourserver:9000/
16
17The 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
20RUNNING SANDBOX WITH USER ACCOUNTS
21
22* open cmd window, go to /bin and launch
23OpenSim.exe -sandbox -loginserver -useraccounts
24
25* launch web browser, go to
26http://localhost:9000/Admin
27enter 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
36PREBUILD
37
38We use Prebuild to generate vs2005 solutions and nant build scripts.
39
40=== Building Prebuild ===
41
42At the moment, the Prebuild exe is shipped as /bin/Prebuild.exe so you shouldn't really have to build it.
43
44But here's the instructions anyway :
45
46The Prebuild master project is /prebuild.xml
47
48To build it with vs2005 :
49
50* build the solution /Prebuild/Prebuild.sln
51
52To build it with nant :
53
54* cd to /Prebuild/
55* type 'nant'
56
57After you've built it, it will land in the root /bin/ directory,
58
59=== Modyfying the OpenSim solution ===
60
61When adding or changing projects, modify the prebuild.xml and then execute
62
63bin/Prebuild.exe /target {target}
64
65where target is either
66vs2005 - to generate new vs2005 solutions and projects
67nant - to generate new nant build scripts
68
69Remember 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
deleted file mode 100644
index 9b46075..0000000
--- a/releng/dist/bin/OpenSim
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3mono OpenSim.exe $*
diff --git a/releng/dobuild.sh b/releng/dobuild.sh
deleted file mode 100644
index 0fbb979..0000000
--- a/releng/dobuild.sh
+++ /dev/null
@@ -1,20 +0,0 @@
1#!/bin/sh
2
3# this script does a guaranteed clean build from SVN using a URL specified on the command line
4
5rm -rf build/
6mkdir build
7
8printf "Getting fresh source tree from SVN..."
9svn checkout $1 build
10
11printf "Updating templates..."
12./parsetmpl.sh templates/VersionInfo.cs.tmpl >build/OpenSim.RegionServer/VersionInfo.cs
13
14printf "Running prebuild..."
15cd build
16mono bin/Prebuild.exe /target nant
17
18printf "Doing the build..."
19nant
20
diff --git a/releng/makerel.sh b/releng/makerel.sh
deleted file mode 100644
index b7bc568..0000000
--- a/releng/makerel.sh
+++ /dev/null
@@ -1,30 +0,0 @@
1#!/bin/sh
2
3# This is the one!
4
5export OPENSIMMAJOR=0
6export OPENSIMMINOR=2
7export BUILD=`date +%s`
8export BRANCH=DEVEL
9export SVNURL=svn://openmetaverse.org/opensim/trunk
10
11
12
13
14
15# shouldn't have to change anything below here
16
17script dobuild.log -c "./dobuild.sh $SVNURL"
18if [ ! $? -eq 0 ]
19then
20 echo "Build failed!"
21else
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
26fi
27
28rm -rf opensim-$OPENSIMMAJOR.$OPENSIMMINOR
29echo "Produced binary tarball ready for distribution."
30
diff --git a/releng/parsetmpl.sh b/releng/parsetmpl.sh
deleted file mode 100644
index 0ce6d24..0000000
--- a/releng/parsetmpl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3# this script parses a template to replace @@ tokens
4
5cat $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
deleted file mode 100644
index 29159e2..0000000
--- a/releng/templates/VersionInfo.cs.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2Copyright (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
27using System;
28
29namespace OpenSim
30{
31 /// <summary>
32 /// </summary>
33 public class VersionInfo
34 {
35 public static string Version = "@@VERSION, Build @@BUILD, Revision @@SVNREV";
36 }
37}