diff options
author | Adam Frisby | 2007-07-11 08:02:47 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-11 08:02:47 +0000 |
commit | 5c7ffdde0b9642a42e8f5987e06eb01220ff7776 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /releng | |
parent | Who would have known that the only way of specifying utf-8 without preamble, ... (diff) | |
download | opensim-SC-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.zip opensim-SC-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.gz opensim-SC-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.bz2 opensim-SC-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.xz |
* Wiping trunk in prep for Sugilite
Diffstat (limited to '')
-rw-r--r-- | releng/CAUTION | 4 | ||||
-rw-r--r-- | releng/README | 3 | ||||
-rwxr-xr-x | releng/createreldir.sh | 9 | ||||
-rw-r--r-- | releng/dist/INSTALL | 33 | ||||
-rw-r--r-- | releng/dist/README | 70 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-agents.sql | 24 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-inventoryfolders.sql | 9 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-inventoryitems.sql | 14 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-logs.sql | 10 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-regions.sql | 29 | ||||
-rw-r--r-- | releng/dist/SQL/mysql-users.sql | 34 | ||||
-rwxr-xr-x | releng/dist/bin/OpenSim | 3 | ||||
-rwxr-xr-x | releng/dobuild.sh | 22 | ||||
-rwxr-xr-x | releng/makerel.sh | 30 | ||||
-rwxr-xr-x | releng/parsetmpl.sh | 5 | ||||
-rw-r--r-- | releng/templates/VersionInfo.cs.tmpl | 37 |
16 files changed, 0 insertions, 336 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 !!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
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 deleted file mode 100644 index e73f395..0000000 --- a/releng/README +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
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 deleted file mode 100755 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 | |||
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 deleted file mode 100644 index f67fe43..0000000 --- a/releng/dist/INSTALL +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
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 deleted file mode 100644 index 125d5da..0000000 --- a/releng/dist/README +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
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/SQL/mysql-agents.sql b/releng/dist/SQL/mysql-agents.sql deleted file mode 100644 index 8194ca9..0000000 --- a/releng/dist/SQL/mysql-agents.sql +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SET FOREIGN_KEY_CHECKS=0; | ||
2 | -- ---------------------------- | ||
3 | -- Table structure for agents | ||
4 | -- ---------------------------- | ||
5 | CREATE TABLE `agents` ( | ||
6 | `UUID` varchar(36) NOT NULL, | ||
7 | `sessionID` varchar(36) NOT NULL, | ||
8 | `secureSessionID` varchar(36) NOT NULL, | ||
9 | `agentIP` varchar(16) NOT NULL, | ||
10 | `agentPort` int(11) NOT NULL, | ||
11 | `agentOnline` tinyint(4) NOT NULL, | ||
12 | `loginTime` int(11) NOT NULL, | ||
13 | `logoutTime` int(11) NOT NULL, | ||
14 | `currentRegion` varchar(36) NOT NULL, | ||
15 | `currentHandle` bigint(20) unsigned NOT NULL, | ||
16 | `currentPos` varchar(64) NOT NULL, | ||
17 | PRIMARY KEY (`UUID`), | ||
18 | UNIQUE KEY `session` (`sessionID`), | ||
19 | UNIQUE KEY `ssession` (`secureSessionID`) | ||
20 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | ||
21 | |||
22 | -- ---------------------------- | ||
23 | -- Records | ||
24 | -- ---------------------------- | ||
diff --git a/releng/dist/SQL/mysql-inventoryfolders.sql b/releng/dist/SQL/mysql-inventoryfolders.sql deleted file mode 100644 index c30239e..0000000 --- a/releng/dist/SQL/mysql-inventoryfolders.sql +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | CREATE TABLE `inventoryfolders` ( | ||
2 | `folderID` varchar(36) NOT NULL default '', | ||
3 | `agentID` varchar(36) default NULL, | ||
4 | `parentFolderID` varchar(36) default NULL, | ||
5 | `folderName` varchar(64) default NULL, | ||
6 | PRIMARY KEY (`folderID`), | ||
7 | KEY `owner` (`agentID`), | ||
8 | KEY `parent` (`parentFolderID`) | ||
9 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
diff --git a/releng/dist/SQL/mysql-inventoryitems.sql b/releng/dist/SQL/mysql-inventoryitems.sql deleted file mode 100644 index 6e90005..0000000 --- a/releng/dist/SQL/mysql-inventoryitems.sql +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | CREATE TABLE `inventoryitems` ( | ||
2 | `inventoryID` varchar(36) NOT NULL default '', | ||
3 | `assetID` varchar(36) default NULL, | ||
4 | `type` int(11) default NULL, | ||
5 | `parentFolderID` varchar(36) default NULL, | ||
6 | `avatarID` varchar(36) default NULL, | ||
7 | `inventoryName` varchar(64) default NULL, | ||
8 | `inventoryDescription` varchar(64) default NULL, | ||
9 | `inventoryNextPermissions` int(10) unsigned default NULL, | ||
10 | `inventoryCurrentPermissions` int(10) unsigned default NULL, | ||
11 | PRIMARY KEY (`inventoryID`), | ||
12 | KEY `owner` (`avatarID`), | ||
13 | KEY `folder` (`parentFolderID`) | ||
14 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
diff --git a/releng/dist/SQL/mysql-logs.sql b/releng/dist/SQL/mysql-logs.sql deleted file mode 100644 index 05c19e8..0000000 --- a/releng/dist/SQL/mysql-logs.sql +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | CREATE TABLE `logs` ( | ||
2 | `logID` int(10) unsigned NOT NULL auto_increment, | ||
3 | `target` varchar(36) default NULL, | ||
4 | `server` varchar(64) default NULL, | ||
5 | `method` varchar(64) default NULL, | ||
6 | `arguments` varchar(255) default NULL, | ||
7 | `priority` int(11) default NULL, | ||
8 | `message` text, | ||
9 | PRIMARY KEY (`logID`) | ||
10 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 \ No newline at end of file | ||
diff --git a/releng/dist/SQL/mysql-regions.sql b/releng/dist/SQL/mysql-regions.sql deleted file mode 100644 index 4f98826..0000000 --- a/releng/dist/SQL/mysql-regions.sql +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | CREATE TABLE `regions` ( | ||
2 | `uuid` varchar(36) NOT NULL, | ||
3 | `regionHandle` bigint(20) unsigned NOT NULL, | ||
4 | `regionName` varchar(32) default NULL, | ||
5 | `regionRecvKey` varchar(128) default NULL, | ||
6 | `regionSendKey` varchar(128) default NULL, | ||
7 | `regionSecret` varchar(128) default NULL, | ||
8 | `regionDataURI` varchar(255) default NULL, | ||
9 | `serverIP` varchar(16) default NULL, | ||
10 | `serverPort` int(10) unsigned default NULL, | ||
11 | `serverURI` varchar(255) default NULL, | ||
12 | `locX` int(10) unsigned default NULL, | ||
13 | `locY` int(10) unsigned default NULL, | ||
14 | `locZ` int(10) unsigned default NULL, | ||
15 | `eastOverrideHandle` bigint(20) unsigned default NULL, | ||
16 | `westOverrideHandle` bigint(20) unsigned default NULL, | ||
17 | `southOverrideHandle` bigint(20) unsigned default NULL, | ||
18 | `northOverrideHandle` bigint(20) unsigned default NULL, | ||
19 | `regionAssetURI` varchar(255) default NULL, | ||
20 | `regionAssetRecvKey` varchar(128) default NULL, | ||
21 | `regionAssetSendKey` varchar(128) default NULL, | ||
22 | `regionUserURI` varchar(255) default NULL, | ||
23 | `regionUserRecvKey` varchar(128) default NULL, | ||
24 | `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL, | ||
25 | PRIMARY KEY (`uuid`), | ||
26 | KEY `regionName` (`regionName`), | ||
27 | KEY `regionHandle` (`regionHandle`), | ||
28 | KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`) | ||
29 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED \ No newline at end of file | ||
diff --git a/releng/dist/SQL/mysql-users.sql b/releng/dist/SQL/mysql-users.sql deleted file mode 100644 index 5ce4d1c..0000000 --- a/releng/dist/SQL/mysql-users.sql +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | SET FOREIGN_KEY_CHECKS=0; | ||
2 | -- ---------------------------- | ||
3 | -- Table structure for users | ||
4 | -- ---------------------------- | ||
5 | CREATE TABLE `users` ( | ||
6 | `UUID` varchar(36) NOT NULL default '', | ||
7 | `username` varchar(32) NOT NULL, | ||
8 | `lastname` varchar(32) NOT NULL, | ||
9 | `passwordHash` varchar(32) NOT NULL, | ||
10 | `passwordSalt` varchar(32) NOT NULL, | ||
11 | `homeRegion` bigint(20) unsigned default NULL, | ||
12 | `homeLocationX` float default NULL, | ||
13 | `homeLocationY` float default NULL, | ||
14 | `homeLocationZ` float default NULL, | ||
15 | `homeLookAtX` float default NULL, | ||
16 | `homeLookAtY` float default NULL, | ||
17 | `homeLookAtZ` float default NULL, | ||
18 | `created` int(11) NOT NULL, | ||
19 | `lastLogin` int(11) NOT NULL, | ||
20 | `userInventoryURI` varchar(255) default NULL, | ||
21 | `userAssetURI` varchar(255) default NULL, | ||
22 | `profileCanDoMask` int(10) unsigned default NULL, | ||
23 | `profileWantDoMask` int(10) unsigned default NULL, | ||
24 | `profileAboutText` text, | ||
25 | `profileFirstText` text, | ||
26 | `profileImage` varchar(36) default NULL, | ||
27 | `profileFirstImage` varchar(36) default NULL, | ||
28 | PRIMARY KEY (`UUID`), | ||
29 | UNIQUE KEY `usernames` (`username`,`lastname`) | ||
30 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | ||
31 | |||
32 | -- ---------------------------- | ||
33 | -- Records | ||
34 | -- ---------------------------- | ||
diff --git a/releng/dist/bin/OpenSim b/releng/dist/bin/OpenSim deleted file mode 100755 index 9b46075..0000000 --- a/releng/dist/bin/OpenSim +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | mono OpenSim.exe $* | ||
diff --git a/releng/dobuild.sh b/releng/dobuild.sh deleted file mode 100755 index dd324d8..0000000 --- a/releng/dobuild.sh +++ /dev/null | |||
@@ -1,22 +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 | |||
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/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 -buildfile:OpenSim.build | ||
20 | mono bin/Prebuild.exe /target nant | ||
21 | nant -buildfile:OpenGridServices.build | ||
22 | |||
diff --git a/releng/makerel.sh b/releng/makerel.sh deleted file mode 100755 index b7bc568..0000000 --- a/releng/makerel.sh +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
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 deleted file mode 100755 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 | |||
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 deleted file mode 100644 index 29159e2..0000000 --- a/releng/templates/VersionInfo.cs.tmpl +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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 | } | ||