From b25ee9095deca0cd0c7eedafda89e021734d0ca7 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 15 Aug 2016 14:13:56 -0400 Subject: Remove VSTool, its build info and all invocations. VSTool manipulates the SecondLife.sln solution file for the convenience of a developer subsequently running Visual Studio interactively. But the cost of having it sometimes break TeamCity automated builds is too high -- especially since we never expect to run Visual Studio interactively on a TC build host. Also remove the CMake UNATTENDED variable that controlled it. --- autobuild.xml | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 072dfa678a..5a91ba15f5 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2617,14 +2617,6 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin options @@ -2663,20 +2655,11 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin options -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -2705,14 +2688,6 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin options @@ -2749,20 +2724,11 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin options -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From 454da876dc648d34aacf27217952e640f4fdaa88 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 15 Aug 2016 17:12:37 -0400 Subject: Backed out changeset e187a6b45ce6: restored VSTool et al. --- autobuild.xml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5a91ba15f5..072dfa678a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2617,6 +2617,14 @@ arguments ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin options @@ -2655,11 +2663,20 @@ arguments ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin options -G "Visual Studio 12" + -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -2688,6 +2705,14 @@ arguments ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin options @@ -2724,11 +2749,20 @@ arguments ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin options -G "Visual Studio 12" + -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From b240c494c43912b4b57e0efc0867997faa18b327 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 16 Aug 2016 11:03:03 -0400 Subject: Re-delete VSTool.exe invocations from autobuild.xml. The CMake invocations are controlled by UNATTENDED -- these were not. Let CMake do it if it must be done. --- autobuild.xml | 34 ---------------------------------- 1 file changed, 34 deletions(-) mode change 100755 => 100644 autobuild.xml (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml old mode 100755 new mode 100644 index 072dfa678a..5a91ba15f5 --- a/autobuild.xml +++ b/autobuild.xml @@ -2617,14 +2617,6 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin options @@ -2663,20 +2655,11 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin options -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -2705,14 +2688,6 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin options @@ -2749,20 +2724,11 @@ arguments ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin options -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From 07e78807a8b3657ee2303dc22187d858cf8be625 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Thu, 27 Oct 2016 19:48:59 +0300 Subject: MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5ff6d33305..f485aa0cb7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1484,11 +1484,11 @@ archive hash - db992d58c46c80df7d4d31f8a4784b98 + 2845033912eb947a1401847ece1469ce hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/317959/arch/Darwin/installer/llceflib-1.5.3.317959-darwin-317959.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/321153/arch/Darwin/installer/llceflib-1.5.3.321153-darwin-321153.tar.bz2 name darwin @@ -1498,11 +1498,11 @@ archive hash - bb3818628131a99cd789febfad9dc2c2 + 1156121b4ccbb4aa29bc01f15c589f98 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/317959/arch/CYGWIN/installer/llceflib-1.5.3.317959-windows-317959.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/321153/arch/CYGWIN/installer/llceflib-1.5.3.321153-windows-321153.tar.bz2 name windows -- cgit v1.2.3