From 6aba386e2d974919c674daa0d27595b6d25782e9 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Jul 2020 23:42:05 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E2=80=9EPatch/0001-change-version-info.pat?= =?UTF-8?q?ch=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Patch/0001-change-version-info.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patch/0001-change-version-info.patch b/Patch/0001-change-version-info.patch index be3e65e..932b577 100644 --- a/Patch/0001-change-version-info.patch +++ b/Patch/0001-change-version-info.patch @@ -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); } From 96307804973630f2758e0d1e2119d81a524c8024 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Jul 2020 23:48:37 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E2=80=9Ecompile.sh=E2=80=9C=20hinzuf=C3=BC?= =?UTF-8?q?gen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compile.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 compile.sh diff --git a/compile.sh b/compile.sh new file mode 100644 index 0000000..bce6784 --- /dev/null +++ b/compile.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +git clone https://Chris:879576456@git.4creative.net/OpenSim/OpenSimMirror.git OpenSimMirror +git clone https://Chris:879576456@git.4creative.net/OpenSim/4Creative-Changes.git OpenSimDocker +git clone https://Chris:879576456@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 From ea3244b87f97e1fea7354fd35a01f4771984b71a Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Jul 2020 23:49:02 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E2=80=9Ecompile.sh=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compile.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compile.sh b/compile.sh index bce6784..26a62da 100644 --- a/compile.sh +++ b/compile.sh @@ -1,8 +1,8 @@ #!/bin/bash -git clone https://Chris:879576456@git.4creative.net/OpenSim/OpenSimMirror.git OpenSimMirror -git clone https://Chris:879576456@git.4creative.net/OpenSim/4Creative-Changes.git OpenSimDocker -git clone https://Chris:879576456@git.4creative.net/OpenSim/MoneyServer.git OpenSimMoney +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