Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
ce760e80
Commit
ce760e80
authored
8 years ago
by
Glenn Glazer
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-6413: write summary.json from viewer_manifest.py, remove facility from cmake
parent
999a949b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/CMakeLists.txt
+5
-0
5 additions, 0 deletions
indra/newview/CMakeLists.txt
indra/newview/viewer_manifest.py
+10
-5
10 additions, 5 deletions
indra/newview/viewer_manifest.py
with
15 additions
and
5 deletions
indra/newview/CMakeLists.txt
+
5
−
0
View file @
ce760e80
...
...
@@ -1308,6 +1308,11 @@ set(viewer_HEADER_FILES
source_group
(
"CMake Rules"
FILES ViewerInstall.cmake
)
#summary.json creation moved to viewer_manifest.py MAINT-6413
# the viewer_version.txt file created here is for passing to viewer_manifest and autobuild
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
)
set_source_files_properties
(
llversioninfo.cpp tests/llversioninfo_test.cpp
...
...
This diff is collapsed.
Click to expand it.
indra/newview/viewer_manifest.py
+
10
−
5
View file @
ce760e80
...
...
@@ -30,6 +30,7 @@
import
os.path
import
shutil
import
errno
import
json
import
re
import
tarfile
import
time
...
...
@@ -122,9 +123,6 @@ 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
),
...
...
@@ -184,9 +182,16 @@ def construct(self):
self
.
path
(
"
*.tga
"
)
self
.
end_prefix
(
"
local_assets
"
)
# File
s
in the newview/ directory
# File in the newview/ directory
self
.
path
(
"
gpu_table.txt
"
)
# The summary.json file gets left in the build directory by newview/CMakeLists.txt.
#summary.json. Standard with exception handling is fine. If we can't open a new file for writing, we have worse problems
summary_dict
=
{
"
Type
"
:
"
viewer
"
,
"
Version
"
:
'
.
'
.
join
(
self
.
args
[
'
version
'
]),
"
Channel
"
:
self
.
channel_with_pkg_suffix
()}
with
open
(
os
.
path
.
join
(
os
.
pardir
,
'
summary.json
'
),
'
w
'
)
as
summary_handle
:
json
.
dump
(
summary_dict
,
summary_handle
)
#we likely no longer need the test, since we will throw an exception above, but belt and suspenders and we get the
#return code for free.
if
not
self
.
path2basename
(
os
.
pardir
,
"
summary.json
"
):
print
"
No summary.json file
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment