Merge viewer-quickgraphics
Ansariel
commit
3192fe832f
122
BuildParams
122
BuildParams
|
|
@ -4,7 +4,7 @@
|
|||
# https://wiki.secondlife.com/wiki/Automated_Build_System
|
||||
|
||||
|
||||
# Global setting for now...
|
||||
# Global setting for now....
|
||||
Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
|
||||
CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
|
||||
Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
|
||||
|
|
@ -19,6 +19,8 @@ build_Linux_Debug = false
|
|||
build_Darwin_Debug = false
|
||||
build_Debug = false
|
||||
|
||||
# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
|
||||
build_Linux_Doxygen = true
|
||||
|
||||
# Update Public Inworld Build Status Indicators (setting should mirror "public_build")
|
||||
email_status_this_is_os = true
|
||||
|
|
@ -77,121 +79,9 @@ additional_packages = "EDU"
|
|||
EDU_sourceid = ""
|
||||
EDU_viewer_channel_suffix = "edu"
|
||||
|
||||
# Notifications - to configure email notices, add a setting like this:
|
||||
# <username>_<reponame>.email = <email-address>
|
||||
|
||||
# ========================================
|
||||
# mesh-development
|
||||
# ========================================
|
||||
mesh-development.viewer_channel = "Project Viewer - Mesh"
|
||||
mesh-development.viewer_grid = aditi
|
||||
mesh-development.build_debug_release_separately = true
|
||||
mesh-development.build_CYGWIN_Debug = false
|
||||
mesh-development.build_viewer_update_version_manager = false
|
||||
|
||||
# ========================================
|
||||
# mesh-development-release-1-candidate
|
||||
# ========================================
|
||||
mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh"
|
||||
mesh-development-release-1-candidate.viewer_grid = agni
|
||||
mesh-development-release-1-candidate.build_debug_release_separately = true
|
||||
mesh-development-release-1-candidate.build_CYGWIN_Debug = false
|
||||
mesh-development-release-1-candidate.build_viewer_update_version_manager = false
|
||||
|
||||
# ========================================
|
||||
# mesh-development-rc
|
||||
# ========================================
|
||||
mesh-development-rc.viewer_channel = "Project Viewer - Mesh"
|
||||
mesh-development-rc.viewer_grid = agni
|
||||
mesh-development-rc.build_debug_release_separately = true
|
||||
mesh-development-rc.build_CYGWIN_Debug = false
|
||||
mesh-development-rc.build_viewer_update_version_manager = false
|
||||
|
||||
# ========================================
|
||||
# mesh-asset-deprecation
|
||||
# ========================================
|
||||
mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation"
|
||||
mesh-asset-deprecation.viewer_grid = aditi
|
||||
mesh-asset-deprecation.build_debug_release_separately = true
|
||||
mesh-asset-deprecation.build_CYGWIN_Debug = false
|
||||
mesh-asset-deprecation.build_viewer_update_version_manager = false
|
||||
|
||||
# ========================================
|
||||
# viewer-mesh
|
||||
# ========================================
|
||||
|
||||
viewer-mesh.build_viewer = true
|
||||
viewer-mesh.build_server = false
|
||||
viewer-mesh.build_Linux = true
|
||||
viewer-mesh.build_hg_bundle = true
|
||||
viewer-mesh.build_viewer_update_version_manager = false
|
||||
viewer-mesh.build_Debug = false
|
||||
viewer-mesh.build_RelWithDebInfo = false
|
||||
viewer-mesh.viewer_channel = "Project Viewer - Mesh"
|
||||
viewer-mesh.viewer_grid = aditi
|
||||
viewer-mesh.email = shining@lists.lindenlab.com
|
||||
|
||||
# =================================================================
|
||||
# asset delivery 2010 projects
|
||||
# =================================================================
|
||||
viewer-asset-delivery.viewer_channel = "Second Life Development"
|
||||
viewer-asset-delivery.build_viewer_update_version_manager = false
|
||||
viewer-asset-delivery.email = monty@lindenlab.com
|
||||
viewer-asset-delivery.build_server = false
|
||||
viewer-asset-delivery.build_server_tests = false
|
||||
|
||||
viewer-asset-delivery-metrics.viewer_channel = "Second Life Development"
|
||||
viewer-asset-delivery-metrics.build_viewer_update_version_manager = false
|
||||
viewer-asset-delivery-metrics.email = monty@lindenlab.com
|
||||
viewer-asset-delivery-metrics.build_server = false
|
||||
viewer-asset-delivery-metrics.build_server_tests = false
|
||||
|
||||
# ========================================
|
||||
# Simon says
|
||||
# ========================================
|
||||
simon_viewer-dev-private.public_build = false
|
||||
simon_viewer-dev-private.email_status_this_is_os = false
|
||||
# Notifications - to configure email notices use the TeamCity parameter
|
||||
# setting screen for your project or build configuration to set the
|
||||
# environment variable 'email' to a space-separated list of email addresses
|
||||
|
||||
|
||||
# ========================================
|
||||
# Vir
|
||||
# ========================================
|
||||
vir-project-1.viewer_channel = "Second Life Release"
|
||||
|
||||
# ========================================
|
||||
# Merov
|
||||
# ========================================
|
||||
merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox"
|
||||
merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox"
|
||||
merov-viewer-maint-2287.build_viewer_update_version_manager = false
|
||||
merov-viewer-maint-2287.codeticket_add_context = false
|
||||
|
||||
# ========================================
|
||||
# THX-1138 / Runway projects
|
||||
# ========================================
|
||||
viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
|
||||
viewer-thx1138-runway-shared.viewer_grid = uma
|
||||
viewer-thx1138-runway-shared.build_debug_release_separately = true
|
||||
viewer-thx1138-runway-shared.build_CYGWIN_Debug = false
|
||||
viewer-thx1138-runway-shared.build_viewer_update_version_manager = false
|
||||
|
||||
viewer-thx1138.viewer_channel = "Project Viewer - THX-1138"
|
||||
viewer-thx1138.viewer_grid = uma
|
||||
viewer-thx1138.build_debug_release_separately = true
|
||||
viewer-thx1138.build_CYGWIN_Debug = false
|
||||
viewer-thx1138.build_viewer_update_version_manager = false
|
||||
|
||||
runway-merge.viewer_channel = "Project Viewer - Runway Merge"
|
||||
runway-merge.viewer_grid = agni
|
||||
runway-merge.build_debug_release_separately = true
|
||||
runway-merge.build_CYGWIN_Debug = false
|
||||
runway-merge.build_viewer_update_version_manager = false
|
||||
|
||||
runway.viewer_channel = "Project Viewer - Runway"
|
||||
runway.viewer_grid = agni
|
||||
runway.build_debug_release_separately = true
|
||||
runway.build_CYGWIN_Debug = false
|
||||
runway.build_viewer_update_version_manager = false
|
||||
# eof
|
||||
|
||||
|
||||
|
|
|
|||
155
autobuild.xml
155
autobuild.xml
|
|
@ -434,7 +434,7 @@
|
|||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>2.3.297450</string>
|
||||
<string>2.3.301371</string>
|
||||
</map>
|
||||
<key>curl</key>
|
||||
<map>
|
||||
|
|
@ -467,9 +467,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>ee6c089ee193e551040d610befc5d1c1</string>
|
||||
<string>de9e0c855ff6ee30c9e027a70bbef032</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Linux/installer/curl-7.38.0.297172-linux-297172.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/301717/arch/Linux/installer/curl-7.42.1.301717-linux-301717.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -479,16 +479,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>fdeca7cbc074a88d2701d74a31d21bd8</string>
|
||||
<string>98d15713de8c439b7f54cc14f2df07ac</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/CYGWIN/installer/curl-7.38.0.297172-windows-297172.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/301717/arch/CYGWIN/installer/curl-7.42.1.301717-windows-301717.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>7.38.0.297172</string>
|
||||
<string>7.42.1.301717</string>
|
||||
</map>
|
||||
<key>db</key>
|
||||
<map>
|
||||
|
|
@ -1039,9 +1039,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0bf69fbc829d964820b798a0494278c9</string>
|
||||
<string>e294e6ca721e271b4bae8046cfbc3c9b</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Linux/installer/google_breakpad-1413.298033-linux-298033.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298127/arch/Linux/installer/google_breakpad-1413.298127-linux-298127.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1245,9 +1245,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5c5b4820999ae9e398801d6a46f45897</string>
|
||||
<string>0d586709c1a2e4cf433390bbdd2498ed</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297312/arch/Darwin/installer/havok_source-2012.1-darwin-297312.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/Darwin/installer/havok_source-2012.1-darwin-301432.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -1257,9 +1257,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>6b0f41ddddfa60d8424d8a2e0bc2077d</string>
|
||||
<string>02c85c2c63c8d002b31382f866ca143b</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Linux/installer/havok_source-2012.1-linux-296959.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/Linux/installer/havok_source-2012.1-linux-301432.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1269,9 +1269,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>ab30ae74a665950d73ea559f019ff358</string>
|
||||
<string>ac8a27020182510fd404177e4a97b70f</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297566/arch/CYGWIN/installer/havok_source-2012.1-windows-297566.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/CYGWIN/installer/havok_source-2012.1-windows-301432.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
@ -1365,9 +1365,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5b3b5dbf0c82c1046482a74ce9e11c38</string>
|
||||
<string>910bf12e4b4635170e462b739887cda9</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297281/arch/Linux/installer/jsoncpp-0.5.0.297281-linux-297281.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297580/arch/Linux/installer/jsoncpp-0.5.0.297580-linux-297580.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1569,9 +1569,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>6dec32fc2527f8cafd616f9271ff3478</string>
|
||||
<string>744e22c5fcaaf3483a60e29f217daa9c</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Linux/installer/libpng-1.6.8.297051-linux-297051.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/301387/arch/Linux/installer/libpng-1.6.8.301387-linux-301387.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1581,16 +1581,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>09eb65e66e0230ab01e57e643647a4f1</string>
|
||||
<string>391158e9b5d92a8b69aeb7478144d2de</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297708/arch/CYGWIN/installer/libpng-1.6.8.297708-windows-297708.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/301387/arch/CYGWIN/installer/libpng-1.6.8.301387-windows-301387.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1.6.8.297708</string>
|
||||
<string>1.6.8.301387</string>
|
||||
</map>
|
||||
<key>libuuid</key>
|
||||
<map>
|
||||
|
|
@ -2521,11 +2521,12 @@
|
|||
<map>
|
||||
<key>RelWithDebInfo</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>cmake</string>
|
||||
<key>options</key>
|
||||
|
|
@ -2562,11 +2563,12 @@
|
|||
</map>
|
||||
<key>Release</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>cmake</string>
|
||||
<key>options</key>
|
||||
|
|
@ -2601,6 +2603,25 @@
|
|||
<key>name</key>
|
||||
<string>ReleaseOS</string>
|
||||
</map>
|
||||
<key>Doxygen</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>doxygen/Doxyfile</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>doxygen</string>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>cmake</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>Doxygen</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS</key>
|
||||
<map>
|
||||
|
|
@ -2696,6 +2717,28 @@
|
|||
<string>build-darwin-i386</string>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>Doxygen</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
|
||||
<string>-DWORD_SIZE:STRING=32</string>
|
||||
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
|
||||
<string>-DINSTALL_PROPRIETARY=TRUE</string>
|
||||
</array>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>Doxygen</string>
|
||||
</map>
|
||||
<key>RelWithDebInfo</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -2714,10 +2757,6 @@
|
|||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-G</string>
|
||||
|
|
@ -2774,10 +2813,6 @@
|
|||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-G</string>
|
||||
|
|
@ -2958,6 +2993,26 @@
|
|||
<string>build-linux-i686</string>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>Doxygen</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-G</string>
|
||||
<string>'Unix Makefiles'</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>Doxygen</string>
|
||||
</map>
|
||||
<key>RelWithDebInfo</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -2971,10 +3026,6 @@
|
|||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-G</string>
|
||||
|
|
@ -3023,10 +3074,6 @@
|
|||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
<key>arguments</key>
|
||||
<array>
|
||||
<string>../indra</string>
|
||||
</array>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-G</string>
|
||||
|
|
@ -3258,16 +3305,11 @@
|
|||
<string>SecondLife.sln</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>msbuild.exe</string>
|
||||
<string>devenv</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>/p:Configuration=RelWithDebInfo</string>
|
||||
<string>/p:Platform=Win32</string>
|
||||
<string>/t:Build</string>
|
||||
<string>/p:useenv=true</string>
|
||||
<string>/verbosity:minimal</string>
|
||||
<string>/toolsversion:4.0</string>
|
||||
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
|
||||
<string>/build</string>
|
||||
<string>"RelWithDebInfo|Win32"</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
|
|
@ -3344,16 +3386,11 @@
|
|||
<string>SecondLife.sln</string>
|
||||
</array>
|
||||
<key>command</key>
|
||||
<string>msbuild.exe</string>
|
||||
<string>devenv</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>/p:Configuration=Release</string>
|
||||
<string>/p:Platform=Win32</string>
|
||||
<string>/t:Build</string>
|
||||
<string>/p:useenv=true</string>
|
||||
<string>/verbosity:minimal</string>
|
||||
<string>/toolsversion:4.0</string>
|
||||
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
|
||||
<string>/build</string>
|
||||
<string>"Release|Win32"</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
|
|
|
|||
164
build.sh
164
build.sh
|
|
@ -1,10 +1,13 @@
|
|||
#!/bin/sh
|
||||
|
||||
# This is a the master build script - it is intended to be run by the Linden
|
||||
# Lab build farm
|
||||
# It is called by a wrapper script in the shared repository which sets up
|
||||
# the environment from the various BuildParams files and does all the build
|
||||
# result post-processing.
|
||||
# This is the custom build script for the viewer
|
||||
#
|
||||
# It must be run by the Linden Lab build farm shared buildscript because
|
||||
# it relies on the environment that sets up, functions it provides, and
|
||||
# the build result post-processing it does.
|
||||
#
|
||||
# The shared buildscript build.sh invokes this because it is named 'build.sh',
|
||||
# which is the default custom build script name in buildscripts/hg/BuildParams
|
||||
#
|
||||
# PLEASE NOTE:
|
||||
#
|
||||
|
|
@ -12,7 +15,6 @@
|
|||
# Cygwin can be tricky....
|
||||
# * The special style in which python is invoked is intentional to permit
|
||||
# use of a native python install on windows - which requires paths in DOS form
|
||||
# * This script relies heavily on parameters defined in BuildParams
|
||||
|
||||
check_for()
|
||||
{
|
||||
|
|
@ -94,14 +96,12 @@ installer_CYGWIN()
|
|||
pre_build()
|
||||
{
|
||||
local variant="$1"
|
||||
begin_section "Pre$variant"
|
||||
begin_section "Configure $variant"
|
||||
[ -n "$master_message_template_checkout" ] \
|
||||
&& [ -r "$master_message_template_checkout/message_template.msg" ] \
|
||||
&& template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
|
||||
|
||||
check_for "Confirm dictionaries are installed before 'autobuild configure'" ${build_dir}/packages/dictionaries
|
||||
|
||||
"$autobuild" configure -c $variant -- \
|
||||
"$autobuild" configure --quiet -c $variant -- \
|
||||
-DPACKAGE:BOOL=ON \
|
||||
-DRELEASE_CRASH_REPORTING:BOOL=ON \
|
||||
-DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
|
||||
|
|
@ -109,7 +109,7 @@ pre_build()
|
|||
-DLL_TESTS:BOOL="$run_tests" \
|
||||
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
|
||||
|
||||
end_section "Pre$variant"
|
||||
end_section "Configure $variant"
|
||||
}
|
||||
|
||||
package_llphysicsextensions_tpv()
|
||||
|
|
@ -119,12 +119,12 @@ package_llphysicsextensions_tpv()
|
|||
if [ "$variant" = "Release" ]
|
||||
then
|
||||
llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml
|
||||
"$autobuild" build --verbose --config-file $llpetpvcfg -c Tpv
|
||||
"$autobuild" build --quiet --config-file $llpetpvcfg -c Tpv
|
||||
|
||||
# capture the package file name for use in upload later...
|
||||
PKGTMP=`mktemp -t pgktpv.XXXXXX`
|
||||
trap "rm $PKGTMP* 2>/dev/null" 0
|
||||
"$autobuild" package --verbose --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
|
||||
"$autobuild" package --quiet --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
|
||||
tpv_status=$?
|
||||
if [ -r "${PKGTMP}" ]
|
||||
then
|
||||
|
|
@ -134,7 +134,7 @@ package_llphysicsextensions_tpv()
|
|||
echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
|
||||
fi
|
||||
else
|
||||
echo "Do not provide llphysicsextensions_tpv for $variant"
|
||||
record_event "Do not provide llphysicsextensions_tpv for $variant"
|
||||
llphysicsextensions_package=""
|
||||
fi
|
||||
end_section "PhysicsExtensions_TPV"
|
||||
|
|
@ -146,16 +146,15 @@ build()
|
|||
local variant="$1"
|
||||
if $build_viewer
|
||||
then
|
||||
begin_section "Viewer$variant"
|
||||
|
||||
"$autobuild" build --no-configure -c $variant
|
||||
"$autobuild" build --quiet --no-configure -c $variant
|
||||
build_ok=$?
|
||||
end_section "Viewer$variant"
|
||||
|
||||
# Run build extensions
|
||||
if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]; then
|
||||
for extension in ${build_dir}/packages/build-extensions/*.sh; do
|
||||
begin_section "Extension $extension"
|
||||
. $extension
|
||||
end_section "Extension $extension"
|
||||
if [ $build_ok -ne 0 ]; then
|
||||
break
|
||||
fi
|
||||
|
|
@ -174,28 +173,6 @@ build()
|
|||
fi
|
||||
}
|
||||
|
||||
# This is called from the branch independent script upon completion of all platform builds.
|
||||
build_docs()
|
||||
{
|
||||
begin_section "Building Documentation"
|
||||
begin_section "Autobuild metadata"
|
||||
if [ -r "$build_dir/autobuild-package.xml" ]
|
||||
then
|
||||
upload_item docs "$build_dir/autobuild-package.xml" text/xml
|
||||
else
|
||||
record_event "no metadata at '$build_dir/autobuild-package.xml'"
|
||||
fi
|
||||
end_section "Autobuild metadata"
|
||||
if [ "$arch" != "Linux" ]
|
||||
then
|
||||
record_dependencies_graph # defined in build.sh
|
||||
else
|
||||
echo "TBD - skipping linux graph (probable python version dependency)" 1>&2
|
||||
fi
|
||||
end_section "Building Documentation"
|
||||
}
|
||||
|
||||
|
||||
# Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there
|
||||
if [ "x$arch" = x ]
|
||||
then
|
||||
|
|
@ -207,7 +184,7 @@ then
|
|||
cat <<EOF
|
||||
This script, if called in a development environment, requires that the branch
|
||||
independent build script repository be checked out next to this repository.
|
||||
This repository is located at http://hg.lindenlab.com/parabuild/buildscripts
|
||||
This repository is located at http://bitbucket.org/lindenlabinternal/sl-buildscripts
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -246,70 +223,69 @@ do
|
|||
# Only the last built arch is available for upload
|
||||
last_built_variant="$variant"
|
||||
|
||||
begin_section "Do$variant"
|
||||
build_dir=`build_dir_$arch $variant`
|
||||
build_dir_stubs="$build_dir/win_setup/$variant"
|
||||
|
||||
begin_section "PreClean"
|
||||
begin_section "Initialize $variant Build Directory"
|
||||
rm -rf "$build_dir"
|
||||
end_section "PreClean"
|
||||
|
||||
mkdir -p "$build_dir"
|
||||
mkdir -p "$build_dir/tmp"
|
||||
end_section "Initialize $variant Build Directory"
|
||||
|
||||
if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
|
||||
if pre_build "$variant" "$build_dir"
|
||||
then
|
||||
if $build_link_parallel
|
||||
then
|
||||
begin_section BuildParallel
|
||||
( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) &
|
||||
build_processes="$build_processes $!"
|
||||
end_section BuildParallel
|
||||
else
|
||||
begin_section "Build$variant"
|
||||
begin_section "Build $variant"
|
||||
build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
|
||||
if `cat "$build_dir/build_ok"`
|
||||
then
|
||||
echo so far so good.
|
||||
case "$variant" in
|
||||
Release)
|
||||
if [ -r "$build_dir/autobuild-package.xml" ]
|
||||
then
|
||||
begin_section "Autobuild metadata"
|
||||
upload_item docs "$build_dir/autobuild-package.xml" text/xml
|
||||
if [ "$arch" != "Linux" ]
|
||||
then
|
||||
record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
|
||||
else
|
||||
record_event "TBD - no dependency graph for linux (probable python version dependency)" 1>&2
|
||||
fi
|
||||
end_section "Autobuild metadata"
|
||||
else
|
||||
record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'"
|
||||
fi
|
||||
;;
|
||||
Doxygen)
|
||||
if [ -r "$build_dir/doxygen_warnings.log" ]
|
||||
then
|
||||
record_event "Doxygen warnings generated; see doxygen_warnings.log"
|
||||
upload_item log "$build_dir/doxygen_warnings.log" text/plain
|
||||
fi
|
||||
if [ -d "$build_dir/doxygen/html" ]
|
||||
then
|
||||
tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html"
|
||||
upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
record_failure "Build of \"$variant\" failed."
|
||||
record_failure "Build of \"$variant\" failed."
|
||||
fi
|
||||
end_section "Build$variant"
|
||||
fi
|
||||
end_section "Build $variant"
|
||||
else
|
||||
record_failure "Build Prep for \"$variant\" failed."
|
||||
record_event "configure for $variant failed: build skipped"
|
||||
fi
|
||||
|
||||
if ! $succeeded
|
||||
then
|
||||
record_event "remaining variants skipped due to $variant failure"
|
||||
break
|
||||
fi
|
||||
end_section "Do$variant"
|
||||
done
|
||||
|
||||
build_docs
|
||||
|
||||
# If we are building variants in parallel, wait, then collect results.
|
||||
# This requires that the build dirs are variant specific
|
||||
if $build_link_parallel && [ x"$build_processes" != x ]
|
||||
then
|
||||
begin_section WaitParallel
|
||||
wait $build_processes
|
||||
for variant in $variants
|
||||
do
|
||||
eval '$build_'"$variant" || continue
|
||||
eval '$build_'"$arch"_"$variant" || continue
|
||||
|
||||
begin_section "Build$variant"
|
||||
build_dir=`build_dir_$arch $variant`
|
||||
build_dir_stubs="$build_dir/win_setup/$variant"
|
||||
tee -a $build_log < "$build_dir/build.log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
|
||||
if `cat "$build_dir/build_ok"`
|
||||
then
|
||||
echo so far so good.
|
||||
else
|
||||
record_failure "Parallel build of \"$variant\" failed."
|
||||
fi
|
||||
end_section "Build$variant"
|
||||
done
|
||||
end_section WaitParallel
|
||||
fi
|
||||
|
||||
# build debian package
|
||||
if [ "$arch" == "Linux" ]
|
||||
then
|
||||
|
|
@ -389,7 +365,7 @@ EOF
|
|||
end_section "Upload Debian Repository"
|
||||
|
||||
else
|
||||
echo skipping debian build
|
||||
echo debian build not enabled
|
||||
fi
|
||||
else
|
||||
echo skipping debian build due to failed build.
|
||||
|
|
@ -447,29 +423,27 @@ then
|
|||
then
|
||||
llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
|
||||
upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream
|
||||
else
|
||||
echo "No llphysicsextensions_package"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Skipping mapfile for $last_built_variant"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Run upload extensions
|
||||
if [ -d ${build_dir}/packages/upload-extensions ]; then
|
||||
for extension in ${build_dir}/packages/upload-extensions/*.sh; do
|
||||
begin_section "Upload Extension $extension"
|
||||
. $extension
|
||||
end_section "Upload Extension $extension"
|
||||
done
|
||||
fi
|
||||
|
||||
# Upload stub installers
|
||||
upload_stub_installers "$build_dir_stubs"
|
||||
fi
|
||||
end_section Upload Installer
|
||||
else
|
||||
echo skipping upload of installer
|
||||
fi
|
||||
|
||||
|
||||
else
|
||||
echo skipping upload of installer due to failed build.
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
# Linden packages install in opt/linden
|
||||
secondlife-viewer: dir-or-file-in-opt
|
||||
secondlife-viewer: section-is-dh_make-template
|
||||
secondlife-viewer: binary-without-manpage
|
||||
secondlife-viewer: maintainer-script-empty postrm
|
||||
secondlife-viewer: maintainer-script-empty preinst
|
||||
secondlife-viewer: maintainer-script-empty prerm
|
||||
secondlife-viewer: unstripped-binary-or-object
|
||||
|
|
@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/.
|
|||
Notwithstanding the foregoing, all of Linden Lab's trademarks, including
|
||||
but not limited to the Second Life brand name and Second Life Eye-in-Hand
|
||||
logo, are subject to our trademark policy at
|
||||
http://secondlife.com/corporate/trademark/.
|
||||
http://secondlife.com/corporate/brand/trademark/.
|
||||
|
||||
If you distribute any copies or adaptations of the Second Life viewer
|
||||
artwork or any other works in these files, you must include this Notice
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1
|
|||
("LGPL"), unless you have obtained a separate licensing agreement
|
||||
("Other License"), formally executed by you and Linden Lab. Terms of
|
||||
the GPL can be found in doc/LGPL-license.txt in this distribution, or
|
||||
online at http://secondlife.com/developers/opensource/lgplv2_1
|
||||
online at
|
||||
|
||||
https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1
|
||||
|
||||
By copying, modifying or distributing this software, you acknowledge
|
||||
that you have read and understood your obligations described above,
|
||||
|
|
|
|||
|
|
@ -322,6 +322,8 @@ Cinder Roxley
|
|||
BUG-8786
|
||||
OPEN-185
|
||||
OPEN-282
|
||||
OPEN-292
|
||||
OPEN-297
|
||||
STORM-1703
|
||||
STORM-1948
|
||||
STORM-1831
|
||||
|
|
|
|||
|
|
@ -64,8 +64,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
|
|||
add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
|
||||
add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
|
||||
|
||||
# <FS:CR> Removed -> add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
|
||||
|
||||
if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
|
||||
add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
|
||||
endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
|
||||
|
|
@ -112,8 +110,11 @@ endif (LINUX)
|
|||
add_subdirectory(${VIEWER_PREFIX}newview)
|
||||
add_dependencies(viewer firestorm-bin)
|
||||
|
||||
add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL)
|
||||
|
||||
if (LL_TESTS)
|
||||
# Define after the custom targets are created so
|
||||
# individual apps can add themselves as dependencies
|
||||
add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
|
||||
endif (LL_TESTS)
|
||||
|
||||
|
|
|
|||
|
|
@ -60,5 +60,6 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
|
|||
"LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
|
||||
"LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
|
||||
"LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
|
||||
"LLBUILD_CONFIG=\"${CMAKE_BUILD_TYPE}\""
|
||||
)
|
||||
endif (NOT DEFINED VIEWER_SHORT_VERSION)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ set(cmake_SOURCE_FILES
|
|||
LLVFS.cmake
|
||||
LLWindow.cmake
|
||||
LLXML.cmake
|
||||
# <FS:CR> We'll be fine without you -> LScript.cmake
|
||||
Linking.cmake
|
||||
MediaPluginBase.cmake
|
||||
NDOF.cmake
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
# -*- cmake -*-
|
||||
|
||||
set(LSCRIPT_INCLUDE_DIRS
|
||||
${LIBS_OPEN_DIR}/lscript
|
||||
${LIBS_OPEN_DIR}/lscript/lscript_compile
|
||||
${LIBS_OPEN_DIR}/lscript/lscript_execute
|
||||
${LIBS_OPEN_DIR}/lscript/lscript_execute_mono
|
||||
)
|
||||
|
||||
set(LSCRIPT_LIBRARIES
|
||||
lscript_compile
|
||||
lscript_execute
|
||||
lscript_library
|
||||
)
|
||||
|
||||
set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue