From 2417cb3021123d7305b1c4fe4bdf16fddaecb494 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 25 Apr 2011 17:13:51 -0400 Subject: Update with CG's build.sh patch to upload summary.json. Patch taken from here: https://paste.lindenlab.com/show/6902/ --- build.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 6677958716..d112e5ea1c 100755 --- a/build.sh +++ b/build.sh @@ -118,11 +118,12 @@ eval '$build_'"$arch" || pass # 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 - python scripts/update_version_files.py \ - --channel="$viewer_channel" \ - --server_channel="$server_channel" \ - --revision=$revision \ - --verbose \ + 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 end_section UpdateVer fi @@ -262,6 +263,9 @@ then upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream + echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json + upload_item installer summary.json text/plain + # Upload crash reporter files. case "$last_built_variant" in Release) -- cgit v1.3 From f5355e9580a9cb0d6397ed3dbea048ba2bcbdf8e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 May 2011 13:40:10 -0400 Subject: CHOP-599: create summary.json early enough to package with installer. viewer_manifest.py will now package a summary.json file, if present; but previously build.sh didn't create that file until after the viewer build. --- build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index d112e5ea1c..3d3f0d5616 100755 --- a/build.sh +++ b/build.sh @@ -125,6 +125,7 @@ if test -f scripts/update_version_files.py ; then --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 @@ -262,9 +263,7 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream - - echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > 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 -- cgit v1.3 From a8ba89eb41b5b0eabecf1d78cf0d5ac9f1b11117 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 3 May 2011 18:15:00 -0700 Subject: Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them. --- autobuild.xml | 3 --- build.sh | 1 - indra/cmake/00-Common.cmake | 7 +++++++ indra/cmake/Variables.cmake | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/autobuild.xml b/autobuild.xml index 7686b48cf5..5ced928668 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2125,7 +2125,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2203,7 +2202,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2280,7 +2278,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE diff --git a/build.sh b/build.sh index d112e5ea1c..b281814059 100755 --- a/build.sh +++ b/build.sh @@ -58,7 +58,6 @@ pre_build() "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \ - -DUSE_PRECOMPILED_HEADERS=FALSE \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \ -DGRID:STRING="\"$viewer_grid\"" \ diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 15b827b217..faffdc8ccd 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -36,6 +36,13 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) + # for "backwards compatibility", cmake sneaks in the Zm1000 option which royally + # screws incredibuild. this hack disables it. + # for details see: http://connect.microsoft.com/VisualStudio/feedback/details/368107/clxx-fatal-error-c1027-inconsistent-values-for-ym-between-creation-and-use-of-precompiled-headers + # http://www.ogre3d.org/forums/viewtopic.php?f=2&t=60015 + # http://www.cmake.org/pipermail/cmake/2009-September/032143.html + string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 03428691cf..2f23e7c307 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -151,7 +151,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both endif (LINUX AND SERVER AND VIEWER) -set(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Enable use of precompiled header directives where supported.") +set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") source_group("CMake Rules" FILES CMakeLists.txt) -- cgit v1.3