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 22:16:17 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 22:16:17 +0000
commit16792a730c621ed32aa53b57d57e6c88e232ea02 (patch)
tree5cb98774a78328e30f6d9a0eaffef6fb5d9bd6e6 /chrome/installer/mini_installer
parentcc02d035d6fbb07380d13cb127cdda56309b38fd (diff)
downloadchromium_src-16792a730c621ed32aa53b57d57e6c88e232ea02.zip
chromium_src-16792a730c621ed32aa53b57d57e6c88e232ea02.tar.gz
chromium_src-16792a730c621ed32aa53b57d57e6c88e232ea02.tar.bz2
Try to reland r19170 (Pick up extensions (if any) and extensions
definitions file for installation.) Review URL: http://codereview.chromium.org/146109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19182 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..cf7f42c 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="IF NOT EXIST &quot;$(OutDir)\Extensions&quot; mkdir &quot;$(OutDir)\Extensions&quot; &amp;&amp; copy /Y &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="IF NOT EXIST &quot;$(OutDir)\Extensions&quot; mkdir &quot;$(OutDir)\Extensions&quot; &amp;&amp; copy /Y &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)"