From fabcf9c8e0e01e01cb9d3d15fc807a5acb330d53 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 11 Jan 2011 15:59:22 -0800 Subject: autobuild configuration to build the viewer (dependencies still handled by install.py) --- autobuild.xml | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 322 insertions(+) create mode 100644 autobuild.xml (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml new file mode 100644 index 0000000000..81da56feff --- /dev/null +++ b/autobuild.xml @@ -0,0 +1,322 @@ + + + + installables + + + package_description + + name + viewer_development + platforms + + common + + configurations + + Debug + + build + + command + cmake + options + + --build + . + --config + Debug + + + configure + + command + cmake + 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 + + + name + Debug + + RelWithDebInfo + + build + + command + cmake + options + + --build + . + --config + RelWithDebInfo + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DSTANDALONE:BOOL=OFF + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DFMOD=TRUE + -DINSTALL_PROPRIETARY=TRUE + + + name + RelWithDebInfo + + Release + + build + + command + cmake + options + + --build + . + --config + Release + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DSTANDALONE:BOOL=OFF + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DFMOD=TRUE + -DINSTALL_PROPRIETARY=TRUE + + + name + Release + + + name + common + + darwin + + build_directory + build-darwin-i386 + configurations + + Debug + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Debug + + RelWithDebInfo + + build + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + default + True + name + RelWithDebInfo + + Release + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Release + + + name + darwin + + linux + + build_directory + build-linux-i686 + configurations + + Debug + + configure + + arguments + + ..\indra + + options + + -G + 'Unix Makefiles' + + + name + Debug + + RelWithDebInfo + + build + + + configure + + arguments + + ..\indra + + options + + -G + 'Unix Makefiles' + + + default + True + name + RelWithDebInfo + + Release + + configure + + arguments + + ..\indra + + options + + -G + 'Unix Makefiles' + + + name + Release + + + name + linux + + windows + + build_directory + build-vc80 + configurations + + Debug + + configure + + arguments + + ..\indra + + options + + -G + "Visual Studio 8 2005" + + + name + Debug + + RelWithDebInfo + + build + + + configure + + arguments + + ..\indra + + options + + -G + "Visual Studio 8 2005" + + + default + True + name + RelWithDebInfo + + Release + + configure + + arguments + + ..\indra + + options + + -G + "Visual Studio 8 2005" + + + name + Release + + + name + windows + + + + type + autobuild + version + 1.2 + + -- cgit v1.3 From 35c259b603718770e89fac9a89ee43a8f7e4dd12 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 12 Jan 2011 09:28:21 -0800 Subject: first pass at packages that need to be installed through autobuild. --- autobuild.xml | 1312 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1312 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 81da56feff..8fa9e56aaf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,6 +3,1318 @@ installables + GL + + name + GL + platforms + + darwin + + archive + + hash + 0b7c1d43dc2b39301fef6c05948fb826 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + d85d88088360aee5b67105ad93b5ad16 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + a94538d064cd0a235b2a95389e7e8ee8 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20101001a.tar.bz2 + + name + windows + + + + SDL + + name + SDL + platforms + + linux + + archive + + hash + 1bd5be9e91ae1ae4a1cfa7649890f72b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20101001.tar.bz2 + + name + linux + + + + apr_suite + + name + apr_suite + platforms + + darwin + + archive + + hash + 4e9cd47faf1e74e1a5bf386dc55dd47e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + ae785a90f124aa572515fc7b97efc671 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20100930.tar.bz2 + + name + linux + + windows + + archive + + hash + 925015cb33630fd73db5dcb6817bf0a2 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.8-windows-20101001a.tar.bz2 + + name + windows + + + + ares + + name + ares + platforms + + darwin + + archive + + hash + 577e89e72a6df485ee0c42ef7bfd8c34 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 3bf8f0f3c960cc594b2315b986b948fb + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 2318e9eef0ea020878759d974a5945df + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20101001a.tar.bz2 + + name + windows + + + + boost + + name + boost + platforms + + darwin + + archive + + hash + 3a8b4bc2ea3dde26c2a7e1481f039864 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + cb7cbafb06b878adf423db314b1787df + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100929a.tar.bz2 + + name + linux + + windows + + archive + + hash + de5559c2c497544b3d0da533390175dc + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20101001a.tar.bz2 + + name + windows + + + + curl + + name + curl + platforms + + darwin + + archive + + hash + ab6246b72141f39804c67f4536f1cece + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + a9b82d81b483f5e40a3058d165f1aff2 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + a3494e2560b7fe32b25cb19041ba4e2a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20101001a.tar.bz2 + + name + windows + + + + dbghelp + + name + dbghelp + platforms + + windows + + archive + + hash + c5d28b13ce16a46f2e35eb133f7d92e8 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20101011.tar.bz2 + + name + windows + + + + dbusglib + + name + dbusglib + platforms + + linux + + archive + + hash + bb9734fb6ae797e3fa34af1a4ef1ee7d + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20101013.tar.bz2 + + name + linux + + + + elfio + + name + elfio + platforms + + linux + + archive + + hash + d931e16a382aa3a5c99a8dea6b5f8391 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20101013.tar.bz2 + + name + linux + + + + expat + + name + expat + platforms + + darwin + + archive + + hash + 594e0d61d115ab06ca11bc84d374d23a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 7c334794bba026685f967734ca963c85 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 2af1798aa38dce1b941ef8207f1beb50 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-windows-20101001a.tar.bz2 + + name + windows + + + + fmod + + name + fmod + platforms + + darwin + + archive + + hash + 4521b86ff92c3843e47a58b38e76e667 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 221ec16b66ea2b0d1acb3247ad984bc4 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 651dd6d4c057e89f989ce0eda447c441 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20101008.tar.bz2 + + name + windows + + + + fontconfig + + name + fontconfig + platforms + + linux + + archive + + hash + 9ebba6e0a1730992fa0643566f4e23cf + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20100930.tar.bz2 + + name + linux + + + + freeglut + + name + freeglut + platforms + + windows + + archive + + hash + 88c29e73df61ff87c111d55d1b48f12c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freeglut-2.4.0-windows-20101001a.tar.bz2 + + name + windows + + + + freetype + + name + freetype + platforms + + darwin + + archive + + hash + 753021e66345612b4fc77c711b426f11 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + a13ec6354d3a8a4576efcce895a74ceb + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19a-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + f7bd61490e6290b1981538b744919afd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-windows-20101001a.tar.bz2 + + name + windows + + + + glh_linear + + name + glh_linear + platforms + + darwin + + archive + + hash + 366f940f2634b0e05954646927620bfd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 26f2df1f0b0fa01e94e0253e322f3583 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20101001.tar.bz2 + + name + linux + + windows + + archive + + hash + 57f8be28bbaa2505ae3b59deb2c77cdf + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20101011.tar.bz2 + + name + windows + + + + glui + + name + glui + platforms + + darwin + + archive + + hash + c3bfca7ad2eb90ea33f3fd6f974ca394 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20101004.tar.bz2 + + name + darwin + + windows + + archive + + hash + 1135a4afc4328c68368f550ede28b4dd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20101001b.tar.bz2 + + name + windows + + + + google-perftools + + name + google-perftools + platforms + + windows + + archive + + hash + 8108bffe1c814be9d035b47dac3d4541 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 + + name + windows + + + + google_breakpad + + name + google_breakpad + platforms + + darwin + + archive + + hash + a3b520488b4f444e20838ba5e570dbfd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 70def6f5eb4cc1f55f0a18c620405f37 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + dd8fb6814297a073788b58c010e0184d + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20101018.tar.bz2 + + name + windows + + + + googlemock + + name + googlemock + platforms + + darwin + + archive + + hash + 886ee428f058005ab7f90f61784ec9d9 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 782ca04e56d8eab755adcae297cafa7c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-linux-20101001.tar.bz2 + + name + linux + + windows + + archive + + hash + ec7f12a339ad8c5628db8f8f8fbfe77f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-windows-20101001a.tar.bz2 + + name + windows + + + + gstreamer + + name + gstreamer + platforms + + linux + + archive + + hash + ddbc0a64ad788107877fee777403592c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20101013.tar.bz2 + + name + linux + + + + gtk-atk-pango-glib + + name + gtk-atk-pango-glib + platforms + + linux + + archive + + hash + 03694ade27f53199229c03cbbda89214 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20101001.tar.bz2 + + name + linux + + windows + + archive + + hash + c257d718abdde8cfe8a0af26175161a7 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20101001a.tar.bz2 + + name + windows + + + + jpeglib + + name + jpeglib + platforms + + darwin + + archive + + hash + d94de5a98492018144b95a8022ed4e44 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + a059a32904c1c7f47804d744ac2d4925 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 4a4d88f6ba42fa0acd47881f2d7ed7a7 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20101001b.tar.bz2 + + name + windows + + + + jsoncpp + + name + jsoncpp + platforms + + darwin + + archive + + hash + c10c28118c578d0674c1fbe59002d0ab + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 7e6b2fc7ad4e12d94d01cc49c22c6f67 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2 + + name + linux + + windows + + archive + + hash + ac06a8981cf7df3522362850ffb3a531 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-windows-20101011.tar.bz2 + + name + windows + + + + kdu + + name + kdu + platforms + + windows + + archive + + hash + f43ffb2217628a38d6004bdad792e7d2 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-4.2.1-windows-20100930b.tar.bz2 + + name + windows + + + + libpng + + name + libpng + platforms + + darwin + + archive + + hash + 4aa623811aff42df702e8d3fdd848ac3 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + adeeca61be1b8f47ce85660c8c20a904 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + dd0e68bde099def37c6a7527673aa672 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20101001a.tar.bz2 + + name + windows + + + + libuuid + + name + libuuid + platforms + + linux + + archive + + hash + 2b64ea42d54583ab82f4936ce6ea2a3c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20100930.tar.bz2 + + name + linux + + + + libxml + + name + libxml + platforms + + linux + + archive + + hash + 6414642528f42dac1cd9a012c99cd748 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20101013.tar.bz2 + + name + linux + + + + llqtwebkit + + name + llqtwebkit + platforms + + darwin + + archive + + hash + 54e179ff85bce44b65f4f186bf4c14b1 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6%2bcookies-darwin-20101013.tar.bz2 + + name + darwin + + linux + + archive + + hash + c05a33ee8b6f253b5a744596dfc3707d + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2 + + name + linux + + windows + + archive + + hash + 8bb26542f86cb469b2b56d42258e1bad + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20101001a.tar.bz2 + + name + windows + + + + mesa + + name + mesa + platforms + + linux + + archive + + hash + 1f600840463c7327ea17486821425750 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20100930.tar.bz2 + + name + linux + + windows + + archive + + hash + 178a79f9af90b16f0a62430f9fe88f28 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20101001a.tar.bz2 + + name + windows + + + + ndofdev + + name + ndofdev + platforms + + darwin + + archive + + hash + d56bb37233e6f1308fb0a5b8e37a2429 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + c81bacf922bb3b540d92b660364c48ce + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-0.2-20101013.tar.bz2 + + name + linux + + windows + + archive + + hash + 9d4f6c042c27fdab81e00238af7e55f0 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-windows-20101001a.tar.bz2 + + name + windows + + + + ogg-vorbis + + name + ogg-vorbis + platforms + + darwin + + archive + + hash + 510c88fb183556b8c5fba25eb0c3d85e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + d4bda5baabfbfbd92ea7bd2a48c7fb8a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 61f4987290b90416fdba2cd4c4b2ecf3 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20101001a.tar.bz2 + + name + windows + + + + openSSL + + name + openSSL + platforms + + darwin + + archive + + hash + 9cf8e84cb91996616cf627ad18c85442 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 511cf1c200efe587552b8225dd361dbb + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20100930.tar.bz2 + + name + linux + + windows + + archive + + hash + 8c5862027b93eafceeaae9e4cef4cfa8 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20101001b.tar.bz2 + + name + windows + + + + openjpeg + + name + openjpeg + platforms + + darwin + + archive + + hash + 972088359b9472a3baf4dda695cbda44 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3.0-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + c34975e8090d861c6e37ea606fd66940 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + 039c65405b2bea7c1bf67cfeb15a67fe + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-windows-20101001b.tar.bz2 + + name + windows + + + + pth + + name + pth + platforms + + darwin + + archive + + hash + d47d121c8eaed4ac6d8253ceda23b5c9 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20101004.tar.bz2 + + name + darwin + + + + quicktime + + name + quicktime + platforms + + windows + + archive + + hash + 045618341689fdc3a5560b75a9890a78 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/quicktime-sdk-windows-7.3-20101001a.tar.bz2 + + name + windows + + + + vivox + + name + vivox + platforms + + darwin + + archive + + hash + 8f517d790d2ec9888c5688e9950fc2d5 + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-darwin-20101018.tar.bz2 + + name + darwin + + windows + + archive + + hash + 698449073dbc108e046fef15ce30b1f5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8821-windows-20101011.tar.bz2 + + name + windows + + + + xmlrpc-epi + + name + xmlrpc-epi + platforms + + darwin + + archive + + hash + 994193ab308ac40994421ca411249b65 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 3580c3729a034adff005a234f3ce6e84 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + ea06e2f1c1ed59a2d2b6cdb6f459d1c0 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20101001a.tar.bz2 + + name + windows + + + + zlib + + name + zlib + platforms + + darwin + + archive + + hash + 3d1b42e6c3fcfebe00c6b87a0228c0ab + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20101004.tar.bz2 + + name + darwin + + linux + + archive + + hash + 7e2818075e89f0729e869a244eafbbf7 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3dfsg-linux-20100929.tar.bz2 + + name + linux + + windows + + archive + + hash + d1015a07ce0aa9aeeadc6a126cdcdf9f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-windows-20101001a.tar.bz2 + + name + windows + + + package_description -- cgit v1.3 From 5d3e7c8e7e0f7173ef9f90a8ed155f564c2e0190 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 12 Jan 2011 11:56:25 -0800 Subject: add licence file information --- autobuild.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 8fa9e56aaf..24ac4b2c3a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -5,6 +5,8 @@ GL + license_file + LICENSES/GL.txt name GL platforms @@ -49,6 +51,8 @@ SDL + license_file + LICENSES/SDL.txt name SDL platforms @@ -69,6 +73,8 @@ apr_suite + license_file + LICENSES/apr_suite.txt name apr_suite platforms @@ -113,6 +119,8 @@ ares + license_file + LICENSES/ares.txt name ares platforms @@ -157,6 +165,8 @@ boost + license_file + LICENSES/boost.txt name boost platforms @@ -201,6 +211,8 @@ curl + license_file + LICENSES/curl.txt name curl platforms @@ -245,6 +257,8 @@ dbghelp + license_file + LICENSES/dbghelp.txt name dbghelp platforms @@ -265,6 +279,8 @@ dbusglib + license_file + LICENSES/dbusglib.txt name dbusglib platforms @@ -285,6 +301,8 @@ elfio + license_file + LICENSES/elfio.txt name elfio platforms @@ -305,6 +323,8 @@ expat + license_file + LICENSES/expat.txt name expat platforms @@ -349,6 +369,8 @@ fmod + license_file + LICENSES/fmod.txt name fmod platforms @@ -393,6 +415,8 @@ fontconfig + license_file + LICENSES/fontconfig.txt name fontconfig platforms @@ -413,6 +437,8 @@ freeglut + license_file + LICENSES/freeglut.txt name freeglut platforms @@ -433,6 +459,8 @@ freetype + license_file + LICENSES/freetype.txt name freetype platforms @@ -477,6 +505,8 @@ glh_linear + license_file + LICENSES/glh_linear.txt name glh_linear platforms @@ -521,6 +551,8 @@ glui + license_file + LICENSES/glui.txt name glui platforms @@ -553,6 +585,8 @@ google-perftools + license_file + LICENSES/google.txt name google-perftools platforms @@ -573,6 +607,8 @@ google_breakpad + license_file + LICENSES/google_breakpad.txt name google_breakpad platforms @@ -617,6 +653,8 @@ googlemock + license_file + LICENSES/googlemock.txt name googlemock platforms @@ -661,6 +699,8 @@ gstreamer + license_file + LICENSES/gstreamer.txt name gstreamer platforms @@ -681,6 +721,8 @@ gtk-atk-pango-glib + license_file + LICENSES/gtk.txt name gtk-atk-pango-glib platforms @@ -713,6 +755,8 @@ jpeglib + license_file + LICENSES/jpeglib.txt name jpeglib platforms @@ -757,6 +801,8 @@ jsoncpp + license_file + LICENSES/jsoncpp.txt name jsoncpp platforms @@ -801,6 +847,8 @@ kdu + license_file + LICENSES/kdu.txt name kdu platforms @@ -821,6 +869,8 @@ libpng + license_file + LICENSES/libpng.txt name libpng platforms @@ -865,6 +915,8 @@ libuuid + license_file + LICENSES/libuuid.txt name libuuid platforms @@ -885,6 +937,8 @@ libxml + license_file + LICENSES/libxml.txt name libxml platforms @@ -905,6 +959,8 @@ llqtwebkit + license_file + LICENSES/llqtwebkit.txt name llqtwebkit platforms @@ -949,6 +1005,8 @@ mesa + license_file + LICENSES/mesa.txt name mesa platforms @@ -981,6 +1039,8 @@ ndofdev + license_file + LICENSES/ndofdev.txt name ndofdev platforms @@ -1025,6 +1085,8 @@ ogg-vorbis + license_file + LICENSES/ogg.txt name ogg-vorbis platforms @@ -1069,6 +1131,8 @@ openSSL + license_file + LICENSES/openSSL.txt name openSSL platforms @@ -1113,6 +1177,8 @@ openjpeg + license_file + LICENSES/openjpeg.txt name openjpeg platforms @@ -1157,6 +1223,8 @@ pth + license_file + LICENSES/pth.txt name pth platforms @@ -1177,6 +1245,8 @@ quicktime + license_file + LICENSES/quicktime.txt name quicktime platforms @@ -1197,6 +1267,8 @@ vivox + license_file + LICENSES/apr_suite.txt name vivox platforms @@ -1229,6 +1301,8 @@ xmlrpc-epi + license_file + LICENSES/xmlrpc.txt name xmlrpc-epi platforms @@ -1273,6 +1347,8 @@ zlib + license_file + LICENSES/zlib.txt name zlib platforms -- cgit v1.3 From b7637e58bef73abfced2721d6b697e47b2d9f622 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 13 Jan 2011 13:09:27 -0800 Subject: mac buiding with autobuild and autobuild style packages (just say no to install.py) --- autobuild.xml | 40 +++++++++++++++-- indra/cmake/APR.cmake | 12 ++--- indra/cmake/Copy3rdPartyLibs.cmake | 9 ++-- indra/cmake/DBusGlib.cmake | 2 +- indra/cmake/FindAutobuild.cmake | 41 +++++++++++++++++ indra/cmake/FreeType.cmake | 2 +- indra/cmake/GStreamer010Plugin.cmake | 6 +-- indra/cmake/GooglePerfTools.cmake | 6 ++- indra/cmake/Linking.cmake | 51 +++++++++++++--------- indra/cmake/MonoEmbed.cmake | 4 +- indra/cmake/MySQL.cmake | 6 +-- indra/cmake/OpenGL.cmake | 2 +- indra/cmake/OpenSSL.cmake | 2 +- indra/cmake/Prebuilt.cmake | 42 +++++++++++------- indra/cmake/QuickTimePlugin.cmake | 2 +- indra/cmake/UI.cmake | 4 +- indra/cmake/Variables.cmake | 68 ++++++++++++++++------------- indra/media_plugins/webkit/CMakeLists.txt | 4 +- indra/newview/viewer_manifest.py | 6 +-- indra/test_apps/llplugintest/CMakeLists.txt | 4 +- 20 files changed, 206 insertions(+), 107 deletions(-) create mode 100644 indra/cmake/FindAutobuild.cmake (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 24ac4b2c3a..ff56e7559a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -853,6 +853,18 @@ kdu platforms + darwin + + archive + + hash + 408f1375f5a4d864cfb47b36c8ab6052 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-darwin-20110112.tar.bz2 + + name + darwin + windows archive @@ -970,9 +982,9 @@ archive hash - 54e179ff85bce44b65f4f186bf4c14b1 + d3890220418a66607569fe406ebe24c7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6%2bcookies-darwin-20101013.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-darwin-20110113.tar.bz2 name darwin @@ -1265,7 +1277,7 @@ - vivox + slvoice license_file LICENSES/apr_suite.txt @@ -1299,6 +1311,28 @@ + tut + + license_file + LICENSES/tut.txt + name + tut + platforms + + common + + archive + + hash + 5c6d3e606f027e78f056cb77b20f228e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2008-11-30-common-20101001.tar.bz2 + + name + common + + + xmlrpc-epi license_file diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..5b31b0d237 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -38,21 +38,15 @@ else (STANDALONE) set(APR_selector "a") set(APRUTIL_selector "a") endif (LLCOMMON_LINK_SHARED) - set(APR_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector} - ) - set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector} - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector} - ) + set(APR_LIBRARIES libapr-1.${APR_selector}) + set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector}) set(APRICONV_LIBRARIES iconv) else (WINDOWS) set(APR_LIBRARIES apr-1) set(APRUTIL_LIBRARIES aprutil-1) set(APRICONV_LIBRARIES iconv) endif (WINDOWS) - set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) + set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1) if (LINUX) if (VIEWER) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 176ae9787e..55a26cf9ef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -5,6 +5,7 @@ # VisualStudio. include(CMakeCopyIfDifferent) +include(Linking) ################################################################### # set up platform specific lists of files that need to be copied @@ -135,14 +136,10 @@ elseif(DARWIN) libvivoxplatform.dylib libvivoxsdk.dylib ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files libapr-1.0.3.7.dylib libapr-1.dylib diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index cfc4ccd404..33c6343a93 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -10,7 +10,7 @@ elseif (LINUX) use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/include/glib-2.0 ) # We don't need to explicitly link against dbus-glib itself, because # the viewer probes for the system's copy at runtime. diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake new file mode 100644 index 0000000000..45db2b6ed0 --- /dev/null +++ b/indra/cmake/FindAutobuild.cmake @@ -0,0 +1,41 @@ +# -*- cmake -*- +# +# Find the autobuild tool +# +# Output variables: +# +# AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable + +# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var +# update this to check for that case + +IF (NOT AUTOBUILD_EXECUTABLE) + IF(WIN32) + SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe) + ELSE(WIN32) + SET(AUTOBUILD_EXE_NAMES autobuild) + ENDIF(WIN32) + + SET(AUTOBUILD_EXECUTABLE) + FIND_PROGRAM( + AUTOBUILD_EXECUTABLE + NAMES ${AUTOBUILD_EXE_NAMES} + PATHS + ENV PATH + ${CMAKE_SOURCE_DIR}/.. + ${CMAKE_SOURCE_DIR}/../.. + ${CMAKE_SOURCE_DIR}/../../.. + PATH_SUFFIXES "/autobuild/bin/" + ) + + IF (AUTOBUILD_EXECUTABLE) + GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE) + MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}") + ELSE (AUTOBUILD_EXECUTABLE) + IF (AUTOBUILD_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find autobuild executable") + ENDIF (AUTOBUILD_FIND_REQUIRED) + ENDIF (AUTOBUILD_EXECUTABLE) + + MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE) +ENDIF (NOT AUTOBUILD_EXECUTABLE) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e89..43a9d282d0 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -9,7 +9,7 @@ else (STANDALONE) use_prebuilt_binary(freetype) if (LINUX) set(FREETYPE_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + ${LIBS_PREBUILT_DIR}/include) else (LINUX) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (LINUX) diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 0ca432da18..d2d0699bcd 100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -13,9 +13,9 @@ elseif (LINUX) set(GSTREAMER010_FOUND ON FORCE BOOL) set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL) set(GSTREAMER010_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 + ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10 + ${LIBS_PREBUILT_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/include/libxml2 ) # We don't need to explicitly link against gstreamer itself, because # LLMediaImplGStreamer probes for the system's copy at runtime. diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..0ac67fe595 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -4,7 +4,9 @@ include(Prebuilt) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - use_prebuilt_binary(google) + if(NOT DARWIN) + use_prebuilt_binary(google) + endif() if (WINDOWS) use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES @@ -17,7 +19,7 @@ else (STANDALONE) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + ${LIBS_PREBUILT_DIR}/include) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index bca99caf2a..07db6ab257 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -1,32 +1,43 @@ # -*- cmake -*- +include(Variables) + + if (NOT STANDALONE) + set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib) + set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release) + set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug) if (WINDOWS) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs") - set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) + set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) elseif (LINUX) - if (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client) - else (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - endif (VIEWER) - set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib CACHE FILEPATH "Location of staged .sos") - set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib) + set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin) elseif (DARWIN) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE}) - set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs") - set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)" CACHE FILEPATH "Location of staged executables") + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) + set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)") endif (WINDOWS) endif (NOT STANDALONE) -link_directories(${ARCH_PREBUILT_DIRS}) +# Autobuild packages must provide 'release' versions of libraries, but may provide versions for +# specific build types. AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then +# the 'release' directory (as a default fallback). +# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and +# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux). The reason for this is +# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and +# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators +if(WINDOWS OR DARWIN) + # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us + # fortunately both windows and darwin are case insensitive filesystems so this works. + set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/") +else(WINDOWS OR DARWIN) + # else block is for linux and any other makefile based generators + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) + set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}) +endif(WINDOWS OR DARWIN) + +list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) +link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) set(DL_LIBRARY dl) diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake index 0f1f23309c..30890aed21 100644 --- a/indra/cmake/MonoEmbed.cmake +++ b/indra/cmake/MonoEmbed.cmake @@ -37,9 +37,9 @@ IF (DARWIN) ELSE (DARWIN) - SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) SET(GLIB_2_0_PLATFORM_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0) + ${LIBS_PREBUILT_DIR}/include/glib-2.0) SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0) INCLUDE_DIRECTORIES( diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e591fbc3d8..218482449d 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -7,7 +7,7 @@ use_prebuilt_binary(mysql) if (LINUX) if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") # Use the native MySQL library on a 64-bit system. set(MYSQL_FIND_QUIETLY ON) @@ -16,9 +16,9 @@ if (LINUX) endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") elseif (WINDOWS) set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set(MYSQL_LIBRARIES optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 6a2b6811af..661666f00d 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -5,5 +5,5 @@ if (NOT STANDALONE) use_prebuilt_binary(GL) # possible glh_linear should have its own .cmake file instead use_prebuilt_binary(glh_linear) - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) endif (NOT STANDALONE) diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 81584c09ea..c692b67b49 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -13,7 +13,7 @@ else (STANDALONE) else (WINDOWS) set(OPENSSL_LIBRARIES ssl) endif (WINDOWS) - set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) if (LINUX) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index a91519278c..9b758b03f0 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -1,33 +1,45 @@ # -*- cmake -*- -include(Python) -include(FindSCP) +include(FindAutobuild) macro (use_prebuilt_binary _binary) - if (NOT STANDALONE) + if (NOT DEFINED STANDALONE_${_binary}) + set(STANDALONE_${_binary} ${STANDALONE}) + endif (NOT DEFINED STANDALONE_${_binary}) + + if (NOT STANDALONE_${_binary}) if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed) if(INSTALL_PROPRIETARY) include(FindSCP) if(DEBUG_PREBUILT) - message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}") + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + --install-dir=${AUTOBUILD_INSTALL_DIR} + #--scp="${SCP_EXECUTABLE}" + --skip-license-check + ${_binary} ") endif(DEBUG_PREBUILT) - execute_process(COMMAND ${PYTHON_EXECUTABLE} - install.py - --install-dir=${CMAKE_SOURCE_DIR}/.. - --scp=${SCP_EXECUTABLE} + execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" + install + --install-dir=${AUTOBUILD_INSTALL_DIR} + #--scp="${SCP_EXECUTABLE}" + --skip-license-check ${_binary} - WORKING_DIRECTORY ${SCRIPTS_DIR} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE ${_binary}_installed ) else(INSTALL_PROPRIETARY) if(DEBUG_PREBUILT) - message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}") + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check + ${_binary} ") endif(DEBUG_PREBUILT) - execute_process(COMMAND ${PYTHON_EXECUTABLE} - install.py - --install-dir=${CMAKE_SOURCE_DIR}/.. + execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" + install + --install-dir=${AUTOBUILD_INSTALL_DIR} + --skip-license-check ${_binary} - WORKING_DIRECTORY ${SCRIPTS_DIR} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE ${_binary}_installed ) endif(INSTALL_PROPRIETARY) @@ -40,5 +52,5 @@ macro (use_prebuilt_binary _binary) "Failed to download or unpack prebuilt '${_binary}'." " Process returned ${${_binary}_installed}.") endif (NOT ${_binary}_installed EQUAL 0) - endif (NOT STANDALONE) + endif (NOT STANDALONE_${_binary}) endmacro (use_prebuilt_binary _binary) diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake index 02f432e3c1..012f4e20d8 100644 --- a/indra/cmake/QuickTimePlugin.cmake +++ b/indra/cmake/QuickTimePlugin.cmake @@ -33,7 +33,7 @@ elseif (WINDOWS) endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY) include_directories( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime + ${LIBS_PREBUILT_DIR}/include/quicktime "${QUICKTIME_SDK_DIR}\\CIncludes" ) endif (DARWIN) diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index f529f5b644..91e5258fb7 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -51,11 +51,11 @@ else (STANDALONE) endif (LINUX) include_directories ( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include + ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) - include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include}) + include_directories(${LIBS_PREBUILT_DIR}/include/${include}) endforeach(include) endif (STANDALONE) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 5dc0cabf03..88cfdfc0b9 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -17,6 +17,10 @@ # Relative and absolute paths to subtrees. +if(NOT DEFINED COMMON_CMAKE_DIR) + set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake") +endif(NOT DEFINED COMMON_CMAKE_DIR) + set(LIBS_CLOSED_PREFIX) set(LIBS_OPEN_PREFIX) set(LIBS_SERVER_PREFIX) @@ -26,14 +30,26 @@ set(VIEWER_PREFIX) set(INTEGRATION_TESTS_PREFIX) set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation") -set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX}) -set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}) +if(LIBS_CLOSED_DIR) + file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR) +else(LIBS_CLOSED_DIR) + set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX}) +endif(LIBS_CLOSED_DIR) +if(LIBS_COMMON_DIR) + file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR) +else(LIBS_COMMON_DIR) + set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}) +endif(LIBS_COMMON_DIR) +set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR}) + set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX}) set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX}) set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX}) set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX}) -set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH +set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages) + +set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH "Location of prebuilt libraries.") if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) @@ -41,6 +57,10 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Build type. One of: Debug Release RelWithDebInfo" FORCE) +endif (NOT CMAKE_BUILD_TYPE) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) @@ -54,20 +74,19 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX ON BOOl FORCE) # If someone has specified a word size, use that to determine the - # architecture. Otherwise, let the compiler specify the word size. - # Using uname will break under chroots and other cross arch compiles. RC + # architecture. Otherwise, let the architecture specify the word size. if (WORD_SIZE EQUAL 32) set(ARCH i686) elseif (WORD_SIZE EQUAL 64) set(ARCH x86_64) else (WORD_SIZE EQUAL 32) - if(CMAKE_SIZEOF_VOID_P MATCHES 4) - set(ARCH i686) - set(WORD_SIZE 32) - else(CMAKE_SIZEOF_VOID_P MATCHES 4) - set(ARCH x86_64) + execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/ + OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if (ARCH STREQUAL x86_64) set(WORD_SIZE 64) - endif(CMAKE_SIZEOF_VOID_P MATCHES 4) + else (ARCH STREQUAL x86_64) + set(WORD_SIZE 32) + endif (ARCH STREQUAL x86_64) endif (WORD_SIZE EQUAL 32) set(LL_ARCH ${ARCH}_linux) @@ -76,25 +95,12 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - - # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure - # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly, - # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check - # for it being unset, as it gets set to the system default :( - - # Default to building against the 10.4 SDK if no deployment target is - # specified. - if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html - # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) - endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - - # GCC 4.2 is incompatible with the MacOSX 10.4 SDK - if (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") - endif (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") + + # To support a different SDK update these Xcode settings: + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2") + set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "DWARF with dSYM File") # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' @@ -125,6 +131,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") +set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) @@ -144,3 +151,4 @@ endif (LINUX AND SERVER AND VIEWER) set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") source_group("CMake Rules" FILES CMakeLists.txt) + diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 3b1f679540..b36291f0e8 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -121,8 +121,8 @@ if (DARWIN) add_custom_command( TARGET media_plugin_webkit POST_BUILD # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib + COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ + DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ) endif (DARWIN) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 338c62b9fb..2500ae2b37 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -566,7 +566,7 @@ class DarwinManifest(ViewerManifest): self.path("Info-SecondLife.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ - self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") + self.path("../packages/lib/release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install") @@ -616,7 +616,7 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") - libdir = "../../libraries/universal-darwin/lib_release" + libdir = "../packages/lib/release" dylibs = {} # Need to get the llcommon dll from any of the build directories as well @@ -685,7 +685,7 @@ class DarwinManifest(ViewerManifest): if self.prefix(src="", dst="llplugin"): self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib") self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib") - self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib") + self.path("../packages/lib/release/libllqtwebkit.dylib", "libllqtwebkit.dylib") self.end_prefix("llplugin") diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index b4043b0fd9..77789230aa 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -379,8 +379,8 @@ endif (DARWIN OR WINDOWS) if (DARWIN) add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib + COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR} + DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ) endif (DARWIN) -- cgit v1.3 From 738c7546087b5c5fa049be0563623221ef5716c6 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Fri, 14 Jan 2011 09:03:22 -0800 Subject: windows autobuildibatized (bye bye install.py...) --- .hgignore | 1 + autobuild.xml | 12 ++++++------ indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++------- indra/cmake/GooglePerfTools.cmake | 4 +--- indra/llaudio/CMakeLists.txt | 1 + indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 10 +++++----- indra/test_apps/llplugintest/CMakeLists.txt | 12 ++++++------ 8 files changed, 25 insertions(+), 28 deletions(-) (limited to 'autobuild.xml') diff --git a/.hgignore b/.hgignore index a5b094788a..dbbf8268a9 100644 --- a/.hgignore +++ b/.hgignore @@ -12,6 +12,7 @@ syntax: glob LICENSES indra/.distcc build-darwin-* +build-vc80/ indra/build-vc[0-9]* indra/CMakeFiles indra/lib/mono/1.0/*.dll diff --git a/autobuild.xml b/autobuild.xml index ff56e7559a..45dba8381d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -404,9 +404,9 @@ archive hash - 651dd6d4c057e89f989ce0eda447c441 + b9fa0ef683657090ae66663863ebba74 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20101008.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/merov_fmod-autobuild/rev/219050/arch/CYGWIN/installer/fmod-3.75-windows-20110113.tar.bz2 name windows @@ -870,9 +870,9 @@ archive hash - f43ffb2217628a38d6004bdad792e7d2 + 0c7b5596c27f511d4957abe35f7f8dee url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-4.2.1-windows-20100930b.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-windows-20110113.tar.bz2 name windows @@ -1006,9 +1006,9 @@ archive hash - 8bb26542f86cb469b2b56d42258e1bad + 5af0f88e298ea8b6041e29928f520eda url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20101001a.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llqtwebkit-4.7.1-windows-20110113.tar.bz2 name windows diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 55a26cf9ef..92ebd75006 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -17,7 +17,7 @@ if(WINDOWS) #******************************* # VIVOX - *NOTE: no debug version - set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") + set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe libsndfile-1.dll @@ -31,9 +31,7 @@ if(WINDOWS) #******************************* # Misc shared libs - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files openjpegd.dll libapr-1.dll @@ -41,14 +39,13 @@ if(WINDOWS) libapriconv-1.dll ) - # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables - # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files openjpeg.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll + dbghelp.dll ) if(USE_GOOGLE_PERFTOOLS) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 0ac67fe595..133ae14d2f 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -4,9 +4,6 @@ include(Prebuilt) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - if(NOT DARWIN) - use_prebuilt_binary(google) - endif() if (WINDOWS) use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES @@ -15,6 +12,7 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) + use_prebuilt_binary(google) set(TCMALLOC_LIBRARIES tcmalloc) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 21ec622819..632e5d46e3 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${VORBIS_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} + ${FMOD_INCLUDE_DIR} ) set(llaudio_SOURCE_FILES diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a61c35abd2..759c8e4045 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1506,7 +1506,7 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt - ${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.dll + ${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2500ae2b37..4a1ad6c893 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -299,6 +299,9 @@ class WindowsManifest(ViewerManifest): self.path("vivoxplatform.dll") self.path("vivoxoal.dll") + # For use in crash reporting (generates minidumps) + self.path("dbghelp.dll") + # For google-perftools tcmalloc allocator. try: if self.args['configuration'].lower() == 'debug': @@ -314,9 +317,6 @@ class WindowsManifest(ViewerManifest): self.path("featuretable.txt") self.path("featuretable_xp.txt") - # For use in crash reporting (generates minidumps) - self.path("dbghelp.dll") - self.enable_no_crt_manifest_check() # Media plugins - QuickTime @@ -336,7 +336,7 @@ class WindowsManifest(ViewerManifest): if self.args['configuration'].lower() == 'debug': - if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'), + if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'debug'), dst="llplugin"): self.path("libeay32.dll") self.path("qtcored4.dll") @@ -367,7 +367,7 @@ class WindowsManifest(ViewerManifest): self.end_prefix() else: - if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'release'), + if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'), dst="llplugin"): self.path("libeay32.dll") self.path("qtcore4.dll") diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index 77789230aa..d6203ea026 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -389,7 +389,7 @@ if(WINDOWS) # Plugin test library deploy # # Debug config runtime files required for the plugin test mule - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(plugintest_debug_files libeay32.dll libglib-2.0-0.dll @@ -412,7 +412,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Debug config runtime files required for the plugin test mule (Qt image format plugins) - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/imageformats") set(plugintest_debug_files qgifd4.dll qicod4.dll @@ -430,7 +430,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Debug config runtime files required for the plugin test mule (Qt codec plugins) - set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/codecs") + set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/codecs") set(plugintest_debug_files qcncodecsd4.dll qjpcodecsd4.dll @@ -446,7 +446,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(plugintest_release_files libeay32.dll libglib-2.0-0.dll @@ -478,7 +478,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins) - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/imageformats") set(plugintest_release_files qgif4.dll qico4.dll @@ -504,7 +504,7 @@ if(WINDOWS) set(plugin_test_targets ${plugin_test_targets} ${out_targets}) # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt codec plugins) - set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/codecs") + set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/codecs") set(plugintest_release_files qcncodecs4.dll qjpcodecs4.dll -- cgit v1.3 From 3150fb0021222fe5e39dd45e82c183ccff8013f0 Mon Sep 17 00:00:00 2001 From: jenn Date: Tue, 18 Jan 2011 09:59:34 -0800 Subject: Added entries to autobuild.xml for 'openal_soft' and 'google' libs on linux. These packages have been rebuilt to use the new package layout (thanks alain!). 'openal_soft' was also renamed to use an underscore in its name rather than a dash. --- autobuild.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++--- indra/cmake/OPENAL.cmake | 2 +- 2 files changed, 62 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 45dba8381d..dc4335bcb6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -583,6 +583,30 @@ + google + + name + google + platforms + + linux + + archive + + hash + 7d9d1b6d32ee273df164f7b7d5f29848 + hash_algorithm + md5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2 + + name + linux + + + version + 0.0.0 + google-perftools license_file @@ -1187,6 +1211,32 @@ + openal_soft + + license_file + LICENSES/OPENAL.txt + name + openal_soft + platforms + + linux + + archive + + hash + fccdca18a950ac9363c6fb39118b80e1 + hash_algorithm + md5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2 + + name + linux + + + version + 3ad86a1c + openjpeg license_file @@ -1614,7 +1664,7 @@ arguments - ..\indra + ../indra options @@ -1634,7 +1684,7 @@ arguments - ..\indra + ../indra options @@ -1653,7 +1703,7 @@ arguments - ..\indra + ../indra options @@ -1664,6 +1714,14 @@ name Release + default + + build + + + name + default + name linux diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed1..ed483e5aea 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -15,7 +15,7 @@ if (OPENAL) pkg_check_modules(OPENAL_LIB REQUIRED openal) pkg_check_modules(FREEALUT_LIB REQUIRED freealut) else (STANDALONE) - use_prebuilt_binary(openal-soft) + use_prebuilt_binary(openal_soft) endif (STANDALONE) set(OPENAL_LIBRARIES openal -- cgit v1.3 From bae82a240c1d8b33a4c3e5439a72805decb9bc86 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 18 Jan 2011 10:44:27 -0800 Subject: use platform specific build commands. --- autobuild.xml | 117 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 27 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 45dba8381d..70803961a1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1440,15 +1440,6 @@ build - command - cmake - options - - --build - . - --config - Debug - configure @@ -1472,15 +1463,6 @@ build - command - cmake - options - - --build - . - --config - RelWithDebInfo - configure @@ -1504,15 +1486,6 @@ build - command - cmake - options - - --build - . - --config - Release - configure @@ -1544,6 +1517,16 @@ Debug + build + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + configure arguments @@ -1563,6 +1546,13 @@ build + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + configure @@ -1583,6 +1573,16 @@ Release + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + configure arguments @@ -1610,6 +1610,15 @@ Debug + build + + command + make + options + + -j 12 + + configure arguments @@ -1629,6 +1638,12 @@ build + command + make + options + + -j 12 + configure @@ -1649,6 +1664,15 @@ Release + build + + command + make + options + + -j 12 + + configure arguments @@ -1676,6 +1700,20 @@ Debug + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Debug|Win32" + + configure arguments @@ -1695,6 +1733,17 @@ build + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=RelWithDebInfo|Win32" + configure @@ -1715,6 +1764,20 @@ Release + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Release|Win32" + + configure arguments -- cgit v1.3 From f38c18bb3d92bf6d1b918e30e21616fa7a9bb578 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 18 Jan 2011 13:28:53 -0800 Subject: reduce mac log spam. --- autobuild.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4926b53f43..30b1c1cace 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1569,6 +1569,13 @@ build + arguments + + | + grep + -v + setenv + command xcodebuild options @@ -1596,6 +1603,13 @@ build + arguments + + | + grep + -v + setenv + command xcodebuild options @@ -1625,6 +1639,13 @@ build + arguments + + | + grep + -v + setenv + command xcodebuild options -- cgit v1.3 From 19293991b708b90bbe75c86f7a6b0861d741b57a Mon Sep 17 00:00:00 2001 From: jenn Date: Tue, 18 Jan 2011 16:27:18 -0800 Subject: Added 'slvoice' (vivox) to autobuild.xml for linux. This is version 3.1 of the lib; viewer was using version 3.2, but this version has been rebuilt using the new package layout. Hopefully it will work, though we may need to convert version 3.2 if it does not. Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files. --- autobuild.xml | 14 +++++++++++++- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 30b1c1cace..f2a8bc10bf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1330,7 +1330,7 @@ slvoice license_file - LICENSES/apr_suite.txt + LICENSES/slvoice.txt name vivox platforms @@ -1347,6 +1347,18 @@ name darwin + linux + + archive + + hash + 827ebbcddb31516e7e40a37374a52ebf + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-linux-20101018.tar.bz2 + + name + linux + windows archive diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 2e8bb04db1..9741d4f890 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -155,9 +155,9 @@ elseif(DARWIN) elseif(LINUX) # linux is weird, multiple side by side configurations aren't supported # and we don't seem to have any debug shared libs built yet anyways... - set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}") + set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug") set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") - set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") + set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release") set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files -- cgit v1.3 From c4713b4f9fb873c3cdc07b80d78f6354a92cd424 Mon Sep 17 00:00:00 2001 From: jenn Date: Tue, 18 Jan 2011 17:18:29 -0800 Subject: Added 'kdu' to autobuild.xml for linux. --- autobuild.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f2a8bc10bf..d1e5244de6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -901,6 +901,18 @@ name windows + linux + + archive + + hash + ed3e58899a424684dad49c94ba3813e7 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-linux-20101124.tar.bz2 + + name + linux + libpng -- cgit v1.3 From a339c948b554070d900aaaca8e6df10694282672 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 19 Jan 2011 12:11:54 -0800 Subject: update google-breakpad package; fix call to dump symbols. --- autobuild.xml | 12 ++++++------ indra/newview/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f2a8bc10bf..ad30389723 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -642,9 +642,9 @@ archive hash - a3b520488b4f444e20838ba5e570dbfd + 5937f12de19ce4fa394048f22557b6c5 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20101004.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20110119.tar.bz2 name darwin @@ -654,9 +654,9 @@ archive hash - 70def6f5eb4cc1f55f0a18c620405f37 + aa48259e567b8a55e932570e975201e0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20100929.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119.tar.bz2 name linux @@ -666,9 +666,9 @@ archive hash - dd8fb6814297a073788b58c010e0184d + 506c870d37b3f7696171e4180c8bf821 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20101018.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20110119.tar.bz2 name windows diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 759c8e4045..b5cb067061 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1870,7 +1870,7 @@ if (PACKAGE) "${VIEWER_DIST_DIR}" "${VIEWER_EXE_GLOBS}" "${VIEWER_LIB_GLOB}" - "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/bin/dump_syms" + "${AUTOBUILD_INSTALL_DIR}/bin/dump_syms" "${VIEWER_SYMBOL_FILE}" DEPENDS generate_breakpad_symbols.py VERBATIM) -- cgit v1.3 From 00f8de066680fc87b4001da0ab3be6e3f99b186f Mon Sep 17 00:00:00 2001 From: jenn Date: Wed, 19 Jan 2011 14:14:40 -0800 Subject: Update 'kdu' for linux in autobuild.xml. Old version had deprectated package structure. --- autobuild.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d1e5244de6..008e0c79b7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -889,29 +889,29 @@ name darwin - windows + linux archive hash - 0c7b5596c27f511d4957abe35f7f8dee + 9742279dfbe57be7a6aed12d60045459 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-windows-20110113.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-linux-20110119.tar.bz2 name - windows + linux - linux + windows archive hash - ed3e58899a424684dad49c94ba3813e7 + 0c7b5596c27f511d4957abe35f7f8dee url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-linux-20101124.tar.bz2 + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-windows-20110113.tar.bz2 name - linux + windows -- cgit v1.3 From f6197abb0960a04e9776c7e11862019ba869b30d Mon Sep 17 00:00:00 2001 From: jenn Date: Wed, 19 Jan 2011 16:21:10 -0800 Subject: Updated google_breakpad package on linux in autobuild.xml. Previously omitted a necessary include file. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d692576fd9..757b155ec1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -654,9 +654,9 @@ archive hash - aa48259e567b8a55e932570e975201e0 + 239e5be637bb6282a297a8636ef3c77e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119a.tar.bz2 name linux -- cgit v1.3 From 3cae4f41a0aeb21748fc46087080b88e331741e4 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 11:25:16 -0800 Subject: update curl library used. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 757b155ec1..623433bcb1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -222,9 +222,9 @@ archive hash - ab6246b72141f39804c67f4536f1cece + 74bfe7b46705f4d5f82abe08e1aeef28 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/Darwin/installer/curl-7.21.1-darwin-20110107.tar.bz2 name darwin @@ -234,9 +234,9 @@ archive hash - a9b82d81b483f5e40a3058d165f1aff2 + ea3c7ca3ea58ffce52e1551def78e077 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100929.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/Linux/installer/curl-7.21.1-linux-20110107.tar.bz2 name linux @@ -246,9 +246,9 @@ archive hash - a3494e2560b7fe32b25cb19041ba4e2a + 0677e39648cae1bd3c1f158a942187aa url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20101001a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/CYGWIN/installer/curl-7.21.1-windows-20110107.tar.bz2 name windows -- cgit v1.3 From 785d3ce4252e9c5061d4d0af67ad495f7c3d1c32 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 14:15:09 -0800 Subject: update slvoice library on mac. --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 623433bcb1..71f7fb38f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1344,7 +1344,7 @@ license_file LICENSES/slvoice.txt name - vivox + slvoice platforms darwin @@ -1352,9 +1352,9 @@ archive hash - 8f517d790d2ec9888c5688e9950fc2d5 + e19576af3c0affc71293d8f0bcce2606 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-darwin-20101018.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/slvoice-3.2.0002.9361-darwin-20110120.tar.bz2 name darwin -- cgit v1.3 From ea8c2b1fa19804ecc55de0274cdd53eceb7f73ce Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 14:32:03 -0800 Subject: update curl lib to fixed archive. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 71f7fb38f7..3449c40ea6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -222,9 +222,9 @@ archive hash - 74bfe7b46705f4d5f82abe08e1aeef28 + 445c558d312a195f015eab324af5aba9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/Darwin/installer/curl-7.21.1-darwin-20110107.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219358/arch/Darwin/installer/curl-7.21.1-darwin-20110120.tar.bz2 name darwin @@ -234,9 +234,9 @@ archive hash - ea3c7ca3ea58ffce52e1551def78e077 + f862e4a9f65f2d57c7bd0815302b021c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/Linux/installer/curl-7.21.1-linux-20110107.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219358/arch/Linux/installer/curl-7.21.1-linux-20110120.tar.bz2 name linux @@ -246,9 +246,9 @@ archive hash - 0677e39648cae1bd3c1f158a942187aa + f57a98c83ae6f62655c78f158ee93fc6 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/218645/arch/CYGWIN/installer/curl-7.21.1-windows-20110107.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219358/arch/CYGWIN/installer/curl-7.21.1-windows-20110120.tar.bz2 name windows -- cgit v1.3 From e59a2f94c75a8c7c9e0b6177443a244dd84692e6 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Thu, 20 Jan 2011 15:06:53 -0800 Subject: update slvoice package. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3449c40ea6..efbd08cdf4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1376,9 +1376,9 @@ archive hash - 698449073dbc108e046fef15ce30b1f5 + 44f84b3b45f7067a104a7c34d50d62f0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8821-windows-20101011.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/slvoice-3.2.0002.9361-windows-20110120.tar.bz2 name windows -- cgit v1.3 From e421ffa3a7c952c1ff3e209f8ebf94ed02aeecc2 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 15:16:02 -0800 Subject: update linux slvoice pacakge. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3449c40ea6..a4a7be47e4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1364,9 +1364,9 @@ archive hash - 827ebbcddb31516e7e40a37374a52ebf + 53fefed8120d7c6a0eb6778edae6fa32 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-linux-20101018.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/slvoice-3.2.0002.9361-linux-20110120.tar.bz2 name linux -- cgit v1.3 From 67fdd528fddc4dd3bf6d1281a119cad8046f5a04 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 16:17:15 -0800 Subject: update mac and linux curl packages to use expected lib layout. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a4a7be47e4..bee0ab6b78 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -222,9 +222,9 @@ archive hash - 445c558d312a195f015eab324af5aba9 + 89b89ad923816317e1a3be963b406f27 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219358/arch/Darwin/installer/curl-7.21.1-darwin-20110120.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219379/arch/Darwin/installer/curl-7.21.1-darwin-20110120.tar.bz2 name darwin @@ -234,9 +234,9 @@ archive hash - f862e4a9f65f2d57c7bd0815302b021c + 49d4ac6773a585ad13190746db1e6e85 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219358/arch/Linux/installer/curl-7.21.1-linux-20110120.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219379/arch/Linux/installer/curl-7.21.1-linux-20110121.tar.bz2 name linux -- cgit v1.3 From 00c9123919b011aeb107dd44078e7c21ef0836c8 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 20 Jan 2011 16:59:33 -0800 Subject: add license information derived from istall.xml --- autobuild.xml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index bee0ab6b78..340f774a9e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -5,6 +5,8 @@ GL + license + GL license_file LICENSES/GL.txt name @@ -51,6 +53,8 @@ SDL + license + lgpl license_file LICENSES/SDL.txt name @@ -73,6 +77,8 @@ apr_suite + license + apache license_file LICENSES/apr_suite.txt name @@ -119,6 +125,8 @@ ares + license + c-ares license_file LICENSES/ares.txt name @@ -165,6 +173,8 @@ boost + license + boost license_file LICENSES/boost.txt name @@ -211,6 +221,8 @@ curl + license + curl license_file LICENSES/curl.txt name @@ -257,6 +269,8 @@ dbghelp + license + MSDTW license_file LICENSES/dbghelp.txt name @@ -279,6 +293,8 @@ dbusglib + license + AFL2.1 license_file LICENSES/dbusglib.txt name @@ -301,6 +317,8 @@ elfio + license + lgpl license_file LICENSES/elfio.txt name @@ -323,6 +341,8 @@ expat + license + mit license_file LICENSES/expat.txt name @@ -369,6 +389,8 @@ fmod + license + fmod license_file LICENSES/fmod.txt name @@ -415,6 +437,8 @@ fontconfig + license + mit license_file LICENSES/fontconfig.txt name @@ -437,6 +461,8 @@ freeglut + license + mit license_file LICENSES/freeglut.txt name @@ -459,6 +485,8 @@ freetype + license + freetype license_file LICENSES/freetype.txt name @@ -505,6 +533,8 @@ glh_linear + license + glh_linear license_file LICENSES/glh_linear.txt name @@ -551,6 +581,8 @@ glui + license + lgpl license_file LICENSES/glui.txt name @@ -585,6 +617,8 @@ google + license + mit name google platforms @@ -609,6 +643,8 @@ google-perftools + license + bsd license_file LICENSES/google.txt name @@ -631,6 +667,8 @@ google_breakpad + license + bsd license_file LICENSES/google_breakpad.txt name @@ -677,6 +715,8 @@ googlemock + license + bsd license_file LICENSES/googlemock.txt name @@ -723,6 +763,8 @@ gstreamer + license + lgpl license_file LICENSES/gstreamer.txt name @@ -745,6 +787,8 @@ gtk-atk-pango-glib + license + lgpl license_file LICENSES/gtk.txt name @@ -779,6 +823,8 @@ jpeglib + license + jpeglib license_file LICENSES/jpeglib.txt name @@ -825,6 +871,8 @@ jsoncpp + license + jsoncpp license_file LICENSES/jsoncpp.txt name @@ -871,6 +919,8 @@ kdu + license + kdu license_file LICENSES/kdu.txt name @@ -917,6 +967,8 @@ libpng + license + libpng license_file LICENSES/libpng.txt name @@ -963,6 +1015,8 @@ libuuid + license + lgpl license_file LICENSES/libuuid.txt name @@ -985,6 +1039,8 @@ libxml + license + mit license_file LICENSES/libxml.txt name @@ -1007,6 +1063,8 @@ llqtwebkit + license + lgpl license_file LICENSES/llqtwebkit.txt name @@ -1053,6 +1111,8 @@ mesa + license + mesa license_file LICENSES/mesa.txt name @@ -1087,6 +1147,8 @@ ndofdev + license + linden license_file LICENSES/ndofdev.txt name @@ -1133,6 +1195,8 @@ ogg-vorbis + license + ogg-vorbis license_file LICENSES/ogg.txt name @@ -1179,6 +1243,8 @@ openSSL + license + openSSL license_file LICENSES/openSSL.txt name @@ -1225,6 +1291,8 @@ openal_soft + license + lgpl license_file LICENSES/OPENAL.txt name @@ -1251,6 +1319,8 @@ openjpeg + license + openjpeg license_file LICENSES/openjpeg.txt name @@ -1297,6 +1367,8 @@ pth + license + lgpl license_file LICENSES/pth.txt name @@ -1319,6 +1391,8 @@ quicktime + license + quicktime license_file LICENSES/quicktime.txt name @@ -1341,6 +1415,8 @@ slvoice + license + vivox license_file LICENSES/slvoice.txt name @@ -1387,6 +1463,8 @@ tut + license + bsd license_file LICENSES/tut.txt name @@ -1409,6 +1487,8 @@ xmlrpc-epi + license + xmlrpc-epi license_file LICENSES/xmlrpc.txt name @@ -1455,6 +1535,8 @@ zlib + license + zlib license_file LICENSES/zlib.txt name -- cgit v1.3 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