diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2012-01-09 23:20:22 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2012-01-09 23:20:22 +0400 |
commit | 8b28d599a72e717dc00d10f2cc68e64ac6fd5330 (patch) | |
tree | 2932f7ead998ede43835a00f4b7cf5920e4d4816 /vcbuild.bat | |
parent | 08a91acd76cd107dc2f3914f9ea7e277bb85206e (diff) | |
parent | cc5cea35b0e25352ff40780532d4c5a6bba00359 (diff) |
Merge remote branch 'origin/v0.6'
Conflicts:
Makefile
configure
src/node_version.h
Diffstat (limited to 'vcbuild.bat')
-rw-r--r-- | vcbuild.bat | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 952c043e48c..72e5d354230 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -17,6 +17,7 @@ set target=Build set noprojgen= set nobuild= set nosign= +set nosnapshot= set test= set test_args= set msi= @@ -30,6 +31,7 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok if /i "%1"=="nobuild" set nobuild=1&goto arg-ok if /i "%1"=="nosign" set nosign=1&goto arg-ok +if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok if /i "%1"=="test-uv" set test=test-uv&goto arg-ok if /i "%1"=="test-internet"set test=test-internet&goto arg-ok if /i "%1"=="test-pummel" set test=test-pummel&goto arg-ok @@ -53,10 +55,18 @@ if defined upload goto upload if defined noprojgen goto msbuild @rem Generate the VS project. +if defined nosnapshot goto nosnapshotgen python tools\gyp_node -f msvs -G msvs_version=2010 if errorlevel 1 goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed echo Project files generated. +goto msbuild + +:nosnapshotgen +python tools\gyp_node -f msvs -G msvs_version=2010 -D v8_use_snapshot='false' +if errorlevel 1 goto create-msvs-files-failed +if not exist node.sln goto create-msvs-files-failed +echo Project files generated. :msbuild @rem Skip project generation if requested. |