summaryrefslogtreecommitdiffstats
path: root/chrome/installer/mini_installer
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 21:03:41 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 21:03:41 +0000
commit3a5d1445f4ef045d4f8bd24f5dbcf91dc9b96a3e (patch)
tree70f2d5517b5b31e3fbf1bbe397af96ec2fcb30d8 /chrome/installer/mini_installer
parentd33a6be8c0f19347a6ae1d65cb0796b2f67433b3 (diff)
downloadchromium_src-3a5d1445f4ef045d4f8bd24f5dbcf91dc9b96a3e.zip
chromium_src-3a5d1445f4ef045d4f8bd24f5dbcf91dc9b96a3e.tar.gz
chromium_src-3a5d1445f4ef045d4f8bd24f5dbcf91dc9b96a3e.tar.bz2
Pick up extensions (if any) and extensions definitions file for installation.
BUG=14201 Review URL: http://codereview.chromium.org/147092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer')
-rw-r--r--chrome/installer/mini_installer/chrome.release1
-rw-r--r--chrome/installer/mini_installer/mini_installer.vcproj8
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 99a697a..8ed0408 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -39,6 +39,7 @@ locales\*.dll: %(VersionDir)s\Locales
Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector
Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images
servers\*.dll: %(VersionDir)s\
+Extensions\*.*: %(VersionDir)s\Extensions\
[GOOGLE_CHROME]
av*.dll: %(VersionDir)s\
diff --git a/chrome/installer/mini_installer/mini_installer.vcproj b/chrome/installer/mini_installer/mini_installer.vcproj
index abe312a..0d5aad4 100644
--- a/chrome/installer/mini_installer/mini_installer.vcproj
+++ b/chrome/installer/mini_installer/mini_installer.vcproj
@@ -27,6 +27,10 @@
InheritedPropertySheets=".\mini_installer_debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="mkdir &quot;$(OutDir)\Extensions&quot; &amp;&amp; copy &quot;$(SolutionDir)browser\extensions\external_extensions.json&quot; &quot;$(OutDir)\Extensions&quot;"
+ />
+ <Tool
Name="Create Installer Archive"
LastChromeInstaller="$(LAST_CHROME_INSTALLER)"
SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)"
@@ -55,6 +59,10 @@
InheritedPropertySheets=".\mini_installer_release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="&quot;mkdir $(OutDir)\Extensions&quot; &amp;&amp; copy &quot;$(SolutionDir)browser\extensions\external_extensions.json&quot; &quot;$(OutDir)\Extensions&quot;"
+ />
+ <Tool
Name="Create Installer Archive"
LastChromeInstaller="$(LAST_CHROME_INSTALLER)"
SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)"