summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BuildParams9
-rwxr-xr-xbuild.sh4
2 files changed, 8 insertions, 5 deletions
diff --git a/BuildParams b/BuildParams
index fe6e77151a..502abcf58d 100644
--- a/BuildParams
+++ b/BuildParams
@@ -155,8 +155,7 @@ media.build_viewer_update_version_manager = false
# oz
# ================
-oz_viewer-devreview.build_debug_release_separately = true
-oz_viewer-autobuild2010.build_debug_release_separately = true
+viewer-devreview.build_debug_release_separately = true
# ========================================
# enus
@@ -193,7 +192,11 @@ viewer-asset-delivery-metrics.build_server_tests = false
#==============================================================================
# autobuild viewers
#==============================================================================
-viewer-autobuild.build_link_parallel = false
+viewer-autobuild2010.build_debug_release_separately = true
+viewer-autobuild2010.viewer_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.login_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.viewer_grid = agni
+viewer-autobuild2010.build_link_parallel = false
#========================================
# VS2010
diff --git a/build.sh b/build.sh
index 9801726448..bb645b4d7e 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
- "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE -DVIEWER_CHANNEL:STRING="$viewer_channel"
+ "$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\""
end_section "Pre$variant"
}
@@ -61,7 +61,7 @@ build()
if $build_viewer
then
begin_section "Viewer$variant"
- if "$AUTOBUILD" build -c $variant
+ if "$AUTOBUILD" build --no-configure -c $variant
then
echo true >"$build_dir"/build_ok
else