Revert 110934 - Retry of http://codereview.chromium.org/8589029.

Start of mini_installer build config refactoring.
Baby step one: 
- All intermediate files go into the intermediate directory.
- The packed_files.txt file is gone, and instead the mini_installer
  is baked from a resource file output into the intermediate dir.
- Cleanup use of implict global "options" in the python script.
- Use subprocess.call with a list instead of os.system.

R=robertshield@chromium.org,grt@chromium.org
BUG=102115


Review URL: http://codereview.chromium.org/8600008

TBR=siggi@chromium.org
Review URL: http://codereview.chromium.org/8575019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110936 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 25 insertions, 7 deletions

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 822a085c..4f73b98 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -22,6 +22,7 @@
         ],
         'include_dirs': [
           '../..',
+          '<(PRODUCT_DIR)',
           '<(INTERMEDIATE_DIR)',
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
@@ -41,7 +42,6 @@
           'mini_installer/mini_string.h',
           'mini_installer/pe_resource.cc',
           'mini_installer/pe_resource.h',
-          '<(INTERMEDIATE_DIR)/packed_files.rc',
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -209,15 +209,13 @@
                 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
                 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
                 '<(PRODUCT_DIR)/setup.ex_',
-                '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '<(PRODUCT_DIR)/packed_files.txt',
               ],
               'action': [
                 'python',
                 '<(create_installer_archive_py_path)',
-                '--build_dir', '<(PRODUCT_DIR)',
-                '--staging_dir', '<(INTERMEDIATE_DIR)',
-                '--input_file', '<(RULE_INPUT_PATH)',
-                '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '--output_dir=<(PRODUCT_DIR)',
+                '--input_file=<(RULE_INPUT_PATH)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
diff --git a/chrome/installer/mini_installer/mini_installer.rc b/chrome/installer/mini_installer/mini_installer.rc
index fff6a53..420dea9 100644
--- a/chrome/installer/mini_installer/mini_installer.rc
+++ b/chrome/installer/mini_installer/mini_installer.rc
@@ -49,7 +49,28 @@ BEGIN
     "#undef APSTUDIO_HIDDEN_SYMBOL\0"
 END
 
+3 TEXTINCLUDE 
+BEGIN
+    "#include ""mini_installer_exe_version.rc""\r\0"
+END
+
 #endif    // APSTUDIO_INVOKED
 
+// This file lists the resources that are going to be packed with the exe.
+#include "packed_files.txt"
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#include "mini_installer_exe_version.rc"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/chrome/installer/mini_installer/mini_installer_exe_version.rc.version b/chrome/installer/mini_installer/mini_installer_exe_version.rc.version
index c15cfc3..3b024d1 100644
--- a/chrome/installer/mini_installer/mini_installer_exe_version.rc.version
+++ b/chrome/installer/mini_installer/mini_installer_exe_version.rc.version
@@ -2,7 +2,6 @@
 //
 // Version
 //
-#include "verrsrc.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@