From 999a949b52b50d5330c717fde19af3931e256f11 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Mon, 23 May 2016 13:49:26 -0700
Subject: [PATCH] debug version args
---
indra/newview/CMakeLists.txt | 9 +--------
indra/newview/viewer_manifest.py | 3 +++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4412b06d38b..6734f62137e 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1307,14 +1307,7 @@ set(viewer_HEADER_FILES
source_group("CMake Rules" FILES ViewerInstall.cmake)
-# the viewer_version.txt file created here is for passing to viewer_manifest and autobuild
-# the summary.json file is created for the benefit of the TeamCity builds, where
-# it is used to provide descriptive information to the build results page
-add_custom_target(generate_viewer_version ALL
- COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
- COMMENT Generating viewer_version.txt for manifest processing
- )
-
+#summary.json creation moved to viewer_manifest.py MAINT-6413
set_source_files_properties(
llversioninfo.cpp tests/llversioninfo_test.cpp
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1c77cf805e9..6365de00244 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -122,6 +122,9 @@ def construct(self):
settings_install['CmdLineGridChoice']['Value'] = self.grid()
print "Set CmdLineGridChoice in settings_install.xml to '%s'" % self.grid()
+ #COYOT: channel: self.channel_with_pkg_suffix()
+ print "COYOT: version %s" % '.'.join(self.args['version'])
+
# put_in_file(src=) need not be an actual pathname; it
# only needs to be non-empty
self.put_in_file(llsd.format_pretty_xml(settings_install),
--
GitLab