Fix Linux manpages for beta and unstable channels

R=thestig@chromium.org
TBR=dpranke@chromium.org

Change-Id: I87d84b80e0dd994cd11d684d7d9733b51a4058c6
Reviewed-on: https://chromium-review.googlesource.com/683455
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504478}

BUILD.gn

@@ -399,7 +399,6 @@ group("gn_all") {
   if (is_linux) {
     # The following are definitely linux-only.
     deps += [
-      "//chrome:manpage",
       "//chrome:xdg_mime",
       "//net:disk_cache_memory_test",
       "//net:quic_client",

chrome/BUILD.gn

@@ -260,7 +260,6 @@ if (!is_android && !is_mac) {
           # Chromium functionality directly into the executable.
           ":browser_dependencies",
           ":child_dependencies",
-          ":manpage",
 
           # Needed to use the master_preferences functions
           "//chrome/installer/util:with_no_strings",
@@ -1786,37 +1785,6 @@ if (enable_resource_whitelist_generation) {
 }
 
 if (is_linux) {
-  action("manpage") {
-    if (is_chrome_branded) {
-      name = "Google Chrome"
-      filename = "google-chrome"
-      confdir = "google-chrome"
-    } else {
-      name = "Chromium"
-      filename = "chromium-browser"
-      confdir = "chromium"
-    }
-
-    script = "//chrome/tools/build/linux/sed.py"
-    infile = "app/resources/manpage.1.in"
-    inputs = [
-      infile,
-    ]
-
-    outfile = "$root_out_dir/chrome.1"
-    outputs = [
-      outfile,
-    ]
-
-    args = [
-      rebase_path(infile, root_build_dir),
-      rebase_path(outfile, root_build_dir),
-      "-e s/@@NAME@@/$name/",
-      "-e s/@@FILENAME@@/$filename/",
-      "-e s/@@CONFDIR@@/$confdir/",
-    ]
-  }
-
   if (is_official_build) {
     action("linux_symbols") {
       script = "//build/linux/dump_app_syms.py"

chrome/app/resources/manpage.1.in

-." This file is processed by chrome.gyp to generate manpages in the
+." This file is processed to generate manpages in the
 ." build diretory.
-.TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
+.TH @@PACKAGE@@ 1 "" "" "USER COMMANDS"
 
 .SH NAME
-@@FILENAME@@ \- the web browser from Google
+@@PACKAGE@@ \- the web browser from Google
 
 .SH SYNOPSIS
-.B @@FILENAME@@
+.B @@PACKAGE@@
 [\fIOPTION\fR] [\fIPATH\fR|\fIURL\fR]
 
 .SH DESCRIPTION
@@ -17,16 +17,16 @@ See the Google Chrome help center for help on using the browser.
 This manpage only describes invocation, environment, and arguments.
 
 .SH OPTIONS
-@@NAME@@ has hundreds of undocumented command-line flags that are added
+@@MENUNAME@@ has hundreds of undocumented command-line flags that are added
 and removed at the whim of the developers.  Here, we document relatively
 stable flags.
 .TP
 \fB\-\-user\-data\-dir\fR=\fIDIR\fR
 Specifies the directory that user data (your "profile") is kept in.
 Defaults to
-.I ~/.config/@@CONFDIR@@ .
-Separate instances of @@NAME@@ must use separate user data directories;
-repeated invocations of @@FILENAME@@ will reuse an existing process for
+.I ~/.config/@@PACKAGE@@ .
+Separate instances of @@MENUNAME@@ must use separate user data directories;
+repeated invocations of @@PACKAGE@@ will reuse an existing process for
 a given user data directory.
 
 .TP
@@ -108,7 +108,7 @@ password store.  \fIgnome\fR selects Gnome keyring.  \fIkwallet\fR selects
 Show version information.
 
 .PP
-As a GTK+ app, @@NAME@@ also obeys GTK+ command-line flags, such
+As a GTK+ app, @@MENUNAME@@ also obeys GTK+ command-line flags, such
 as
 .BR \-\-display .
 See the GTK documentation for more:
@@ -117,7 +117,7 @@ See the GTK documentation for more:
 <http://library.gnome.org/devel/gtk/stable/gtk-x11.html>
 
 .SH ENVIRONMENT
-@@NAME@@ obeys the following environment variables:
+@@MENUNAME@@ obeys the following environment variables:
 
 .TP
 .B all_proxy
@@ -150,11 +150,11 @@ Comma separated list of hosts or patterns to bypass proxying.
 
 .SH FILES
 .TP
-.I ~/.config/@@CONFDIR@@
+.I ~/.config/@@PACKAGE@@
 Default directory for configuration data.
 
 .TP
-.I ~/.cache/@@CONFDIR@@
+.I ~/.cache/@@PACKAGE@@
 Default directory for cache data.  (Why?  See
 <http://standards.freedesktop.org/basedir-spec/latest/> .)
 

chrome/installer/linux/BUILD.gn

@@ -214,6 +214,7 @@ branding_dir_100 =
 copy("common_packaging_files") {
   visibility = [ ":*" ]
   sources = [
+    "//chrome/app/resources/manpage.1.in",
     "common/apt.include",
     "common/default-app-block.template",
     "common/default-app.template",

chrome/installer/linux/common/installer.include

@@ -284,8 +284,9 @@ stage_install_common() {
   chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
 
   # documentation
-  install -m 644 "${BUILDDIR}/${PROGNAME}.1" \
+  process_template "${BUILDDIR}/installer/common/manpage.1.in" \
     "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
+  chmod 644 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
 
   # Check to make sure all the ELF binaries are stripped.
   UNSTRIPPED=$(find "${STAGEDIR}/${INSTALLDIR}/" -type f | xargs file |

chrome/tools/build/linux/sed.py

-# 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.
-
-# Usage sed.py <infile> <outfile> [<other args>]
-#
-# Does the equivalent of
-#   sed <options> infile > outfile
-
-import sys
-import subprocess
-
-if len(sys.argv) <= 3:
-  print "Need at least 3 arguments to sed.py"
-  sys.exit(1)
-
-infile = sys.argv[1]
-outfile = sys.argv[2]
-
-sys.exit(subprocess.call('sed "' + '" "'.join(sys.argv[3:]) + '" ' + infile +
-                         ' > ' + outfile, shell=True))