summaryrefslogtreecommitdiffstats
path: root/rlz
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-16 19:43:00 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-16 19:43:00 +0000
commit4ed077a820dca166e3e2bf9785311331df0190b0 (patch)
tree9d6e57c77afb0449d53ab6b42c1f83d1e388620a /rlz
parent49bd49a6438dccf100904804f1675d13e31a8d97 (diff)
downloadchromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.zip
chromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.tar.gz
chromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.tar.bz2
- Stop rlz from constantly "rebuilding".
- Changes dependencies from rlz browser interactive_ui_tests unit_tests to rlz interactive_ui_tests mini_installer unit_tests Review URL: http://codereview.chromium.org/10760 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz')
-rw-r--r--rlz/copy_files.bat6
-rw-r--r--rlz/output_rlz_copy.rules6
-rw-r--r--rlz/rlz.vcproj6
3 files changed, 7 insertions, 11 deletions
diff --git a/rlz/copy_files.bat b/rlz/copy_files.bat
index 022c54f..ebc5382 100644
--- a/rlz/copy_files.bat
+++ b/rlz/copy_files.bat
@@ -6,8 +6,4 @@ setlocal
set InputPath=%~1
set OutDir=%~2
-if NOT "%CHROMIUM_BUILD%" == "_google_chrome" goto END
-
-xcopy /R /C /Y %InputPath% %OutDir%
-
-:END
+if exist "%InputPath%" xcopy /R /C /Y "%InputPath%" "%OutDir%"
diff --git a/rlz/output_rlz_copy.rules b/rlz/output_rlz_copy.rules
index 40c1dff..1120d76 100644
--- a/rlz/output_rlz_copy.rules
+++ b/rlz/output_rlz_copy.rules
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile
Name="Output RLZ copy"
Version="8.00"
@@ -6,9 +6,11 @@
<Rules>
<CustomBuildRule
Name="Output RLZ copy"
- CommandLine="$(SolutionDir)..\rlz\copy_files.bat $(ProjectDir)Binaries\* $(OutDir)"
+ DisplayName="Output RLZ copy"
+ CommandLine="$(SolutionDir)..\rlz\copy_files.bat &quot;$(InputPath)&quot; &quot;$(OutDir)&quot;"
Outputs="$(OutDir)\$(InputFileName)"
FileExtensions="*.dll;*.pdb"
+ ExecutionDescription="Executing tool..."
>
<Properties>
</Properties>
diff --git a/rlz/rlz.vcproj b/rlz/rlz.vcproj
index 777ce87..560ada7 100644
--- a/rlz/rlz.vcproj
+++ b/rlz/rlz.vcproj
@@ -20,9 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)"
ConfigurationType="10"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,9 +41,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)"
ConfigurationType="10"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops"
>
<Tool
Name="VCPreBuildEventTool"