Updates to Visual Studio project generation to accomodate
recent changes and get rid of cut-and-paste:
* Add generation of the new net_resource.vcproj file.
* Accomodate the net\net.vsprops file.
* New base.vcproj dependency in activex_shim_dll.vcproj.
* New tld_cleanup.vcproj dependency in net.vcproj.
* New ondemand_updates.vcproj dependencies in
gcapi_{dll,lib}.vcproj.
* Re-order dump_cache.vcproj dependencies to match new
checked-in solutions.
* New input file directory layout in zlib (minizip folder)
and testing\gtest (hierarchy).
* Use a new dest= argument to ChromeMSVSSolution()
and ChromeMSVSProject() to get rid of cut-and-pste
installation code, and provide a central point for
controlling when/whether we want to generate the files
only under the build directory, or drop them in place
for checking in.
* Comment out an unnecessarily verbose warning if the
buildtarget is executed with an action that we don't
map to specific Visual Studio settings. Sometimes
this is normal and okay, but the warning should get
restored at some point when we work out the precise
conditions under which it makes sense.
Review URL: http://codereview.chromium.org/17602
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a7ad74b14339ca330c491631ba27e0aaffbe6429
diff --git a/zlib.scons b/zlib.scons
index c62aeb4..74eed17 100644
--- a/zlib.scons
+++ b/zlib.scons
@@ -27,7 +27,18 @@
],
)
+minizip_filter = MSVSFilter('minizip', [
+ 'contrib/minizip/ioapi.c',
+ 'contrib/minizip/ioapi.h',
+ 'contrib/minizip/iowin32.c',
+ 'contrib/minizip/iowin32.h',
+ 'contrib/minizip/unzip.c',
+ 'contrib/minizip/unzip.h'
+])
+
input_files = ChromeFileList([
+ minizip_filter,
+
'adler32.c',
'compress.c',
'crc32.c',
@@ -51,17 +62,13 @@
'zlib.h',
'zutil.c',
'zutil.h',
- 'contrib/minizip/ioapi.c',
- 'contrib/minizip/ioapi.h',
- 'contrib/minizip/unzip.c',
- 'contrib/minizip/unzip.h'
])
-if env.Bit('windows'):
- input_files.extend([
+if not env.Bit('windows'):
+ input_files.Remove(
'contrib/minizip/iowin32.c',
'contrib/minizip/iowin32.h',
- ])
+ )
if env.Bit('posix'):
env.Append(
@@ -74,6 +81,7 @@
env.ChromeLibrary('zlib', input_files)
p = env.ChromeMSVSProject('zlib.vcproj',
+ dest='$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj',
guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}',
files=input_files,
relative_path_prefix=r'./',
@@ -99,9 +107,3 @@
'$(SolutionDir)../build/external_code.vsprops',
'./zlib.vsprops'
])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p,
- Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)