Skip to content
Snippets Groups Projects
Commit a04a706c authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

merge

parents 0f6a4a33 0ebcb7e3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 163 additions and 163 deletions
.hgignore 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
.hgtags 100644 → 100755
+ 15
− 2
View file @ a04a706c
...@@ -434,12 +434,25 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305 ...@@ -434,12 +434,25 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305
902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306 902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306
5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7 5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7
adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release
0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1
1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310 1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310
0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1
20cdf370f5c8be6193bef6fb3a81cc3f81275191 3.5.1-beta1 20cdf370f5c8be6193bef6fb3a81cc3f81275191 3.5.1-beta1
2319904200de367646b9a9442239a38d52c1eeb5 DRTVWR-313 2319904200de367646b9a9442239a38d52c1eeb5 DRTVWR-313
9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2 9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2
4b7fa963b80e2056ab648f83a4d61310b3cedb3d DRTVWR-314 4b7fa963b80e2056ab648f83a4d61310b3cedb3d DRTVWR-314
65ae89aeb7ea674a555e439e963f17949322ac94 3.5.1-beta3 65ae89aeb7ea674a555e439e963f17949322ac94 3.5.1-beta3
13149a524874b608aeb76325b35faff113a5ea53 3.5.1-release 13149a524874b608aeb76325b35faff113a5ea53 3.5.1-release
78a8fe6abf331944d6b6bb1ce1024a6bc08141f4 DRTVWR-298
50ccc12f38c3c99f03b374e32429cb043b73e2a6 DRTVWR-294
c2b1066514308dff1eeb91162392dfe08bf1c0fe DRTVWR-309
e6b8a92acffd693cd1459e4212e3dff1050acf67 DRTVWR-278
106f19cc011aafdfc9a6d12b641fe8db6e9735a7 3.5.2-beta1
509b97acc4ca1f2644197f1b555773ac0bb6838c 3.5.2-beta2
6cb3689d89c13876ce8fa8faefa7b05e4279502d DRTVWR-316
cfc3e650e5b2063288e7b832e9c9f521bbdacc92 DRTVWR-315
e6e35501f1fea252ef83080adcf30c3cb7c2f75c DRTVWR-299
b6a4ac8f1916ede76e8a023e1cf35c045d0ac707 3.5.2-beta3
a314f1c94374ab1f6633dd2983f7090a68663eb2 3.5.2-beta4
1cfa86d604909dfdb8b372069ff61f9afaa2aac1 MAINT-2647
895628bb5e162410cfdf4bca58f0a57d22ccfcde 3.5.2-beta5
9013c07bfe1c51107233f1924dccdcc5057dd909 3.5.2-beta6
9b1b6f33aa5394b27bb652b31b5cb81ef6060370 3.5.2-release
BuildParams 100644 → 100755
+ 19
− 37
View file @ a04a706c
...@@ -26,50 +26,44 @@ codeticket_since = 3.3.0-release ...@@ -26,50 +26,44 @@ codeticket_since = 3.3.0-release
Linux.gcc_version = /usr/bin/gcc-4.6 Linux.gcc_version = /usr/bin/gcc-4.6
Linux.cxx_version = /usr/bin/g++-4.6 Linux.cxx_version = /usr/bin/g++-4.6
# ======================================== ################################################################
# Viewer Development #### Examples of how to set the viewer_channel ####
# ======================================== #
# To build a Release or Release candidate in build bingo:
# bingo.viewer_channel = "Second Life Release"
#
# To build a Beta for the 'Bingo' project in build bingo:
# bingo.viewer_channel = "Second Life Beta Bingo"
#
# To build a Project viewer for the 'Bingo' project in build bingo:
# bingo.viewer_channel = "Second Life Project Bingo"
#
# If left unset, viewer_channel defaults to 'Second Life Test',
# which is appropriate for individual developer builds.
#
# All Linden Lab builds (and only Linden Lab builds)
# should use a viewer_channel that begins with "Second Life"
################################################################
viewer_channel = "Second Life Test"
# Report changes since... # Report changes since...
viewer-development.show_changes_since = last_sprint viewer-development.show_changes_since = last_sprint
# Build Settings # Build Settings
viewer-development_coverity.coverity_product = viewer
viewer-development_coverity.run_tests = false
viewer-development.build_debug_release_separately = true viewer-development.build_debug_release_separately = true
# Notifications - to configure email notices, add a setting like this: # Notifications - to configure email notices, add a setting like this:
# <username>_<reponame>.email = <email-address> # <username>_<reponame>.email = <email-address>
# =================================================================
# Canonical viewer integration builds - Oz Linden
# =================================================================
integration_viewer-development.viewer_channel = "Second Life Development"
integration_viewer-development.login_channel = "Second Life Development"
integration_viewer-development.build_viewer_update_version_manager = false
integration_viewer-development.email = viewer-development-builds@lists.secondlife.com
integration_viewer-development.build_enforce_coding_policy = false
integration_viewer-development.codeticket_add_context = false
viewer-beta.viewer_channel = "Second Life Beta Viewer"
viewer-beta.login_channel = "Second Life Beta Viewer"
viewer-beta.build_debug_release_separately = true
viewer-beta.build_viewer_update_version_manager = true
viewer-beta.codeticket_add_context = false
viewer-release.viewer_channel = "Second Life Release" viewer-release.viewer_channel = "Second Life Release"
viewer-release.login_channel = "Second Life Release"
viewer-release.build_debug_release_separately = true viewer-release.build_debug_release_separately = true
viewer-release.build_viewer_update_version_manager = true viewer-release.build_viewer_update_version_manager = true
viewer-release.codeticket_add_context = false viewer-release.codeticket_add_context = false
# ======================================== # ========================================
# mesh-development # mesh-development
# ======================================== # ========================================
mesh-development.viewer_channel = "Project Viewer - Mesh" mesh-development.viewer_channel = "Project Viewer - Mesh"
mesh-development.login_channel = "Project Viewer - Mesh"
mesh-development.viewer_grid = aditi mesh-development.viewer_grid = aditi
mesh-development.build_debug_release_separately = true mesh-development.build_debug_release_separately = true
mesh-development.build_CYGWIN_Debug = false mesh-development.build_CYGWIN_Debug = false
...@@ -79,7 +73,6 @@ mesh-development.build_viewer_update_version_manager = false ...@@ -79,7 +73,6 @@ mesh-development.build_viewer_update_version_manager = false
# mesh-development-release-1-candidate # mesh-development-release-1-candidate
# ======================================== # ========================================
mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh" mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh"
mesh-development-release-1-candidate.login_channel = "Project Viewer - Mesh"
mesh-development-release-1-candidate.viewer_grid = agni mesh-development-release-1-candidate.viewer_grid = agni
mesh-development-release-1-candidate.build_debug_release_separately = true 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_CYGWIN_Debug = false
...@@ -89,7 +82,6 @@ mesh-development-release-1-candidate.build_viewer_update_version_manager = false ...@@ -89,7 +82,6 @@ mesh-development-release-1-candidate.build_viewer_update_version_manager = false
# mesh-development-rc # mesh-development-rc
# ======================================== # ========================================
mesh-development-rc.viewer_channel = "Project Viewer - Mesh" mesh-development-rc.viewer_channel = "Project Viewer - Mesh"
mesh-development-rc.login_channel = "Project Viewer - Mesh"
mesh-development-rc.viewer_grid = agni mesh-development-rc.viewer_grid = agni
mesh-development-rc.build_debug_release_separately = true mesh-development-rc.build_debug_release_separately = true
mesh-development-rc.build_CYGWIN_Debug = false mesh-development-rc.build_CYGWIN_Debug = false
...@@ -99,7 +91,6 @@ mesh-development-rc.build_viewer_update_version_manager = false ...@@ -99,7 +91,6 @@ mesh-development-rc.build_viewer_update_version_manager = false
# mesh-asset-deprecation # mesh-asset-deprecation
# ======================================== # ========================================
mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation" mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation"
mesh-asset-deprecation.login_channel = "Project Viewer - Mesh Asset Deprecation"
mesh-asset-deprecation.viewer_grid = aditi mesh-asset-deprecation.viewer_grid = aditi
mesh-asset-deprecation.build_debug_release_separately = true mesh-asset-deprecation.build_debug_release_separately = true
mesh-asset-deprecation.build_CYGWIN_Debug = false mesh-asset-deprecation.build_CYGWIN_Debug = false
...@@ -117,7 +108,6 @@ viewer-mesh.build_viewer_update_version_manager = false ...@@ -117,7 +108,6 @@ viewer-mesh.build_viewer_update_version_manager = false
viewer-mesh.build_Debug = false viewer-mesh.build_Debug = false
viewer-mesh.build_RelWithDebInfo = false viewer-mesh.build_RelWithDebInfo = false
viewer-mesh.viewer_channel = "Project Viewer - Mesh" viewer-mesh.viewer_channel = "Project Viewer - Mesh"
viewer-mesh.login_channel = "Project Viewer - Mesh"
viewer-mesh.viewer_grid = aditi viewer-mesh.viewer_grid = aditi
viewer-mesh.email = shining@lists.lindenlab.com viewer-mesh.email = shining@lists.lindenlab.com
...@@ -126,7 +116,6 @@ viewer-mesh.email = shining@lists.lindenlab.com ...@@ -126,7 +116,6 @@ viewer-mesh.email = shining@lists.lindenlab.com
# ======================================== # ========================================
viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding" viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding"
viewer-pathfinding.login_channel = "Project Viewer - Pathfinding"
viewer-pathfinding.viewer_grid = agni viewer-pathfinding.viewer_grid = agni
viewer-pathfinding.build_debug_release_separately = true viewer-pathfinding.build_debug_release_separately = true
viewer-pathfinding.build_CYGWIN_Debug = false viewer-pathfinding.build_CYGWIN_Debug = false
...@@ -148,14 +137,12 @@ viewer-chui.build_viewer_update_version_manager = false ...@@ -148,14 +137,12 @@ viewer-chui.build_viewer_update_version_manager = false
# asset delivery 2010 projects # asset delivery 2010 projects
# ================================================================= # =================================================================
viewer-asset-delivery.viewer_channel = "Second Life Development" viewer-asset-delivery.viewer_channel = "Second Life Development"
viewer-asset-delivery.login_channel = "Second Life Development"
viewer-asset-delivery.build_viewer_update_version_manager = false viewer-asset-delivery.build_viewer_update_version_manager = false
viewer-asset-delivery.email = monty@lindenlab.com viewer-asset-delivery.email = monty@lindenlab.com
viewer-asset-delivery.build_server = false viewer-asset-delivery.build_server = false
viewer-asset-delivery.build_server_tests = false viewer-asset-delivery.build_server_tests = false
viewer-asset-delivery-metrics.viewer_channel = "Second Life Development" viewer-asset-delivery-metrics.viewer_channel = "Second Life Development"
viewer-asset-delivery-metrics.login_channel = "Second Life Development"
viewer-asset-delivery-metrics.build_viewer_update_version_manager = false viewer-asset-delivery-metrics.build_viewer_update_version_manager = false
viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.email = monty@lindenlab.com
viewer-asset-delivery-metrics.build_server = false viewer-asset-delivery-metrics.build_server = false
...@@ -172,34 +159,29 @@ simon_viewer-dev-private.email_status_this_is_os = false ...@@ -172,34 +159,29 @@ simon_viewer-dev-private.email_status_this_is_os = false
# Vir # Vir
# ======================================== # ========================================
vir-project-1.viewer_channel = "Second Life Release" vir-project-1.viewer_channel = "Second Life Release"
vir-project-1.login_channel = "Second Life Release"
# ======================================== # ========================================
# THX-1138 / Runway projects # THX-1138 / Runway projects
# ======================================== # ========================================
viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway" viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
viewer-thx1138-runway-shared.login_channel = "Project Viewer - THX-1138 Runway"
viewer-thx1138-runway-shared.viewer_grid = uma viewer-thx1138-runway-shared.viewer_grid = uma
viewer-thx1138-runway-shared.build_debug_release_separately = true viewer-thx1138-runway-shared.build_debug_release_separately = true
viewer-thx1138-runway-shared.build_CYGWIN_Debug = false viewer-thx1138-runway-shared.build_CYGWIN_Debug = false
viewer-thx1138-runway-shared.build_viewer_update_version_manager = false viewer-thx1138-runway-shared.build_viewer_update_version_manager = false
viewer-thx1138.viewer_channel = "Project Viewer - THX-1138" viewer-thx1138.viewer_channel = "Project Viewer - THX-1138"
viewer-thx1138.login_channel = "Project Viewer - THX-1138"
viewer-thx1138.viewer_grid = uma viewer-thx1138.viewer_grid = uma
viewer-thx1138.build_debug_release_separately = true viewer-thx1138.build_debug_release_separately = true
viewer-thx1138.build_CYGWIN_Debug = false viewer-thx1138.build_CYGWIN_Debug = false
viewer-thx1138.build_viewer_update_version_manager = false viewer-thx1138.build_viewer_update_version_manager = false
runway-merge.viewer_channel = "Project Viewer - Runway Merge" runway-merge.viewer_channel = "Project Viewer - Runway Merge"
runway-merge.login_channel = "Project Viewer - Runway Merge"
runway-merge.viewer_grid = agni runway-merge.viewer_grid = agni
runway-merge.build_debug_release_separately = true runway-merge.build_debug_release_separately = true
runway-merge.build_CYGWIN_Debug = false runway-merge.build_CYGWIN_Debug = false
runway-merge.build_viewer_update_version_manager = false runway-merge.build_viewer_update_version_manager = false
runway.viewer_channel = "Project Viewer - Runway" runway.viewer_channel = "Project Viewer - Runway"
runway.login_channel = "Project Viewer - Runway"
runway.viewer_grid = agni runway.viewer_grid = agni
runway.build_debug_release_separately = true runway.build_debug_release_separately = true
runway.build_CYGWIN_Debug = false runway.build_CYGWIN_Debug = false
......
autobuild.xml 100644 → 100755
+ 31
− 33
View file @ a04a706c
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>ac37d0038c91b0672fa31a02731f0eac</string> <string>06dd7af75e1eb179aed54fd58d8688af</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/268347/arch/Darwin/installer/boost-1.52.0-darwin-20121218.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/270698/arch/Darwin/installer/boost-1.52.0-darwin-20130221.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>146ed8a8c2ef8ab3f0a6c4f214fc5c22</string> <string>50c8b50b7cced52cc5656fb44e9b12cf</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/268347/arch/Linux/installer/boost-1.52.0-linux-20121218.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/270698/arch/Linux/installer/boost-1.52.0-linux-20130222.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -210,9 +210,9 @@ ...@@ -210,9 +210,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>3ea60f17d986b7e8a3351298734bdca4</string> <string>742fc9675b033df7f9c6f215ff250f6c</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/268347/arch/CYGWIN/installer/boost-1.52.0-windows-20121218.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/270698/arch/CYGWIN/installer/boost-1.52.0-windows-20130221.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -483,14 +483,14 @@ ...@@ -483,14 +483,14 @@
</map> </map>
</map> </map>
</map> </map>
<key>fmod</key> <key>fmodex</key>
<map> <map>
<key>license</key> <key>license</key>
<string>fmod</string> <string>fmodex</string>
<key>license_file</key> <key>license_file</key>
<string>LICENSES/fmod.txt</string> <string>LICENSES/fmodex.txt</string>
<key>name</key> <key>name</key>
<string>fmod</string> <string>fmodex</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>darwin</key> <key>darwin</key>
...@@ -498,9 +498,9 @@ ...@@ -498,9 +498,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>61ead113e6479452e6b690c84b4e9d30</string> <string>10352aab979c333a52dbad21b6e6fba9</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Darwin/installer/fmod-3.75-darwin-20110222.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274403/arch/Darwin/installer/fmodex-4.44-darwin-20130419.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -510,9 +510,9 @@ ...@@ -510,9 +510,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>0c61d643db54d2e5999be8254569d8b3</string> <string>79e45527aa9fb90b813599dff5ce01a7</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Linux/installer/fmod-3.75-linux-20110223.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274378/arch/Linux/installer/fmodex-4.44-linux-20130419.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -522,9 +522,9 @@ ...@@ -522,9 +522,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>d9a9a6ad86895353bcd63374a4c1a91d</string> <string>0980cdf98a322a780ba739e324d0b955</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/CYGWIN/installer/fmod-3.75-windows-20110222.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274401/arch/CYGWIN/installer/fmodex-4.44-windows-20130419.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -606,9 +606,9 @@ ...@@ -606,9 +606,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>ca95bbdabd2bed612af79a3704fdbe79</string> <string>bd6f84f9fb3c2e68850676d06935373f</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/265843/arch/Linux/installer/freetype-2.3.9-linux-20121013.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/271684/arch/Linux/installer/freetype-2.4.4-linux-20130312.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -747,6 +747,7 @@ ...@@ -747,6 +747,7 @@
</map> </map>
</map> </map>
</map> </map>
<key>google_breakpad</key> <key>google_breakpad</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -761,10 +762,10 @@ ...@@ -761,10 +762,10 @@
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>21babc394dbf8572830f2e85adec7b9f</string> <string>aff5566e04003de0383941981198e04e</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20110202.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -773,10 +774,10 @@ ...@@ -773,10 +774,10 @@
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>204b02a9480c411232255798839431a2</string> <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110311.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -786,9 +787,9 @@ ...@@ -786,9 +787,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>627c51136e14e64c5d39933f3abd3bdf</string> <string>d812a6dfcabe6528198a3191068dac09</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20110218.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -834,9 +835,9 @@ ...@@ -834,9 +835,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>212701468920519f3989677cea9ca4f1</string> <string>98994d5b0b4b3d43be22aa6a5c36e6fa</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gmock-1.5.0-windows-20110224.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock-graham/rev/272961/arch/CYGWIN/installer/gmock-1.6.0-windows-20130327.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -2531,7 +2532,6 @@ ...@@ -2531,7 +2532,6 @@
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2620,7 +2620,6 @@ ...@@ -2620,7 +2620,6 @@
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2708,7 +2707,6 @@ ...@@ -2708,7 +2707,6 @@
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
......
build.sh
+ 1
− 38
View file @ a04a706c
...@@ -65,19 +65,16 @@ pre_build() ...@@ -65,19 +65,16 @@ pre_build()
&& [ -r "$master_message_template_checkout/message_template.msg" ] \ && [ -r "$master_message_template_checkout/message_template.msg" ] \
&& template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$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 "Before 'autobuild configure'" ${build_dir}/packages/dictionaries check_for "Confirm dictionaries are installed before 'autobuild configure'" ${build_dir}/packages/dictionaries
"$AUTOBUILD" configure -c $variant -- \ "$AUTOBUILD" configure -c $variant -- \
-DPACKAGE:BOOL=ON \ -DPACKAGE:BOOL=ON \
-DRELEASE_CRASH_REPORTING:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \
-DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
-DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \
-DGRID:STRING="\"$viewer_grid\"" \ -DGRID:STRING="\"$viewer_grid\"" \
-DLL_TESTS:BOOL="$run_tests" \ -DLL_TESTS:BOOL="$run_tests" \
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
end_section "Pre$variant" end_section "Pre$variant"
} }
...@@ -110,7 +107,6 @@ build() ...@@ -110,7 +107,6 @@ build()
if $build_viewer if $build_viewer
then then
begin_section "Viewer$variant" begin_section "Viewer$variant"
check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries
"$AUTOBUILD" build --no-configure -c $variant "$AUTOBUILD" build --no-configure -c $variant
build_ok=$? build_ok=$?
...@@ -135,8 +131,6 @@ build() ...@@ -135,8 +131,6 @@ build()
else else
echo false >"$build_dir"/build_ok echo false >"$build_dir"/build_ok
fi fi
check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
fi fi
} }
...@@ -171,21 +165,6 @@ fi ...@@ -171,21 +165,6 @@ fi
# Check to see if we're skipping the platform # Check to see if we're skipping the platform
eval '$build_'"$arch" || pass eval '$build_'"$arch" || pass
# Run the version number update script
# File no longer exists in code-sep branch, so let's make sure it exists in order to use it.
if test -f scripts/update_version_files.py ; then
begin_section UpdateVer
eval $(python scripts/update_version_files.py \
--channel="$viewer_channel" \
--server_channel="$server_channel" \
--revision=$revision \
--verbose \
| sed -n -e "s,Setting viewer channel/version: '\([^']*\)' / '\([^']*\)',VIEWER_CHANNEL='\1';VIEWER_VERSION='\2',p")\
|| fail update_version_files.py
echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json
end_section UpdateVer
fi
if [ -z "$AUTOBUILD" ] if [ -z "$AUTOBUILD" ]
then then
export autobuild_dir="$here/../../../autobuild/bin/" export autobuild_dir="$here/../../../autobuild/bin/"
...@@ -209,27 +188,11 @@ then ...@@ -209,27 +188,11 @@ then
fi fi
# load autbuild provided shell functions and variables # load autbuild provided shell functions and variables
# Merov: going back to the previous code that passes even if it fails catching a failure
# TODO: use the correct code here under and fix the llbase import in python code
#if "$AUTOBUILD" source_environment > source_environment
#then
# . source_environment
#else
# dump environment variables for debugging
# env|sort
# record_failure "autobuild source_environment failed"
# cat source_environment >&3
# exit 1
#fi
eval "$("$AUTOBUILD" source_environment)" eval "$("$AUTOBUILD" source_environment)"
# dump environment variables for debugging # dump environment variables for debugging
env|sort env|sort
check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries
check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries
# Now run the build # Now run the build
succeeded=true succeeded=true
build_processes= build_processes=
......
doc/LGPL-licence.txt 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
doc/LICENSE-logos.txt 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
doc/LICENSE-source.txt 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
doc/contributions.txt 100644 → 100755
+ 5
− 0
View file @ a04a706c
...@@ -1069,10 +1069,12 @@ Sheet Spotter ...@@ -1069,10 +1069,12 @@ Sheet Spotter
Shnurui Troughton Shnurui Troughton
Shyotl Kuhr Shyotl Kuhr
MAINT-1138 MAINT-1138
MAINT-2334
Siana Gearz Siana Gearz
STORM-960 STORM-960
STORM-1088 STORM-1088
MAINT-1138 MAINT-1138
MAINT-2334
sicarius Thorne sicarius Thorne
Sicarius Toxx Sicarius Toxx
SignpostMarv Martin SignpostMarv Martin
...@@ -1090,6 +1092,8 @@ SLB Wirefly ...@@ -1090,6 +1092,8 @@ SLB Wirefly
Slee Mayo Slee Mayo
SEC-1075 SEC-1075
snowy Sidran snowy Sidran
Sovereign Engineer
MAINT-2334
SpacedOut Frye SpacedOut Frye
VWR-34 VWR-34
VWR-45 VWR-45
...@@ -1343,3 +1347,4 @@ Zoex Flanagan ...@@ -1343,3 +1347,4 @@ Zoex Flanagan
doc/releasenotes-where.txt 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
doc/translations.txt 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
etc/message.xml 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
indra/CMakeLists.txt 100644 → 100755
+ 4
− 17
View file @ a04a706c
...@@ -3,14 +3,8 @@ ...@@ -3,14 +3,8 @@
# cmake_minimum_required should appear before any # cmake_minimum_required should appear before any
# other commands to guarantee full compatibility # other commands to guarantee full compatibility
# with the version specified # with the version specified
## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
# The "cmake -E touch" command was released with 2.4.8. cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR)
# This makes cmake 2.6 not complain about version 2.4 compatibility.
if (COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD)
endif (COMMAND cmake_policy)
set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
"The root project/makefile/solution name. Defaults to SecondLife.") "The root project/makefile/solution name. Defaults to SecondLife.")
...@@ -19,13 +13,7 @@ project(${ROOT_PROJECT_NAME}) ...@@ -19,13 +13,7 @@ project(${ROOT_PROJECT_NAME})
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(Variables) include(Variables)
include(BuildVersion)
if (DARWIN)
# 2.6.4 fixes a Mac bug in get_target_property(... "SLPlugin" LOCATION):
# before that version it returns "pathname/SLPlugin", whereas the correct
# answer is "pathname/SLPlugin.app/Contents/MacOS/SLPlugin".
cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
endif (DARWIN)
if (NOT CMAKE_BUILD_TYPE) if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
...@@ -90,8 +78,7 @@ if (LINUX) ...@@ -90,8 +78,7 @@ if (LINUX)
add_dependencies(viewer linux-crash-logger-strip-target linux-updater) add_dependencies(viewer linux-crash-logger-strip-target linux-updater)
elseif (DARWIN) elseif (DARWIN)
add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
add_subdirectory(${VIEWER_PREFIX}mac_updater) add_dependencies(viewer mac-crash-logger)
add_dependencies(viewer mac-updater mac-crash-logger)
elseif (WINDOWS) elseif (WINDOWS)
add_subdirectory(${VIEWER_PREFIX}win_crash_logger) add_subdirectory(${VIEWER_PREFIX}win_crash_logger)
# cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
......
indra/cmake/00-Common.cmake 100644 → 100755
+ 1
− 6
View file @ a04a706c
...@@ -175,12 +175,7 @@ endif (LINUX) ...@@ -175,12 +175,7 @@ endif (LINUX)
if (DARWIN) if (DARWIN)
# NOTE (per http://lists.apple.com/archives/darwin-dev/2008/Jan/msg00232.html): add_definitions(-DLL_DARWIN=1)
# > Why the bus error? What am I doing wrong?
# This is a known issue where getcontext(3) is writing past the end of the
# ucontext_t struct when _XOPEN_SOURCE is not defined (rdar://problem/5578699 ).
# As a workaround, define _XOPEN_SOURCE before including ucontext.h.
add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
set(DARWIN_extra_cstar_flags "-mlong-branch -g") set(DARWIN_extra_cstar_flags "-mlong-branch -g")
......
indra/cmake/APR.cmake 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
indra/cmake/Audio.cmake 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
indra/cmake/BerkeleyDB.cmake 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
indra/cmake/Boost.cmake 100644 → 100755
+ 38
− 16
View file @ a04a706c
...@@ -7,11 +7,12 @@ set(Boost_FIND_REQUIRED ON) ...@@ -7,11 +7,12 @@ set(Boost_FIND_REQUIRED ON)
if (STANDALONE) if (STANDALONE)
include(FindBoost) include(FindBoost)
set(BOOST_CONTEXT_LIBRARY boost_context-mt)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_THREAD_LIBRARY boost_thread-mt) set(BOOST_THREAD_LIBRARY boost_thread-mt)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(boost) use_prebuilt_binary(boost)
...@@ -20,6 +21,12 @@ else (STANDALONE) ...@@ -20,6 +21,12 @@ else (STANDALONE)
if (WINDOWS) if (WINDOWS)
if(MSVC80) if(MSVC80)
set(BOOST_CONTEXT_LIBRARY
optimized libboost_context-vc80-mt-${BOOST_VERSION}
debug libboost_context-vc80-mt-gd-${BOOST_VERSION})
set(BOOST_FILESYSTEM_LIBRARY
optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION} optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
...@@ -32,59 +39,74 @@ else (STANDALONE) ...@@ -32,59 +39,74 @@ else (STANDALONE)
set(BOOST_SYSTEM_LIBRARY set(BOOST_SYSTEM_LIBRARY
optimized libboost_system-vc80-mt-${BOOST_VERSION} optimized libboost_system-vc80-mt-${BOOST_VERSION}
debug libboost_system-vc80-mt-gd-${BOOST_VERSION}) debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
set(BOOST_FILESYSTEM_LIBRARY set(BOOST_THREAD_LIBRARY
optimized libboost_filesystem-vc80-mt-${BOOST_VERSION} optimized libboost_thread-vc80-mt-${BOOST_VERSION}
debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION}) debug libboost_thread-vc80-mt-gd-${BOOST_VERSION})
else(MSVC80) else(MSVC80)
# MSVC 10.0 config # MSVC 10.0 config
set(BOOST_CONTEXT_LIBRARY
optimized libboost_context-mt
debug libboost_context-mt-gd)
set(BOOST_FILESYSTEM_LIBRARY
optimized libboost_filesystem-mt
debug libboost_filesystem-mt-gd)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-mt optimized libboost_program_options-mt
debug libboost_program_options-mt-gd) debug libboost_program_options-mt-gd)
set(BOOST_REGEX_LIBRARY set(BOOST_REGEX_LIBRARY
optimized libboost_regex-mt optimized libboost_regex-mt
debug libboost_regex-mt-gd) debug libboost_regex-mt-gd)
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-mt
debug libboost_signals-mt-gd)
set(BOOST_SYSTEM_LIBRARY set(BOOST_SYSTEM_LIBRARY
optimized libboost_system-mt optimized libboost_system-mt
debug libboost_system-mt-gd) debug libboost_system-mt-gd)
set(BOOST_FILESYSTEM_LIBRARY
optimized libboost_filesystem-mt
debug libboost_filesystem-mt-gd)
set(BOOST_THREAD_LIBRARY set(BOOST_THREAD_LIBRARY
optimized libboost_thread-mt optimized libboost_thread-mt
debug libboost_thread-mt-gd) debug libboost_thread-mt-gd)
endif (MSVC80) endif (MSVC80)
elseif (LINUX) elseif (LINUX)
set(BOOST_CONTEXT_LIBRARY
optimized boost_context-mt
debug boost_context-mt-d)
set(BOOST_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt optimized boost_program_options-mt
debug boost_program_options-mt-d) debug boost_program_options-mt-d)
set(BOOST_REGEX_LIBRARY set(BOOST_REGEX_LIBRARY
optimized boost_regex-mt optimized boost_regex-mt
debug boost_regex-mt-d) debug boost_regex-mt-d)
set(BOOST_SIGNALS_LIBRARY
optimized boost_signals-mt
debug boost_signals-mt-d)
set(BOOST_SYSTEM_LIBRARY set(BOOST_SYSTEM_LIBRARY
optimized boost_system-mt optimized boost_system-mt
debug boost_system-mt-d) debug boost_system-mt-d)
set(BOOST_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(BOOST_THREAD_LIBRARY set(BOOST_THREAD_LIBRARY
optimized boost_thread-mt optimized boost_thread-mt
debug boost_thread-mt-d) debug boost_thread-mt-d)
elseif (DARWIN) elseif (DARWIN)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_CONTEXT_LIBRARY
optimized boost_program_options-mt optimized boost_context-mt
debug boost_program_options-mt-d) debug boost_context-mt-d)
set(BOOST_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt optimized boost_program_options-mt
debug boost_program_options-mt-d) debug boost_program_options-mt-d)
set(BOOST_REGEX_LIBRARY set(BOOST_REGEX_LIBRARY
optimized boost_regex-mt optimized boost_regex-mt
debug boost_regex-mt-d) debug boost_regex-mt-d)
set(BOOST_SIGNALS_LIBRARY
optimized boost_signals-mt
debug boost_signals-mt-d)
set(BOOST_SYSTEM_LIBRARY set(BOOST_SYSTEM_LIBRARY
optimized boost_system-mt optimized boost_system-mt
debug boost_system-mt-d) debug boost_system-mt-d)
set(BOOST_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(BOOST_THREAD_LIBRARY set(BOOST_THREAD_LIBRARY
optimized boost_thread-mt optimized boost_thread-mt
debug boost_thread-mt-d) debug boost_thread-mt-d)
......
indra/cmake/BuildVersion.cmake 100644 → 100755
+ 49
− 14
View file @ a04a706c
# -*- cmake -*- # -*- cmake -*-
# Construct the viewer version number based on the indra/VIEWER_VERSION file
include(Python) if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/newview/
set(VIEWER_VERSION_BASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/newview/VIEWER_VERSION.txt")
macro (build_version _target) if ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
execute_process( file(STRINGS ${VIEWER_VERSION_BASE_FILE} VIEWER_SHORT_VERSION REGEX "^[0-9]+\\.[0-9]+\\.[0-9]+")
COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" VIEWER_VERSION_MAJOR ${VIEWER_SHORT_VERSION})
llversion${_target}.h ${LLCOMMON_INCLUDE_DIRS} string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" VIEWER_VERSION_MINOR ${VIEWER_SHORT_VERSION})
OUTPUT_VARIABLE ${_target}_VERSION string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" VIEWER_VERSION_PATCH ${VIEWER_SHORT_VERSION})
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if (${_target}_VERSION) if (DEFINED ENV{revision})
message(STATUS "Version of ${_target} is ${${_target}_VERSION}") set(VIEWER_VERSION_REVISION $ENV{revision})
else (${_target}_VERSION) message("Revision (from environment): ${VIEWER_VERSION_REVISION}")
message(SEND_ERROR "Could not determine ${_target} version")
endif (${_target}_VERSION) else (DEFINED ENV{revision})
endmacro (build_version) find_program(MERCURIAL hg)
if (DEFINED MERCURIAL)
execute_process(
COMMAND ${MERCURIAL} parents --template "{rev}"
OUTPUT_VARIABLE VIEWER_VERSION_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if (DEFINED VIEWER_VERSION_REVISION)
message("Revision (from hg) ${VIEWER_VERSION_REVISION}")
else (DEFINED VIEWER_VERSION_REVISION)
set(VIEWER_VERSION_REVISION 0 )
message("Revision not set, repository not found, using ${VIEWER_VERSION_REVISION}")
endif (DEFINED VIEWER_VERSION_REVISION)
else (DEFINED MERCURIAL)
set(VIEWER_VERSION_REVISION 0)
message("Revision not set, 'hg' not found (${MERCURIAL}), using ${VIEWER_VERSION_REVISION}")
endif (DEFINED MERCURIAL)
endif (DEFINED ENV{revision})
message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'")
endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
if ("${VIEWER_VERSION_REVISION}" STREQUAL "")
message("Ultimate fallback, revision was blank or not set: will use 0")
set(VIEWER_VERSION_REVISION 0)
endif ("${VIEWER_VERSION_REVISION}" STREQUAL "")
set(VIEWER_CHANNEL_VERSION_DEFINES
"LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\""
"LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}"
"LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
"LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
"LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
)
endif (NOT DEFINED VIEWER_SHORT_VERSION)
indra/cmake/CARes.cmake 100644 → 100755
+ 0
− 0
View file @ a04a706c
File mode changed from 100644 to 100755
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment