summaryrefslogtreecommitdiffstats
path: root/mojo/services
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2015-04-03 00:54:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-03 07:55:58 +0000
commit9d3e2f9f0b3b88793d0118d3da7517f626c0feb9 (patch)
tree4e7fd7799876f4ded56d28b4eab1226682df7059 /mojo/services
parent8b77ff3463b017fa5ce0a900936cfc2fd607f492 (diff)
downloadchromium_src-9d3e2f9f0b3b88793d0118d3da7517f626c0feb9.zip
chromium_src-9d3e2f9f0b3b88793d0118d3da7517f626c0feb9.tar.gz
chromium_src-9d3e2f9f0b3b88793d0118d3da7517f626c0feb9.tar.bz2
Add version resource to html_viewer, and make sizeviewer a bit more generic
Adds a stub version resource to html_viewer. We'll want to generate this eventually, but that build file and supporting scripts are in chrome/ at the moment. (this is required for code_tally, which sizeviewer uses) Make sizeviewer.py show errors on failure. Make sizeviewer.py take an optional dll name rather than only looking in out\Release. R=jam@chromium.org TEST=python tools\win\sizeviewer\sizeviewer.py out\gn\html_viewer_library.dll Review URL: https://codereview.chromium.org/1059643002 Cr-Commit-Position: refs/heads/master@{#323676}
Diffstat (limited to 'mojo/services')
-rw-r--r--mojo/services/html_viewer/BUILD.gn4
-rw-r--r--mojo/services/html_viewer/html_viewer_version.rc46
2 files changed, 50 insertions, 0 deletions
diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
index 91577dc..1171631 100644
--- a/mojo/services/html_viewer/BUILD.gn
+++ b/mojo/services/html_viewer/BUILD.gn
@@ -119,6 +119,10 @@ source_set("lib") {
"//third_party/mojo_services/src/view_manager/public/cpp",
":generate_blink_resource_map",
]
+
+ if (is_win) {
+ sources += [ "html_viewer_version.rc" ]
+ }
}
if (is_android) {
diff --git a/mojo/services/html_viewer/html_viewer_version.rc b/mojo/services/html_viewer/html_viewer_version.rc
new file mode 100644
index 0000000..1626afa
--- /dev/null
+++ b/mojo/services/html_viewer/html_viewer_version.rc
@@ -0,0 +1,46 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <verrsrc.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "CompanyName", "The Chromium Authors"
+ VALUE "FileDescription", "Chromium"
+ VALUE "FileVersion", "1.0.0.0"
+ VALUE "InternalName", "html_viewer_dll"
+ VALUE "LegalCopyright", "Copyright 2015 The Chromium Authors. All rights reserved."
+ VALUE "OriginalFilename", "html_viewer.mojo"
+ VALUE "ProductName", "Chromium"
+ VALUE "ProductVersion", "1.0.0.0"
+ VALUE "CompanyShortName", "The Chromium Authors"
+ VALUE "ProductShortName", "Chromium"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+