Skip to content
Snippets Groups Projects
Commit fdb2ae83 authored by Monty Brandenberg's avatar Monty Brandenberg
Browse files

Merge of viewer-development (3.4.1).

parents 1d5490e7 b8bac66a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 572 additions and 100 deletions
.hgignore
+ 1
− 0
View file @ fdb2ae83
...@@ -25,6 +25,7 @@ indra/lib/mono/indra/*.exe ...@@ -25,6 +25,7 @@ indra/lib/mono/indra/*.exe
indra/lib/mono/indra/*.pdb indra/lib/mono/indra/*.pdb
indra/lib/python/eventlet/ indra/lib/python/eventlet/
indra/llwindow/glh/glh_linear.h indra/llwindow/glh/glh_linear.h
indra/newview/app_settings/dictionaries
indra/newview/app_settings/mozilla indra/newview/app_settings/mozilla
indra/newview/app_settings/mozilla-runtime-* indra/newview/app_settings/mozilla-runtime-*
indra/newview/app_settings/mozilla_debug indra/newview/app_settings/mozilla_debug
......
.hgtags
+ 32
− 0
View file @ fdb2ae83
...@@ -150,6 +150,7 @@ a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release ...@@ -150,6 +150,7 @@ a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release
09984bfa6cae17e0f72d02b75c1b7393c65eecfc 2.7.5-beta1 09984bfa6cae17e0f72d02b75c1b7393c65eecfc 2.7.5-beta1
e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start
502f6a5deca9365ddae57db4f1e30172668e171e 2.8.1-start 502f6a5deca9365ddae57db4f1e30172668e171e 2.8.1-start
888768f162d2c0a8de1dcc5fb9a08bd8bd120a6b DRTVWR-175
2a3965b3ad202df7ea25d2be689291bb14a1280e DRTVWR-155 2a3965b3ad202df7ea25d2be689291bb14a1280e DRTVWR-155
6866d9df6efbd441c66451debd376d21211de39c DRTVWR-68_2.7.5-release 6866d9df6efbd441c66451debd376d21211de39c DRTVWR-68_2.7.5-release
6866d9df6efbd441c66451debd376d21211de39c 2.7.5-release 6866d9df6efbd441c66451debd376d21211de39c 2.7.5-release
...@@ -264,6 +265,7 @@ c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release ...@@ -264,6 +265,7 @@ c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release
16f8e2915f3f2e4d732fb3125daf229cb0fd1875 DRTVWR-114_3.2.8-beta1 16f8e2915f3f2e4d732fb3125daf229cb0fd1875 DRTVWR-114_3.2.8-beta1
37dd400ad721e2a89ee820ffc1e7e433c68f3ca2 3.2.9-start 37dd400ad721e2a89ee820ffc1e7e433c68f3ca2 3.2.9-start
16f8e2915f3f2e4d732fb3125daf229cb0fd1875 3.2.8-beta1 16f8e2915f3f2e4d732fb3125daf229cb0fd1875 3.2.8-beta1
089e5c84b2dece68f2b016c842ef9b5de4786842 DRTVWR-161
987425b1acf4752379b2e1eb20944b4b35d67a85 DRTVWR-115_3.2.8-beta2 987425b1acf4752379b2e1eb20944b4b35d67a85 DRTVWR-115_3.2.8-beta2
987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2 987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2
51b2fd52e36aab8f670e0874e7e1472434ec4b4a DRTVWR-113_3.2.8-release 51b2fd52e36aab8f670e0874e7e1472434ec4b4a DRTVWR-113_3.2.8-release
...@@ -286,6 +288,9 @@ d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1 ...@@ -286,6 +288,9 @@ d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1
28b95a6a28dca3338d9a1f4f204b96678df9f6a5 viewer-beta-candidate 28b95a6a28dca3338d9a1f4f204b96678df9f6a5 viewer-beta-candidate
b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 DRTVWR-125 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 DRTVWR-125
dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 3.3.1-start 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 3.3.1-start
28b95a6a28dca3338d9a1f4f204b96678df9f6a5 3.3.1-beta1 28b95a6a28dca3338d9a1f4f204b96678df9f6a5 3.3.1-beta1
1dc545e44617975da2a4a32fe303386c687a6ca1 viewer-beta-candidate 1dc545e44617975da2a4a32fe303386c687a6ca1 viewer-beta-candidate
...@@ -300,7 +305,13 @@ c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate ...@@ -300,7 +305,13 @@ c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate
675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate 675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate
675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-release 675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-release
675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate 675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate
050e48759337249130f684b4a21080b683f61732 DRTVWR-168
b9d0170b62eb1c7c3adaa37a0b13a833e5e659f9 DRTVWR-171
c08e2ac17a99973b2a94477659220b99b8847ae2 DRTVWR-163
600f3b3920d94de805ac6dc8bb6def9c069dd360 DRTVWR-162
600f3b3920d94de805ac6dc8bb6def9c069dd360 DRTVWR-162 600f3b3920d94de805ac6dc8bb6def9c069dd360 DRTVWR-162
9a78ac13f047056f788c4734dd91aebfe30970e3 DRTVWR-157
a716684aa7c07c440b1de5815b8a1f3dd3fd8bfb DRTVWR-159
24a7281bef42bd4430ceb25db8b195449c2c7de3 DRTVWR-153 24a7281bef42bd4430ceb25db8b195449c2c7de3 DRTVWR-153
15e90b52dc0297921b022b90d10d797436b8a1bd viewer-release-candidate 15e90b52dc0297921b022b90d10d797436b8a1bd viewer-release-candidate
6414ecdabc5d89515b08d1f872cf923ed3a5523a DRTVWR-148 6414ecdabc5d89515b08d1f872cf923ed3a5523a DRTVWR-148
...@@ -317,3 +328,24 @@ fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2 ...@@ -317,3 +328,24 @@ fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2
af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169 af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
4b3c68199a86cabaa5d9466d7b0f7e141e901d7a 3.3.3-beta3 4b3c68199a86cabaa5d9466d7b0f7e141e901d7a 3.3.3-beta3
6428242e124b523813bfaf4c45b3d422f0298c81 3.3.3-release 6428242e124b523813bfaf4c45b3d422f0298c81 3.3.3-release
57d221de3df94f90b55204313c2cef044a3c0ae2 DRTVWR-176
09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170
005dfe5c4c377207d065fb27858d2eb0b53b143a DRTVWR-167
f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158
f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174
bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173
f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
82b5330bc8b17d0d4b598832e9c5a92e90075682 3.3.4-beta2
eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177
4ad8a3afe40e0200309e3ada68932c4295ac2795 DRTVWR-179
a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3
4281aa899fb2cedb7a9ca7ce91c5c29d4aa69594 DRTVWR-180
9cd174d3a54d93d409a7c346a15b8bfb40fc58f4 DRTVWR-184
5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183
6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4
ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5
28e100d0379a2b0710c57647a28fc5239d3d7b99 3.3.4-release
a8b3eca451a9eaab59987efb0ab1c4217e3f2dcc DRTVWR-182
1f27cdfdc54246484f8afbbe42ce48e954175cbd 3.4.0-beta1
BuildParams
+ 26
− 28
View file @ fdb2ae83
...@@ -18,7 +18,7 @@ build_CYGWIN_Debug = false ...@@ -18,7 +18,7 @@ build_CYGWIN_Debug = false
email_status_this_is_os = true email_status_this_is_os = true
# Limit extent of codeticket updates to revisions after... # Limit extent of codeticket updates to revisions after...
codeticket_since = 2.2.0-release codeticket_since = 3.3.0-release
# ======================================== # ========================================
# Viewer Development # Viewer Development
...@@ -43,18 +43,20 @@ integration_viewer-development.viewer_channel = "Second Life Development" ...@@ -43,18 +43,20 @@ integration_viewer-development.viewer_channel = "Second Life Development"
integration_viewer-development.login_channel = "Second Life Development" integration_viewer-development.login_channel = "Second Life Development"
integration_viewer-development.build_viewer_update_version_manager = false integration_viewer-development.build_viewer_update_version_manager = false
integration_viewer-development.email = viewer-development-builds@lists.secondlife.com integration_viewer-development.email = viewer-development-builds@lists.secondlife.com
integration_viewer-development.build_enforce_coding_policy = true integration_viewer-development.build_enforce_coding_policy = false
integration_viewer-development.codeticket_add_context = true integration_viewer-development.codeticket_add_context = false
viewer-beta.viewer_channel = "Second Life Beta Viewer" viewer-beta.viewer_channel = "Second Life Beta Viewer"
viewer-beta.login_channel = "Second Life Beta Viewer" viewer-beta.login_channel = "Second Life Beta Viewer"
viewer-beta.build_debug_release_separately = true viewer-beta.build_debug_release_separately = true
viewer-beta.build_viewer_update_version_manager = 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.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
# ======================================== # ========================================
# mesh-development # mesh-development
...@@ -112,31 +114,27 @@ viewer-mesh.login_channel = "Project Viewer - Mesh" ...@@ -112,31 +114,27 @@ 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
# ================ # ========================================
# oz # viewer-adult-check
# ================ # ========================================
Snowstorm_viewer-project-review.build_debug_release_separately = true viewer-adult-check.viewer_channel = "Project Viewer - AdultCheck"
Snowstorm_viewer-project-review.codeticket_add_context = true viewer-adult-check.login_channel = "Project Viewer - AdultCheck"
Snowstorm_viewer-project-review.viewer_channel = "Project Viewer - Snowstorm Team" viewer-adult-check.viewer_grid = agni
Snowstorm_viewer-project-review.login_channel = "Project Viewer - Snowstorm Team" viewer-adult-check.build_debug_release_separately = true
Snowstorm_viewer-project-review.codeticket_add_context = true viewer-adult-check.build_CYGWIN_Debug = false
viewer-adult-check.build_viewer_update_version_manager = false
oz_viewer-devreview.build_debug_release_separately = true
oz_viewer-devreview.codeticket_add_context = false # ========================================
oz_viewer-devreview.build_enforce_coding_policy = true # viewer-pathfinding
oz_viewer-devreview.email = oz@lindenlab.com # ========================================
oz_viewer-trial.build_debug_release_separately = true viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding"
oz_viewer-trial.codeticket_add_context = false viewer-pathfinding.login_channel = "Project Viewer - Pathfinding"
oz_viewer-trial.build_enforce_coding_policy = true viewer-pathfinding.viewer_grid = agni
oz_viewer-trial.email = oz@lindenlab.com viewer-pathfinding.build_debug_release_separately = true
viewer-pathfinding.build_CYGWIN_Debug = false
oz_viewer-beta-review.build_debug_release_separately = true viewer-pathfinding.build_viewer_update_version_manager = false
oz_viewer-beta-review.codeticket_add_context = false
oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.email = oz@lindenlab.com
# ================================================================= # =================================================================
# asset delivery 2010 projects # asset delivery 2010 projects
......
autobuild.xml
+ 179
− 21
View file @ fdb2ae83
...@@ -363,6 +363,54 @@ ...@@ -363,6 +363,54 @@
</map> </map>
</map> </map>
</map> </map>
<key>dictionaries</key>
<map>
<key>license</key>
<string>various open</string>
<key>license_file</key>
<string>LICENSES/dictionaries.txt</string>
<key>name</key>
<string>dictionaries</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>06a6c49eb1873e95623d3d2d07aee903</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/Darwin/installer/dictionaries-1-darwin-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>4f0ca21d27e0cd0b002149062b0a4b25</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/Linux/installer/dictionaries-1-linux-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>7520d75f6af325328322201c888191d4</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/CYGWIN/installer/dictionaries-1-windows-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>elfio</key> <key>elfio</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -855,6 +903,54 @@ ...@@ -855,6 +903,54 @@
</map> </map>
</map> </map>
</map> </map>
<key>havok-source</key>
<map>
<key>license</key>
<string>havok-ares</string>
<key>license_file</key>
<string>LICENSES/havok.txt</string>
<key>name</key>
<string>havok-source</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>efaf5cb3e861d44518eb03f4c406f03c</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261536/arch/Darwin/installer/havok_source-2012.1-darwin-20120710.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>50037fff3fd3356a073cdae88348c9ab</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261536/arch/Linux/installer/havok_source-2012.1-linux-20120711.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>cd6638f5a03469654615730c16889a60</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261536/arch/CYGWIN/installer/havok_source-2012.1-windows-20120710.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>jpeglib</key> <key>jpeglib</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -999,6 +1095,54 @@ ...@@ -999,6 +1095,54 @@
</map> </map>
</map> </map>
</map> </map>
<key>libhunspell</key>
<map>
<key>license</key>
<string>libhunspell</string>
<key>license_file</key>
<string>LICENSES/hunspell.txt</string>
<key>name</key>
<string>libhunspell</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>6f5db0ef258df6e5c93c843ec559db6d</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/Darwin/installer/libhunspell-1.3.2-darwin-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>0c432d2626aea2e91a56335879c92965</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/Linux/installer/libhunspell-1.3.2-linux-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>6a140e5620826aa5e587b4157f57b389</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/CYGWIN/installer/libhunspell-1.3.2-windows-20120616.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>libpng</key> <key>libpng</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -1095,14 +1239,14 @@ ...@@ -1095,14 +1239,14 @@
</map> </map>
</map> </map>
</map> </map>
<key>llconvexdecomposition</key> <key>llphysicsextensions_source</key>
<map> <map>
<key>license</key> <key>license</key>
<string>havok</string> <string>TEMPORARY</string>
<key>license_file</key> <key>license_file</key>
<string>on_file</string> <string>LICENSES/llphysicsextensions.txt</string>
<key>name</key> <key>name</key>
<string>llconvexdecomposition</string> <string>llphysicsextensions_source</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>darwin</key> <key>darwin</key>
...@@ -1110,9 +1254,11 @@ ...@@ -1110,9 +1254,11 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>362654a472ef7368d4c803ae3fb89d95</string> <string>de22a97b276913a6dd05838b7fe297af</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110819.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source/rev/262536/arch/Darwin/installer/llphysicsextensions_source-0.3-darwin-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -1122,9 +1268,9 @@ ...@@ -1122,9 +1268,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>c7801d899daec5338fbe95053255b7e7</string> <string>d2dfbbc11aac34ebd551df86524c8c9c</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110819.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source/rev/262536/arch/Linux/installer/llphysicsextensions_source-0.3-linux-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -1134,23 +1280,25 @@ ...@@ -1134,23 +1280,25 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>6ecf2f85f03c5ae87fe45769566a5660</string> <string>99abccc5d117ab82cadb8cff0d85b867</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110819.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source/rev/262536/arch/CYGWIN/installer/llphysicsextensions_source-0.3-windows-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
</map> </map>
</map> </map>
<key>version</key>
<string>0.2</string>
</map> </map>
<key>llconvexdecompositionstub</key> <key>llphysicsextensions_stub</key>
<map> <map>
<key>license</key> <key>license</key>
<string>lgpl</string> <string>TEMPORARY</string>
<key>license_file</key> <key>license_file</key>
<string>LICENSES/LLConvexDecompositionStubLicense.txt</string> <string>LICENSES/llphysicsextensions.txt</string>
<key>name</key> <key>name</key>
<string>llconvexdecompositionstub</string> <string>llphysicsextensions_stub</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>darwin</key> <key>darwin</key>
...@@ -1158,9 +1306,11 @@ ...@@ -1158,9 +1306,11 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>a5f53e09f67271fd50f1131ffdda9d27</string> <string>3528620230fbd288fcc9dbbd8d8a6b59</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110819.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub/rev/262536/arch/Darwin/installer/llphysicsextensions_stub-0.3-darwin-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -1170,9 +1320,9 @@ ...@@ -1170,9 +1320,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>0006a964f1497f55a5f181b7042d2d22</string> <string>69d188f72f9494b0e74c94ca0496f618</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110819.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub/rev/262536/arch/Linux/installer/llphysicsextensions_stub-0.3-linux-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -1182,14 +1332,16 @@ ...@@ -1182,14 +1332,16 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>b859e7e3bb03ebb467f0309f46422995</string> <string>61fc2b84ad53cf8d98d1784c31f9928e</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110819.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub/rev/262536/arch/CYGWIN/installer/llphysicsextensions_stub-0.3-windows-20120725.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
</map> </map>
</map> </map>
<key>version</key>
<string>0.2</string>
</map> </map>
<key>llqtwebkit</key> <key>llqtwebkit</key>
<map> <map>
...@@ -1762,8 +1914,12 @@ ...@@ -1762,8 +1914,12 @@
</map> </map>
<key>package_description</key> <key>package_description</key>
<map> <map>
<key>description</key>
<string>Spell checking dictionaries</string>
<key>license</key>
<string>various open</string>
<key>name</key> <key>name</key>
<string>viewer_development</string> <string>dictionaries</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>common</key> <key>common</key>
...@@ -2473,6 +2629,8 @@ ...@@ -2473,6 +2629,8 @@
<string>windows</string> <string>windows</string>
</map> </map>
</map> </map>
<key>version</key>
<string>1.0</string>
</map> </map>
<key>type</key> <key>type</key>
<string>autobuild</string> <string>autobuild</string>
......
build.sh
+ 61
− 9
View file @ fdb2ae83
...@@ -15,6 +15,12 @@ ...@@ -15,6 +15,12 @@
# * The basic convention is that the build name can be mapped onto a mercurial URL, # * The basic convention is that the build name can be mapped onto a mercurial URL,
# which is also used as the "branch" name. # which is also used as the "branch" name.
check_for()
{
if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi
echo "$1 ${found_dict} '$2' " 1>&2
}
build_dir_Darwin() build_dir_Darwin()
{ {
echo build-darwin-i386 echo build-darwin-i386
...@@ -59,6 +65,8 @@ pre_build() ...@@ -59,6 +65,8 @@ 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
"$AUTOBUILD" configure -c $variant -- \ "$AUTOBUILD" configure -c $variant -- \
-DPACKAGE:BOOL=ON \ -DPACKAGE:BOOL=ON \
-DRELEASE_CRASH_REPORTING:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \
...@@ -67,7 +75,33 @@ pre_build() ...@@ -67,7 +75,33 @@ pre_build()
-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
end_section "Pre$variant"
check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
end_section "Pre$variant"
}
package_llphysicsextensions_tpv()
{
begin_section "PhysicsExtensions_TPV"
tpv_status=0
if [ "$variant" = "Release" ]
then
llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml
"$AUTOBUILD" build --verbose --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 > $PKGTMP
tpv_status=$?
sed -n -e 's/^wrote *//p' $PKGTMP > $build_dir/llphysicsextensions_package
else
echo "Do not provide llphysicsextensions_tpv for $variant"
llphysicsextensions_package=""
fi
end_section "PhysicsExtensions_TPV"
return $tpv_status
} }
build() build()
...@@ -76,13 +110,21 @@ build() ...@@ -76,13 +110,21 @@ build()
if $build_viewer if $build_viewer
then then
begin_section "Viewer$variant" begin_section "Viewer$variant"
if "$AUTOBUILD" build --no-configure -c $variant check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries
"$AUTOBUILD" build --no-configure -c $variant
viewer_build_ok=$?
end_section "Viewer$variant"
package_llphysicsextensions_tpv
tpvlib_build_ok=$?
if [ $viewer_build_ok -eq 0 -a $tpvlib_build_ok -eq 0 ]
then then
echo true >"$build_dir"/build_ok echo true >"$build_dir"/build_ok
else else
echo false >"$build_dir"/build_ok echo false >"$build_dir"/build_ok
fi fi
end_section "Viewer$variant" check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
fi fi
} }
...@@ -172,7 +214,10 @@ eval "$("$AUTOBUILD" source_environment)" ...@@ -172,7 +214,10 @@ 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=
...@@ -196,11 +241,6 @@ do ...@@ -196,11 +241,6 @@ do
mkdir -p "$build_dir" mkdir -p "$build_dir"
mkdir -p "$build_dir/tmp" mkdir -p "$build_dir/tmp"
# Install packages.
begin_section "AutobuildInstall"
"$AUTOBUILD" install --verbose --skip-license-check
end_section "AutobuildInstall"
if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
then then
if $build_link_parallel if $build_link_parallel
...@@ -270,13 +310,25 @@ then ...@@ -270,13 +310,25 @@ then
upload_item quicklink "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream
[ -f summary.json ] && upload_item installer summary.json text/plain [ -f summary.json ] && upload_item installer summary.json text/plain
# Upload crash reporter files.
case "$last_built_variant" in case "$last_built_variant" in
Release) Release)
# Upload crash reporter files
for symbolfile in $symbolfiles for symbolfile in $symbolfiles
do do
upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
done done
# Upload the llphysicsextensions_tpv package, if one was produced
if [ -r "$build_dir/llphysicsextensions_package" ]
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 esac
......
doc/contributions.txt
+ 18
− 0
View file @ fdb2ae83
...@@ -297,6 +297,8 @@ Cherry Cheevers ...@@ -297,6 +297,8 @@ Cherry Cheevers
ChickyBabes Zuzu ChickyBabes Zuzu
Christopher Organiser Christopher Organiser
Ciaran Laval Ciaran Laval
Cinder Roxley
STORM-1703
Clara Young Clara Young
Coaldust Numbers Coaldust Numbers
VWR-1095 VWR-1095
...@@ -471,6 +473,7 @@ Hiro Sommambulist ...@@ -471,6 +473,7 @@ Hiro Sommambulist
VWR-143 VWR-143
Hitomi Tiponi Hitomi Tiponi
STORM-1741 STORM-1741
STORM-1862
Holger Gilruth Holger Gilruth
Horatio Freund Horatio Freund
Hoze Menges Hoze Menges
...@@ -623,12 +626,22 @@ Jonathan Yap ...@@ -623,12 +626,22 @@ Jonathan Yap
STORM-1799 STORM-1799
STORM-1796 STORM-1796
STORM-1807 STORM-1807
STORM-1812
STORM-1820
STORM-1839
STORM-1842
STORM-1808 STORM-1808
STORM-637 STORM-637
STORM-1822 STORM-1822
STORM-1809 STORM-1809
STORM-1793 STORM-1793
STORM-1810 STORM-1810
STORM-1860
STORM-1852
STORM-1870
STORM-1872
STORM-1858
STORM-1862
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
Jondan Lundquist Jondan Lundquist
...@@ -725,6 +738,8 @@ Marc2 Sands ...@@ -725,6 +738,8 @@ Marc2 Sands
Marianne McCann Marianne McCann
Marine Kelley Marine Kelley
STORM-281 STORM-281
MartinRJ Fayray
STORM-1845
Matthew Anthony Matthew Anthony
Matthew Dowd Matthew Dowd
VWR-1344 VWR-1344
...@@ -1052,6 +1067,8 @@ Simon Nolan ...@@ -1052,6 +1067,8 @@ Simon Nolan
Sini Nubalo Sini Nubalo
Sitearm Madonna Sitearm Madonna
SLB Wirefly SLB Wirefly
Slee Mayo
SEC-1075
snowy Sidran snowy Sidran
SpacedOut Frye SpacedOut Frye
VWR-34 VWR-34
...@@ -1287,6 +1304,7 @@ Zi Ree ...@@ -1287,6 +1304,7 @@ Zi Ree
VWR-24017 VWR-24017
VWR-25588 VWR-25588
STORM-1790 STORM-1790
STORM-1842
Zipherius Turas Zipherius Turas
VWR-76 VWR-76
VWR-77 VWR-77
......
etc/message.xml
+ 18
− 2
View file @ fdb2ae83
...@@ -546,8 +546,24 @@ ...@@ -546,8 +546,24 @@
<key>trusted-sender</key> <key>trusted-sender</key>
<boolean>true</boolean> <boolean>true</boolean>
</map> </map>
<!-- UDPDeprecated Messages --> <key>NavMeshStatusUpdate</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
<key>AgentStateUpdate</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
<!-- UDPDeprecated Messages -->
<key>ScriptRunningReply</key> <key>ScriptRunningReply</key>
<map> <map>
<key>flavor</key> <key>flavor</key>
......
indra/cmake/00-Common.cmake
+ 1
− 0
View file @ fdb2ae83
...@@ -69,6 +69,7 @@ if (WINDOWS) ...@@ -69,6 +69,7 @@ if (WINDOWS)
/Oy- /Oy-
/Zc:wchar_t- /Zc:wchar_t-
/arch:SSE2 /arch:SSE2
/fp:fast
) )
# Are we using the crummy Visual Studio KDU build workaround? # Are we using the crummy Visual Studio KDU build workaround?
......
indra/cmake/CMakeLists.txt
+ 2
− 1
View file @ fdb2ae83
...@@ -37,12 +37,12 @@ set(cmake_SOURCE_FILES ...@@ -37,12 +37,12 @@ set(cmake_SOURCE_FILES
GLOD.cmake GLOD.cmake
GStreamer010Plugin.cmake GStreamer010Plugin.cmake
GooglePerfTools.cmake GooglePerfTools.cmake
Hunspell.cmake
JPEG.cmake JPEG.cmake
LLAddBuildTest.cmake LLAddBuildTest.cmake
LLAudio.cmake LLAudio.cmake
LLCharacter.cmake LLCharacter.cmake
LLCommon.cmake LLCommon.cmake
LLConvexDecomposition.cmake
LLCrashLogger.cmake LLCrashLogger.cmake
LLDatabase.cmake LLDatabase.cmake
LLImage.cmake LLImage.cmake
...@@ -53,6 +53,7 @@ set(cmake_SOURCE_FILES ...@@ -53,6 +53,7 @@ set(cmake_SOURCE_FILES
LLMessage.cmake LLMessage.cmake
LLPlugin.cmake LLPlugin.cmake
LLPrimitive.cmake LLPrimitive.cmake
LLPhysicsExtensions.cmake
LLRender.cmake LLRender.cmake
LLScene.cmake LLScene.cmake
LLTestCommand.cmake LLTestCommand.cmake
......
indra/cmake/Copy3rdPartyLibs.cmake
+ 13
− 6
View file @ fdb2ae83
...@@ -41,6 +41,7 @@ if(WINDOWS) ...@@ -41,6 +41,7 @@ if(WINDOWS)
libeay32.dll libeay32.dll
libcollada14dom22-d.dll libcollada14dom22-d.dll
glod.dll glod.dll
libhunspell.dll
) )
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
...@@ -53,12 +54,13 @@ if(WINDOWS) ...@@ -53,12 +54,13 @@ if(WINDOWS)
libeay32.dll libeay32.dll
libcollada14dom22.dll libcollada14dom22.dll
glod.dll glod.dll
libhunspell.dll
) )
if(USE_GOOGLE_PERFTOOLS) if(USE_TCMALLOC)
set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
set(release_files ${release_files} libtcmalloc_minimal.dll) set(release_files ${release_files} libtcmalloc_minimal.dll)
endif(USE_GOOGLE_PERFTOOLS) endif(USE_TCMALLOC)
if (FMOD) if (FMOD)
set(debug_files ${debug_files} fmod.dll) set(debug_files ${debug_files} fmod.dll)
...@@ -212,11 +214,12 @@ elseif(DARWIN) ...@@ -212,11 +214,12 @@ elseif(DARWIN)
libexpat.1.5.2.dylib libexpat.1.5.2.dylib
libexpat.dylib libexpat.dylib
libGLOD.dylib libGLOD.dylib
libllqtwebkit.dylib libllqtwebkit.dylib
libminizip.a libminizip.a
libndofdev.dylib libndofdev.dylib
libhunspell-1.3.0.dylib
libexception_handler.dylib libexception_handler.dylib
libcollada14dom.dylib libcollada14dom.dylib
) )
# fmod is statically linked on darwin # fmod is statically linked on darwin
...@@ -270,17 +273,21 @@ elseif(LINUX) ...@@ -270,17 +273,21 @@ elseif(LINUX)
libgobject-2.0.so libgobject-2.0.so
libgtest_main.so libgtest_main.so
libgtest.so.0 libgtest.so.0
libhunspell-1.3.so.0.0.0
libminizip.so libminizip.so
libopenal.so libopenal.so
libopenjpeg.so libopenjpeg.so
libssl.so libssl.so
libtcmalloc_minimal.so
libuuid.so.16 libuuid.so.16
libuuid.so.16.0.22 libuuid.so.16.0.22
libssl.so.1.0.0 libssl.so.1.0.0
libfontconfig.so.1.4.4 libfontconfig.so.1.4.4
) )
if (USE_TCMALLOC)
set(release_files ${release_files} "libtcmalloc_minimal.so")
endif (USE_TCMALLOC)
if (FMOD) if (FMOD)
set(release_files ${release_files} "libfmod-3.75.so") set(release_files ${release_files} "libfmod-3.75.so")
endif (FMOD) endif (FMOD)
......
indra/cmake/FindHUNSPELL.cmake 0 → 100644
+ 38
− 0
View file @ fdb2ae83
# -*- cmake -*-
# - Find HUNSPELL
# This module defines
# HUNSPELL_INCLUDE_DIR, where to find libhunspell.h, etc.
# HUNSPELL_LIBRARY, the library needed to use HUNSPELL.
# HUNSPELL_FOUND, If false, do not try to use HUNSPELL.
find_path(HUNSPELL_INCLUDE_DIR hunspell.h
PATH_SUFFIXES hunspell
)
set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3.0 libhunspell)
find_library(HUNSPELL_LIBRARY
NAMES ${HUNSPELL_NAMES}
)
if (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
set(HUNSPELL_FOUND "YES")
else (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
set(HUNSPELL_FOUND "NO")
endif (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
if (HUNSPELL_FOUND)
if (NOT HUNSPELL_FIND_QUIETLY)
message(STATUS "Found Hunspell: Library in '${HUNSPELL_LIBRARY}' and header in '${HUNSPELL_INCLUDE_DIR}' ")
endif (NOT HUNSPELL_FIND_QUIETLY)
else (HUNSPELL_FOUND)
if (HUNSPELL_FIND_REQUIRED)
message(FATAL_ERROR " * * *\nCould not find HUNSPELL library! * * *")
endif (HUNSPELL_FIND_REQUIRED)
endif (HUNSPELL_FOUND)
mark_as_advanced(
HUNSPELL_LIBRARY
HUNSPELL_INCLUDE_DIR
)
indra/cmake/GooglePerfTools.cmake
+ 30
− 10
View file @ fdb2ae83
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
# If you want to enable or disable TCMALLOC in viewer builds, this is the place.
# set ON or OFF as desired.
set (USE_TCMALLOC ON)
if (STANDALONE) if (STANDALONE)
include(FindGooglePerfTools) include(FindGooglePerfTools)
else (STANDALONE) else (STANDALONE)
if (WINDOWS) if (WINDOWS)
use_prebuilt_binary(tcmalloc) if (USE_TCMALLOC)
set(TCMALLOC_LIBRARIES use_prebuilt_binary(tcmalloc)
debug libtcmalloc_minimal-debug set(TCMALLOC_LIBRARIES
optimized libtcmalloc_minimal) debug libtcmalloc_minimal-debug
optimized libtcmalloc_minimal)
set(TCMALLOC_LINK_FLAGS "/INCLUDE:__tcmalloc")
else (USE_TCMALLOC)
set(TCMALLOC_LIBRARIES)
set(TCMALLOC_LINK_FLAGS)
endif (USE_TCMALLOC)
set(GOOGLE_PERFTOOLS_FOUND "YES") set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (WINDOWS) endif (WINDOWS)
if (LINUX) if (LINUX)
use_prebuilt_binary(tcmalloc) if (USE_TCMALLOC)
set(TCMALLOC_LIBRARIES use_prebuilt_binary(tcmalloc)
tcmalloc) set(TCMALLOC_LIBRARIES
tcmalloc)
else (USE_TCMALLOC)
set(TCMALLOC_LIBRARIES)
endif (USE_TCMALLOC)
set(PROFILER_LIBRARIES profiler) set(PROFILER_LIBRARIES profiler)
set(GOOGLE_PERFTOOLS_INCLUDE_DIR set(GOOGLE_PERFTOOLS_INCLUDE_DIR
${LIBS_PREBUILT_DIR}/include) ${LIBS_PREBUILT_DIR}/include)
...@@ -29,13 +43,19 @@ if (GOOGLE_PERFTOOLS_FOUND) ...@@ -29,13 +43,19 @@ if (GOOGLE_PERFTOOLS_FOUND)
endif (GOOGLE_PERFTOOLS_FOUND) endif (GOOGLE_PERFTOOLS_FOUND)
if (WINDOWS) if (WINDOWS)
set(USE_GOOGLE_PERFTOOLS ON) set(USE_GOOGLE_PERFTOOLS ON)
endif (WINDOWS) endif (WINDOWS)
if (USE_GOOGLE_PERFTOOLS) if (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC=1) if (USE_TCMALLOC)
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
else (USE_TCMALLOC)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
endif (USE_TCMALLOC)
endif (USE_GOOGLE_PERFTOOLS)
if (USE_GOOGLE_PERFTOOLS)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES}) set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
else (USE_GOOGLE_PERFTOOLS) else (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
endif (USE_GOOGLE_PERFTOOLS) endif (USE_GOOGLE_PERFTOOLS)
indra/cmake/Havok.cmake 0 → 100644
+ 83
− 0
View file @ fdb2ae83
# -*- cmake -*-
use_prebuilt_binary(havok-source)
set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source)
list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo)
set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug)
set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok)
if (LL_DEBUG_HAVOK)
if (WIN32)
# Always link relwithdebinfo to havok-hybrid on windows.
set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid)
else (WIN32)
set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug)
endif (WIN32)
else (LL_DEBUG_HAVOK)
set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok)
endif (LL_DEBUG_HAVOK)
set(HAVOK_LIBS
hkBase
hkCompat
hkGeometryUtilities
hkInternal
hkSerialize
hkSceneData
hkpCollide
hkpUtilities
hkpConstraintSolver
hkpDynamics
hkpInternal
hkaiInternal
hkaiPathfinding
hkaiAiPhysicsBridge
hkcdInternal
hkcdCollide
hkpVehicle
hkVisualize
hkaiVisualize
hkgpConvexDecomposition
)
unset(HK_DEBUG_LIBRARIES)
unset(HK_RELEASE_LIBRARIES)
unset(HK_RELWITHDEBINFO_LIBRARIES)
foreach(HAVOK_LIB ${HAVOK_LIBS})
find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH})
find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH})
find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH})
if(LINUX)
set(cmd "mkdir")
set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}")
set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}")
set(relwithdebinfo_dir "${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}/${HAVOK_LIB}")
exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv)
exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv)
exec_program( ${cmd} ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH} ARGS ${relwithdebinfo_dir} OUTPUT_VARIABLE rv)
set(cmd "ar")
set(arg " -xv")
set(arg "${arg} ../lib${HAVOK_LIB}.a")
exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv)
exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv)
exec_program( ${cmd} ${relwithdebinfo_dir} ARGS ${arg} OUTPUT_VARIABLE rv)
file(GLOB extracted_debug "${debug_dir}/*.o")
file(GLOB extracted_release "${release_dir}/*.o")
file(GLOB extracted_relwithdebinfo "${relwithdebinfo_dir}/*.o")
list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug})
list(APPEND HK_RELEASE_LIBRARIES ${extracted_release})
list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_relwithdebinfo})
else(LINUX)
# Win32
list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}})
list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}})
list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB}})
endif (LINUX)
endforeach(HAVOK_LIB)
indra/cmake/Hunspell.cmake 0 → 100644
+ 22
− 0
View file @ fdb2ae83
# -*- cmake -*-
include(Prebuilt)
set(HUNSPELL_FIND_QUIETLY ON)
set(HUNSPELL_FIND_REQUIRED ON)
if (STANDALONE)
include(FindHUNSPELL)
else (STANDALONE)
use_prebuilt_binary(libhunspell)
if (WINDOWS)
set(HUNSPELL_LIBRARY libhunspell)
elseif(DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.3.0)
elseif(LINUX)
set(HUNSPELL_LIBRARY hunspell-1.3)
else()
message(FATAL_ERROR "Invalid platform")
endif()
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
use_prebuilt_binary(dictionaries)
endif (STANDALONE)
indra/cmake/LLAddBuildTest.cmake
+ 9
− 0
View file @ fdb2ae83
...@@ -205,6 +205,15 @@ FUNCTION(LL_ADD_INTEGRATION_TEST ...@@ -205,6 +205,15 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}") SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
endif(STANDALONE) endif(STANDALONE)
if (WINDOWS)
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
PROPERTIES
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE ""
)
endif (WINDOWS)
# Add link deps to the executable # Add link deps to the executable
if(TEST_DEBUG) if(TEST_DEBUG)
message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})") message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")
......
indra/cmake/LLConvexDecomposition.cmake deleted 100644 → 0
+ 0
− 12
View file @ 1d5490e7
# -*- cmake -*-
include(Prebuilt)
set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llconvexdecomposition)
set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
else (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llconvexdecompositionstub)
set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
indra/cmake/LLPhysicsExtensions.cmake 0 → 100644
+ 35
− 0
View file @ fdb2ae83
# -*- cmake -*-
include(Prebuilt)
# There are three possible solutions to provide the llphysicsextensions:
# - The full source package, selected by -DHAVOK:BOOL=ON
# - The stub source package, selected by -DHAVOK:BOOL=OFF
# - The prebuilt package available to those with sublicenses, selected by -DHAVOK_TPV:BOOL=ON
if (INSTALL_PROPRIETARY)
set(HAVOK ON CACHE BOOL "Use Havok physics library")
endif (INSTALL_PROPRIETARY)
# Note that the use_prebuilt_binary macros below do not in fact include binaries;
# the llphysicsextensions_* packages are source only and are built here.
# The source package and the stub package both build libraries of the same name.
if (HAVOK)
include(Havok)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions)
elseif (HAVOK_TPV)
use_prebuilt_binary(llphysicsextensions_tpv)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions_tpv)
else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub)
endif (HAVOK)
set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
indra/cmake/Linking.cmake
+ 1
− 2
View file @ fdb2ae83
...@@ -38,9 +38,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") ...@@ -38,9 +38,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
# packages/lib/release directory to deal with autobuild packages that don't # packages/lib/release directory to deal with autobuild packages that don't
# provide (e.g.) lib/debug libraries. # provide (e.g.) lib/debug libraries.
list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS")
endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}")
link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
if (LINUX) if (LINUX)
......
indra/cmake/Variables.cmake
+ 2
− 2
View file @ fdb2ae83
...@@ -101,8 +101,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ...@@ -101,8 +101,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# To support a different SDK update these Xcode settings: # To support a different SDK update these Xcode settings:
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) set(CMAKE_OSX_SYSROOT macosx10.6)
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
# NOTE: To attempt an i386/PPC Universal build, add this on the configure line: # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
......
indra/cmake/ViewerMiscLibs.cmake
+ 1
− 7
View file @ fdb2ae83
...@@ -2,15 +2,9 @@ ...@@ -2,15 +2,9 @@
include(Prebuilt) include(Prebuilt)
if (NOT STANDALONE) if (NOT STANDALONE)
use_prebuilt_binary(libhunspell)
use_prebuilt_binary(libuuid) use_prebuilt_binary(libuuid)
use_prebuilt_binary(slvoice) use_prebuilt_binary(slvoice)
use_prebuilt_binary(fontconfig) use_prebuilt_binary(fontconfig)
endif(NOT STANDALONE) endif(NOT STANDALONE)
if(VIEWER AND NOT STANDALONE)
if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
message(STATUS "We seem to have an artwork bundle in the tree - brilliant.")
else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!")
endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
endif(VIEWER AND NOT STANDALONE)
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