From 5c7ffdde0b9642a42e8f5987e06eb01220ff7776 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 11 Jul 2007 08:02:47 +0000 Subject: * Wiping trunk in prep for Sugilite --- releng/CAUTION | 4 -- releng/README | 3 -- releng/createreldir.sh | 9 ---- releng/dist/INSTALL | 33 -------------- releng/dist/README | 70 ------------------------------ releng/dist/SQL/mysql-agents.sql | 24 ---------- releng/dist/SQL/mysql-inventoryfolders.sql | 9 ---- releng/dist/SQL/mysql-inventoryitems.sql | 14 ------ releng/dist/SQL/mysql-logs.sql | 10 ----- releng/dist/SQL/mysql-regions.sql | 29 ------------- releng/dist/SQL/mysql-users.sql | 34 --------------- releng/dist/bin/OpenSim | 3 -- releng/dobuild.sh | 22 ---------- releng/makerel.sh | 30 ------------- releng/parsetmpl.sh | 5 --- releng/templates/VersionInfo.cs.tmpl | 37 ---------------- 16 files changed, 336 deletions(-) delete mode 100644 releng/CAUTION delete mode 100644 releng/README delete mode 100755 releng/createreldir.sh delete mode 100644 releng/dist/INSTALL delete mode 100644 releng/dist/README delete mode 100644 releng/dist/SQL/mysql-agents.sql delete mode 100644 releng/dist/SQL/mysql-inventoryfolders.sql delete mode 100644 releng/dist/SQL/mysql-inventoryitems.sql delete mode 100644 releng/dist/SQL/mysql-logs.sql delete mode 100644 releng/dist/SQL/mysql-regions.sql delete mode 100644 releng/dist/SQL/mysql-users.sql delete mode 100755 releng/dist/bin/OpenSim delete mode 100755 releng/dobuild.sh delete mode 100755 releng/makerel.sh delete mode 100755 releng/parsetmpl.sh delete mode 100644 releng/templates/VersionInfo.cs.tmpl (limited to 'releng') diff --git a/releng/CAUTION b/releng/CAUTION deleted file mode 100644 index 6418046..0000000 --- a/releng/CAUTION +++ /dev/null @@ -1,4 +0,0 @@ -!!!!!!!!!!!!! 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 deleted file mode 100644 index e73f395..0000000 --- a/releng/README +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100755 index eb470b0..0000000 --- a/releng/createreldir.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 deleted file mode 100644 index f67fe43..0000000 --- a/releng/dist/INSTALL +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 125d5da..0000000 --- a/releng/dist/README +++ /dev/null @@ -1,70 +0,0 @@ -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/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 @@ -SET FOREIGN_KEY_CHECKS=0; --- ---------------------------- --- Table structure for agents --- ---------------------------- -CREATE TABLE `agents` ( - `UUID` varchar(36) NOT NULL, - `sessionID` varchar(36) NOT NULL, - `secureSessionID` varchar(36) NOT NULL, - `agentIP` varchar(16) NOT NULL, - `agentPort` int(11) NOT NULL, - `agentOnline` tinyint(4) NOT NULL, - `loginTime` int(11) NOT NULL, - `logoutTime` int(11) NOT NULL, - `currentRegion` varchar(36) NOT NULL, - `currentHandle` bigint(20) unsigned NOT NULL, - `currentPos` varchar(64) NOT NULL, - PRIMARY KEY (`UUID`), - UNIQUE KEY `session` (`sessionID`), - UNIQUE KEY `ssession` (`secureSessionID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records --- ---------------------------- 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 @@ -CREATE TABLE `inventoryfolders` ( - `folderID` varchar(36) NOT NULL default '', - `agentID` varchar(36) default NULL, - `parentFolderID` varchar(36) default NULL, - `folderName` varchar(64) default NULL, - PRIMARY KEY (`folderID`), - KEY `owner` (`agentID`), - KEY `parent` (`parentFolderID`) -) 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 @@ -CREATE TABLE `inventoryitems` ( - `inventoryID` varchar(36) NOT NULL default '', - `assetID` varchar(36) default NULL, - `type` int(11) default NULL, - `parentFolderID` varchar(36) default NULL, - `avatarID` varchar(36) default NULL, - `inventoryName` varchar(64) default NULL, - `inventoryDescription` varchar(64) default NULL, - `inventoryNextPermissions` int(10) unsigned default NULL, - `inventoryCurrentPermissions` int(10) unsigned default NULL, - PRIMARY KEY (`inventoryID`), - KEY `owner` (`avatarID`), - KEY `folder` (`parentFolderID`) -) 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 @@ -CREATE TABLE `logs` ( - `logID` int(10) unsigned NOT NULL auto_increment, - `target` varchar(36) default NULL, - `server` varchar(64) default NULL, - `method` varchar(64) default NULL, - `arguments` varchar(255) default NULL, - `priority` int(11) default NULL, - `message` text, - PRIMARY KEY (`logID`) -) 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 @@ -CREATE TABLE `regions` ( - `uuid` varchar(36) NOT NULL, - `regionHandle` bigint(20) unsigned NOT NULL, - `regionName` varchar(32) default NULL, - `regionRecvKey` varchar(128) default NULL, - `regionSendKey` varchar(128) default NULL, - `regionSecret` varchar(128) default NULL, - `regionDataURI` varchar(255) default NULL, - `serverIP` varchar(16) default NULL, - `serverPort` int(10) unsigned default NULL, - `serverURI` varchar(255) default NULL, - `locX` int(10) unsigned default NULL, - `locY` int(10) unsigned default NULL, - `locZ` int(10) unsigned default NULL, - `eastOverrideHandle` bigint(20) unsigned default NULL, - `westOverrideHandle` bigint(20) unsigned default NULL, - `southOverrideHandle` bigint(20) unsigned default NULL, - `northOverrideHandle` bigint(20) unsigned default NULL, - `regionAssetURI` varchar(255) default NULL, - `regionAssetRecvKey` varchar(128) default NULL, - `regionAssetSendKey` varchar(128) default NULL, - `regionUserURI` varchar(255) default NULL, - `regionUserRecvKey` varchar(128) default NULL, - `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL, - PRIMARY KEY (`uuid`), - KEY `regionName` (`regionName`), - KEY `regionHandle` (`regionHandle`), - KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`) -) 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 @@ -SET FOREIGN_KEY_CHECKS=0; --- ---------------------------- --- Table structure for users --- ---------------------------- -CREATE TABLE `users` ( - `UUID` varchar(36) NOT NULL default '', - `username` varchar(32) NOT NULL, - `lastname` varchar(32) NOT NULL, - `passwordHash` varchar(32) NOT NULL, - `passwordSalt` varchar(32) NOT NULL, - `homeRegion` bigint(20) unsigned default NULL, - `homeLocationX` float default NULL, - `homeLocationY` float default NULL, - `homeLocationZ` float default NULL, - `homeLookAtX` float default NULL, - `homeLookAtY` float default NULL, - `homeLookAtZ` float default NULL, - `created` int(11) NOT NULL, - `lastLogin` int(11) NOT NULL, - `userInventoryURI` varchar(255) default NULL, - `userAssetURI` varchar(255) default NULL, - `profileCanDoMask` int(10) unsigned default NULL, - `profileWantDoMask` int(10) unsigned default NULL, - `profileAboutText` text, - `profileFirstText` text, - `profileImage` varchar(36) default NULL, - `profileFirstImage` varchar(36) default NULL, - PRIMARY KEY (`UUID`), - UNIQUE KEY `usernames` (`username`,`lastname`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records --- ---------------------------- 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 @@ -#!/bin/sh - -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 @@ -#!/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/OpenSim.RegionServer/VersionInfo.cs - -printf "Running prebuild..." -cd build -mono bin/Prebuild.exe /target nant - -printf "Doing the build..." -nant -buildfile:OpenSim.build -mono bin/Prebuild.exe /target nant -nant -buildfile:OpenGridServices.build - 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 @@ -#!/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 deleted file mode 100755 index 0ce6d24..0000000 --- a/releng/parsetmpl.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/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 deleted file mode 100644 index 29159e2..0000000 --- a/releng/templates/VersionInfo.cs.tmpl +++ /dev/null @@ -1,37 +0,0 @@ -/* -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 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 ``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 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 -{ - /// - /// - public class VersionInfo - { - public static string Version = "@@VERSION, Build @@BUILD, Revision @@SVNREV"; - } -} -- cgit v1.1