Merge branch 'master' of https://git.4creative.net/OpenSim/4Creative-Changes
commit
21410464e7
|
@ -16,7 +16,7 @@ index dee4fe2caa..2f10a97053 100644
|
|||
public static string GetVersionString(string versionNumber, Flavour flavour)
|
||||
{
|
||||
- string versionString = "OpenSim " + versionNumber + " Yeti " + flavour;
|
||||
+ string versionString = "OpenSim " + versionNumber + ".11 Yeti " + flavour;
|
||||
+ string versionString = "OpenSim " + versionNumber + ".15 Yeti " + flavour;
|
||||
return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
#!/bin/bash
|
||||
|
||||
git clone https://git.4creative.net/OpenSim/OpenSimMirror.git OpenSimMirror
|
||||
git clone https://git.4creative.net/OpenSim/4Creative-Changes.git OpenSimDocker
|
||||
git clone https://git.4creative.net/OpenSim/MoneyServer.git OpenSimMoney
|
||||
|
||||
#git clone https://git.4creative.net/Module/OpenSimBirds.git ./OpenSimMirror/addon-modules/OpenSimBirds
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.Warp3DCachedImageModule.git ./OpenSimMirror/addon-modules/OpenSim.Modules.Warp3DCachedImageModule
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.JPEGConverter.git ./OpenSimMirror/addon-modules/OpenSim.Modules.JPEGConverter
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.DisableAwayPhysic.git ./OpenSimMirror/addon-modules/OpenSim.Modules.DisableAwayPhysic
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.FullPerm.git ./OpenSimMirror/addon-modules/OpenSim.Modules.FullPerm
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.DataValue.git ./OpenSimMirror/addon-modules/OpenSim.Modules.DataValue
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.PathFinding.git ./OpenSimMirror/addon-modules/OpenSim.Modules.PathFinding
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.TextureFetcher.git ./OpenSimMirror/addon-modules/OpenSim.Modules.TextureFetcher
|
||||
git clone https://git.4creative.net/Module/OpenSim.Modules.EMail.git ./OpenSimMirror/addon-modules/OpenSim.Modules.EMail
|
||||
|
||||
cp -a ./OpenSimMoney/addon-modules/* ./OpenSimMirror/addon-modules/
|
||||
|
||||
cd OpenSimMirror
|
||||
|
||||
git apply ./../OpenSimDocker/Patch/0001-change-version-info.patch
|
||||
git apply ./../OpenSimDocker/Patch/0001-fake-all-script-returns-for-HG-home-uri.patch
|
||||
git apply ./../OpenSimDocker/Patch/0001-remove-iar-pass-check.patch
|
||||
#git apply ./../OpenSimDocker/Patch/0001-Add-os-commands-similar-to-experience-data-storage-.patch
|
||||
git apply ./../OpenSimDocker/Patch/0001-add-auto_grant_pay_perms.patch
|
||||
git apply ./../OpenSimDocker/Patch/0001-fix-permissions.patch
|
||||
#git apply ./../OpenSimDocker/Patch/0001-fix-npe-in-ubode.patch
|
||||
|
||||
cp ./../OpenSimDocker/Patch/AuthorizationService.cs ./OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
|
||||
|
||||
chmod +x runprebuild.sh && ./runprebuild.sh
|
||||
msbuild /p:Configuration=Release OpenSim.sln
|
||||
|
||||
rm bin/*.example
|
||||
rm bin/*32.exe
|
||||
rm bin/*.vshost.*
|
||||
rm bin/*.pdb
|
||||
rm bin/pCampBot*
|
||||
rm bin/*.Tests.*
|
||||
|
||||
rm bin/Prebuild.exe
|
||||
rm bin/mautil.exe
|
||||
rm bin/opensim.sh
|
||||
|
||||
cp bin/OpenSim.exe.config bin/MoneyServer.exe.config
|
||||
#cp bin/lib/NET/Mono.Security.dll bin/Mono.Security.dll
|
||||
|
||||
rm -r -f bin/Regions
|
||||
rm -r -f bin/config-include
|
||||
|
||||
cp -a ./../addon-modules bin/
|
||||
|
||||
cp ./../README.txt README.txt
|
||||
cp -a ./../config .
|
||||
tar cfv ./../OpenSim-Release.tar bin/ README.txt config/
|
||||
|
||||
cd /root/build/ && rm -r -f OpenSimDocker OpenSimMirror OpenSimMoney
|
||||
cp OpenSim-Release.tar /home/docker/Website/mcp/OpenSim-Release.tar
|
Loading…
Reference in New Issue