From ed8aef42e1a6b4a8efa796e24dda252b1a743a74 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 26 Jan 2011 09:07:20 -0800 Subject: windows uses llqtwebkit now published on s3. --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9cda6ff165..30e07bb12c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1102,7 +1102,7 @@ hash 5af0f88e298ea8b6041e29928f520eda url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llqtwebkit-4.7.1-windows-20110113.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110113.tar.bz2 name windows -- cgit v1.3 From 216c3b47716f6eb5ebf1713c77fc6a6bb6f43abe Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 26 Jan 2011 15:57:48 -0800 Subject: adding OpenSource* and OpenSourceStandAlone* configurations. --- autobuild.xml | 894 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 750 insertions(+), 144 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 30e07bb12c..2352f9e579 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1598,43 +1598,674 @@ configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + Debug + + OpenSourceDebug + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceDebug + + OpenSourceRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceRelWithDebInfo + + OpenSourceRelease + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceRelease + + OpenSourceStandAloneDebug + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceStandAloneDebug + + OpenSourceStandAloneRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceStandAloneRelWithDebInfo + + OpenSourceStandAloneRelease + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + OpenSourceStandAloneRelease + + RelWithDebInfo + + build + + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + RelWithDebInfo + + Release + + build + + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + Release + + + name + common + + darwin + + build_directory + build-darwin-i386 + configurations + + Debug + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + + + name + Debug + + OpenSourceDebug + + build + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceDebug + + OpenSourceRelWithDebInfo + + build + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceRelWithDebInfo + + OpenSourceRelease + + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceRelease + + OpenSourceStandAloneDebug + + build + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceStandAloneDebug + + OpenSourceStandAloneRelWithDebInfo + + build + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceStandAloneRelWithDebInfo + + OpenSourceStandAloneRelease + + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceStandAloneRelease + + RelWithDebInfo + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + + + default + True + name + RelWithDebInfo + + Release + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + + + name + Release + + + name + darwin + + linux + + build_directory + build-linux-i686 + configurations + + Debug + + build + + command + make + options + + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + + + name + Debug + + OpenSourceDebug + + build + + command + make + options + + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceDebug + + OpenSourceRelWithDebInfo + + build + + command + make + options + + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceRelWithDebInfo + + OpenSourceRelease + + build + + command + make + options + + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceRelease + + OpenSourceStandAloneDebug + + build command - cmake + make options - -DCMAKE_BUILD_TYPE:STRING=Debug - -DSTANDALONE:BOOL=OFF - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DFMOD=TRUE - -DINSTALL_PROPRIETARY=TRUE + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Debug + OpenSourceStandAloneDebug - RelWithDebInfo + OpenSourceStandAloneRelWithDebInfo build + command + make + options + + -j 12 + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceStandAloneRelWithDebInfo + + OpenSourceStandAloneRelease + + build command - cmake + make options - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + OpenSourceStandAloneRelease + + RelWithDebInfo + + build + + command + make + options + + -j 12 + + + configure + + options + + -G + 'Unix Makefiles' -DSTANDALONE:BOOL=OFF - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DFMOD=TRUE -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + default + True name RelWithDebInfo @@ -1642,33 +2273,43 @@ build + command + make + options + + -j 12 + configure - command - cmake options - -DCMAKE_BUILD_TYPE:STRING=Release + -G + 'Unix Makefiles' -DSTANDALONE:BOOL=OFF - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DFMOD=TRUE -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE name Release + default + + build + + + name + default + name - common + linux - darwin + windows build_directory - build-darwin-i386 + build-vc80 configurations Debug @@ -1677,213 +2318,181 @@ arguments - | - grep - -v - setenv + SecondLife.sln command - xcodebuild + BuildConsole options - -configuration Debug - -project SecondLife.xcodeproj + /build + "/cfg=Debug|Win32" configure - arguments - - ../indra - options -G - 'Xcode' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE name Debug - RelWithDebInfo + OpenSourceDebug build arguments - | - grep - -v - setenv + SecondLife.sln command - xcodebuild + devenv.com options - -configuration RelWithDebInfo - -project SecondLife.xcodeproj + /build + Debug configure - arguments - - ../indra - options -G - 'Xcode' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE - default - True name - RelWithDebInfo + OpenSourceDebug - Release + OpenSourceRelWithDebInfo build arguments - | - grep - -v - setenv + SecondLife.sln command - xcodebuild + devenv.com options - -configuration Release - -project SecondLife.xcodeproj + /build + RelWithDebInfo configure - arguments - - ../indra - options -G - 'Xcode' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Release + OpenSourceRelWithDebInfo - - name - darwin - - linux - - build_directory - build-linux-i686 - configurations - - Debug + OpenSourceRelease build + arguments + + SecondLife.sln + command - make + devenv.com options - -j 12 + /build + Release configure - arguments - - ../indra - options -G - 'Unix Makefiles' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Debug + OpenSourceRelease - RelWithDebInfo + OpenSourceStandAloneDebug build + arguments + + SecondLife.sln + command - make + devenv.com options - -j 12 + /build + Debug configure - arguments - - ../indra - options -G - 'Unix Makefiles' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE - default - True name - RelWithDebInfo + OpenSourceStandAloneDebug - Release + OpenSourceStandAloneRelWithDebInfo build + arguments + + SecondLife.sln + command - make + devenv.com options - -j 12 + /build + RelWithDebInfo configure - arguments - - ../indra - options -G - 'Unix Makefiles' + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Release - - default - - build - - - name - default + OpenSourceStandAloneRelWithDebInfo - - name - linux - - windows - - build_directory - build-vc80 - configurations - - Debug + OpenSourceStandAloneRelease build @@ -1892,27 +2501,26 @@ SecondLife.sln command - BuildConsole + devenv.com options /build - "/cfg=Debug|Win32" + Release configure - arguments - - ..\indra - options -G - "Visual Studio 8 2005" + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=TRUE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Debug + OpenSourceStandAloneRelease RelWithDebInfo @@ -1932,14 +2540,13 @@ configure - arguments - - ..\indra - options -G - "Visual Studio 8 2005" + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE default @@ -1965,14 +2572,13 @@ configure - arguments - - ..\indra - options -G - "Visual Studio 8 2005" + 'Visual Studio 8 2005' + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE name -- cgit v1.3 From 5833672c5c10722e92137fb1f439df5045e4a9e6 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Wed, 26 Jan 2011 16:09:40 -0800 Subject: fix quoting of vs8 generator string. --- autobuild.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2352f9e579..7ca481f275 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2333,7 +2333,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=OFF -DINSTALL_PROPRIETARY=TRUE -DFMOD=TRUE @@ -2363,7 +2363,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2393,7 +2393,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2423,7 +2423,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2453,7 +2453,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=TRUE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2483,7 +2483,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=TRUE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2513,7 +2513,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=TRUE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE @@ -2543,7 +2543,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=OFF -DINSTALL_PROPRIETARY=TRUE -DFMOD=TRUE @@ -2575,7 +2575,7 @@ options -G - 'Visual Studio 8 2005' + "Visual Studio 8 2005" -DSTANDALONE:BOOL=OFF -DINSTALL_PROPRIETARY=TRUE -DFMOD=TRUE -- cgit v1.3 From 7e19ef5b4fa3c6e3d453794ada52cfe8abc9bc33 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 6 Feb 2011 08:50:06 -0500 Subject: OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS Express --- autobuild.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7ca481f275..2aa9b5c3d6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1658,6 +1658,29 @@ name OpenSourceRelWithDebInfo + + VCexpressRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VCexpressRelWithDebInfo + + OpenSourceRelease configure @@ -2402,6 +2425,37 @@ name OpenSourceRelWithDebInfo + + VCexpressRelWithDebInfo + + build + + arguments + + SecondLife.sln + + command + vcbuild.exe + options + + RelWithDebInfo + + + configure + + options + + -G + "Visual Studio Express 8 2005" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + VCexpressRelWithDebInfo + + OpenSourceRelease build -- cgit v1.3 From 82d9e1b73e37fc48409324f7e4cd32ee6d789637 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 6 Feb 2011 09:56:09 -0500 Subject: OPEN-1 WORKAROUND revert change to cmake string for VS 8 --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2aa9b5c3d6..5d07c035e6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2446,7 +2446,7 @@ options -G - "Visual Studio Express 8 2005" + "Visual Studio 8 2005" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE -- cgit v1.3 From 0c6de5c6cca4fae213b050e2ac9b15c5d16d8db6 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 6 Feb 2011 10:09:58 -0500 Subject: OPEN-1 WORKAROUND correct build arguments for VS Express --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5d07c035e6..e1733ac9ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2432,13 +2432,13 @@ arguments - SecondLife.sln + "RelWithDebInfo|Win32" command vcbuild.exe options - RelWithDebInfo + "RelWithDebInfo|Win32" configure -- cgit v1.3 From eb68b5fa0a669192375aab919931b54fa7e80801 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 6 Feb 2011 10:37:42 -0500 Subject: OPEN-1 WORKAROUND correct build arguments again for VS Express --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e1733ac9ae..cceb197f0e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2438,7 +2438,7 @@ vcbuild.exe options - "RelWithDebInfo|Win32" + SecondLife.sln configure -- cgit v1.3 From 9251d95205e8c5d9ac4be4992cc1ab88cf07e58b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 10 Feb 2011 14:41:00 -0500 Subject: OPEN-1: (partial) use environment when building with Visual Studio Express --- autobuild.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index cceb197f0e..ec332a81bb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2438,6 +2438,7 @@ vcbuild.exe options + /u SecondLife.sln -- cgit v1.3 From 7b9d54379f5ede0b046d2263487bb566f1928b23 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Feb 2011 21:29:25 -0500 Subject: use improved packaging for jsoncpp --- autobuild.xml | 12 ++++++------ indra/cmake/JsonCpp.cmake | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3cce930f28..dfd3051ed4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -884,9 +884,9 @@ archive hash - de8b96120c274e052abb4f692861be46 + 22c2ab6ef046c0c1f6cf674297f3e8ef url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110131.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110218.tar.bz2 name darwin @@ -896,9 +896,9 @@ archive hash - db7826354e60fb4ae14bf40258c088af + 20546118096e4828d9f29913ec7d954a url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Linux/installer/jsoncpp-0.5.0-linux-20110219.tar.bz2 name linux @@ -908,9 +908,9 @@ archive hash - afff2018e6a887c281b072eecdd9343e + 0959e349c4f7c0b33539269502486737 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110218.tar.bz2 name windows diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..7c686eff07 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) -- cgit v1.3 From b1787a19d37b831de5465c0b0f3b7abd42d99afb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 24 Feb 2011 21:40:18 -0500 Subject: change to canonical build of the pth lib --- autobuild.xml | 110 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 53 insertions(+), 57 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ec332a81bb..4589ad3076 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1380,9 +1380,9 @@ archive hash - d47d121c8eaed4ac6d8253ceda23b5c9 + 320820c5a886f8daf366ba5fcd264b34 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pth/rev/222035/arch/Darwin/installer/pth-2.0.7-darwin-20110224.tar.bz2 name darwin @@ -1658,29 +1658,6 @@ name OpenSourceRelWithDebInfo - - VCexpressRelWithDebInfo - - configure - - arguments - - ../indra - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - VCexpressRelWithDebInfo - - OpenSourceRelease configure @@ -1813,6 +1790,27 @@ name Release + VCexpressRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VCexpressRelWithDebInfo + name common @@ -2425,38 +2423,6 @@ name OpenSourceRelWithDebInfo - - VCexpressRelWithDebInfo - - build - - arguments - - "RelWithDebInfo|Win32" - - command - vcbuild.exe - options - - /u - SecondLife.sln - - - configure - - options - - -G - "Visual Studio 8 2005" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - VCexpressRelWithDebInfo - - OpenSourceRelease build @@ -2639,6 +2605,36 @@ name Release + VCexpressRelWithDebInfo + + build + + arguments + + "RelWithDebInfo|Win32" + + command + vcbuild.exe + options + + /u + SecondLife.sln + + + configure + + options + + -G + "Visual Studio 8 2005" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + VCexpressRelWithDebInfo + name windows -- cgit v1.3 From 7f00a037ee61de0573f00b33ab637794387b2b64 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 25 Feb 2011 12:36:17 -0500 Subject: update to TeamCity build from https://bitbucket.org/lindenlab/3p-elfio --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4589ad3076..b575eeeb6c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -330,9 +330,9 @@ archive hash - d931e16a382aa3a5c99a8dea6b5f8391 + 031e6315a5c0829c9b9a2ec18aeb7ae3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-elfio/rev/222074/arch/Linux/installer/elfio-1.0.3-linux-20110225.tar.bz2 name linux -- cgit v1.3 From 149ace0b1f3f9bb6394aec367da5748bc092ef7a Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 3 Mar 2011 11:28:06 -0800 Subject: Autobuild : points to the corrected pth package for Mac --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index b575eeeb6c..a09ebc8982 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1380,9 +1380,9 @@ archive hash - 320820c5a886f8daf366ba5fcd264b34 + 2172379794217d0ffba0db09b2ac17bf url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pth/rev/222035/arch/Darwin/installer/pth-2.0.7-darwin-20110224.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pth/rev/222617/arch/Darwin/installer/pth-2.0.7-darwin-20110303.tar.bz2 name darwin -- cgit v1.3 From 6ee772bd424fa59b76c6174fd0fed8f76ff99c93 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 16 Mar 2011 18:09:00 -0700 Subject: Autobuild 2010: clean up argument passing for all configs --- autobuild.xml | 227 ++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 159 insertions(+), 68 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 590c80f540..686ed466ef 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1609,10 +1609,6 @@ configure - arguments - - ../indra - command cmake options @@ -1630,10 +1626,6 @@ configure - arguments - - ../indra - command cmake options @@ -1651,10 +1643,6 @@ configure - arguments - - ../indra - command cmake options @@ -1672,10 +1660,6 @@ configure - arguments - - ../indra - command cmake options @@ -1693,10 +1677,6 @@ configure - arguments - - ../indra - command cmake options @@ -1714,10 +1694,6 @@ configure - arguments - - ../indra - command cmake options @@ -1735,10 +1711,6 @@ configure - arguments - - ../indra - command cmake options @@ -1759,10 +1731,6 @@ configure - arguments - - ../indra - command cmake options @@ -1783,10 +1751,6 @@ configure - arguments - - ../indra - command cmake options @@ -1804,10 +1768,6 @@ configure - arguments - - ../indra - command cmake options @@ -1852,6 +1812,10 @@ configure + arguments + + ../indra + options -G @@ -1878,6 +1842,10 @@ configure + arguments + + ../indra + options -G @@ -1904,6 +1872,10 @@ configure + arguments + + ../indra + options -G @@ -1930,6 +1902,10 @@ configure + arguments + + ../indra + options -G @@ -1956,6 +1932,10 @@ configure + arguments + + ../indra + options -G @@ -1982,6 +1962,10 @@ configure + arguments + + ../indra + options -G @@ -2008,6 +1992,10 @@ configure + arguments + + ../indra + options -G @@ -2041,6 +2029,10 @@ configure + arguments + + ../indra + options -G @@ -2076,6 +2068,10 @@ configure + arguments + + ../indra + options -G @@ -2111,6 +2107,10 @@ configure + arguments + + ../indra + options -G @@ -2136,6 +2136,10 @@ configure + arguments + + ../indra + options -G @@ -2161,6 +2165,10 @@ configure + arguments + + ../indra + options -G @@ -2186,6 +2194,10 @@ configure + arguments + + ../indra + options -G @@ -2211,6 +2223,10 @@ configure + arguments + + ../indra + options -G @@ -2236,6 +2252,10 @@ configure + arguments + + ../indra + options -G @@ -2261,6 +2281,10 @@ configure + arguments + + ../indra + options -G @@ -2286,6 +2310,10 @@ configure + arguments + + ../indra + options -G @@ -2313,6 +2341,10 @@ configure + arguments + + ../indra + options -G @@ -2361,10 +2393,22 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Debug + --startup + secondlife-bin + options -G - "Visual Studio 8 2005" + "Visual Studio 10" -DSTANDALONE:BOOL=OFF -DINSTALL_PROPRIETARY=TRUE -DFMOD=TRUE @@ -2379,15 +2423,7 @@ arguments - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution SecondLife.sln - --config - Debug - --startup - secondlife-bin command devenv.com @@ -2399,6 +2435,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Debug + --startup + secondlife-bin + options -G @@ -2429,6 +2477,10 @@ configure + arguments + + ../indra + options -G @@ -2459,6 +2511,10 @@ configure + arguments + + ../indra + options -G @@ -2475,17 +2531,8 @@ build - arguments - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin command devenv.com @@ -2497,6 +2544,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + options -G @@ -2527,6 +2586,10 @@ configure + arguments + + ../indra + options -G @@ -2557,6 +2620,10 @@ configure + arguments + + ../indra + options -G @@ -2587,6 +2654,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + options -G @@ -2620,6 +2699,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin + options -G @@ -2635,6 +2726,16 @@ VCexpressRelWithDebInfo build + + command + vcbuild.exe + options + + /u + SecondLife.sln + + + configure arguments @@ -2648,16 +2749,6 @@ --startup secondlife-bin - command - vcbuild.exe - options - - /u - SecondLife.sln - - - configure - options -G -- cgit v1.3 From 399d0aa76422362dbd9371d8f24d3863d3cabdfa Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 16 Mar 2011 18:30:50 -0700 Subject: Autobuild: fixes an xml error that made configure exit with error --- autobuild.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 686ed466ef..fe35a96882 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2531,6 +2531,7 @@ build + arguments SecondLife.sln -- cgit v1.3 From 3b1dee9abf5e4e220c325438f2da125937d584c1 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Fri, 18 Mar 2011 08:05:36 -0400 Subject: OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to use VS2010 Autobuild --- autobuild.xml | 133 +++++++++++++++++++++++++++++++++++++++++++++----- doc/contributions.txt | 2 + 2 files changed, 124 insertions(+), 11 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ba70320d0c..f133c8d07c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1764,10 +1764,15 @@ name Release + VCexpressRelWithDebInfo configure + arguments + + ../indra + command cmake options @@ -1781,6 +1786,53 @@ name VCexpressRelWithDebInfo + + + VC10msbuildRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VC10msbuildRelWithDebInfo + + + + VC10msbuildRelease + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VC10msbuildRelease + + name common @@ -2724,10 +2776,15 @@ name Release + VCexpressRelWithDebInfo build + arguments + + "RelWithDebInfo|Win32" + command vcbuild.exe options @@ -2738,30 +2795,84 @@ configure - arguments + options + + -G + "Visual Studio 8 2005" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + VCexpressRelWithDebInfo + + + + VC10msbuildRelWithDebInfo + + build + + command + msbuild.exe + options - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution SecondLife.sln - --config - Release - --startup - secondlife-bin + /verbosity:minimal + /t:build + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + name + VC10msbuildRelWithDebInfo + + + + VC10msbuildRelease + + build + + command + msbuild.exe + options + + SecondLife.sln + /t:build + /p:Configuration=Release + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + options -G - "Visual Studio 8 2005" + "Visual Studio 10" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE name - VCexpressRelWithDebInfo + VC10msbuildRelease + name windows diff --git a/doc/contributions.txt b/doc/contributions.txt index a947b922ab..9caed38d30 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -833,6 +833,8 @@ Whoops Babii Wilton Lundquist VWR-7682 WolfPup Lowenhar + OPEN-1 + OPEN-37 SNOW-622 SNOW-772 STORM-102 -- cgit v1.3 From 9923f403226d6c014cb40149c2e31b2fce988803 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 18 Mar 2011 16:23:55 -0700 Subject: Autobuild : fixed merge errors in json hash codes --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c26afea6f3..108e6dc429 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -870,7 +870,7 @@ archive hash - 22c2ab6ef046c0c1f6cf674297f3e8ef + de8b96120c274e052abb4f692861be46 url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-darwin-20110131.tar.bz2 @@ -894,7 +894,7 @@ archive hash - 0959e349c4f7c0b33539269502486737 + afff2018e6a887c281b072eecdd9343e url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110208.tar.bz2 -- cgit v1.3