diff options
author | Matt Gollob <mattgollob@gmail.com> | 2012-06-01 06:44:10 +0400 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2012-06-02 04:18:09 +0400 |
commit | 9fe39ede9f014a0e5a8f3d85d5373743188cea81 (patch) | |
tree | 71f161aaecbd655f5ddce38cb95c88558032b27c /vcbuild.bat | |
parent | 8a52a168473f57e0fbcd8de794e9da6529c5ca2a (diff) |
windows: don't install x64 version into the 'program files (x86)' folder
* Update nodemsi.sln and .wixproj to include support for x64 platform
- Add ProgramFilesFolderId to the DefineConstants property for each
configuration/platform's property group with the appropriate value
(ProgramFilesFolder for x86 builds, ProgramFiles64Folder for x64
builds)
* Update product.wxs:
- update the Id value for the "Program Files" Directory element to
use a preprocessor constant.
- remove hard-coded platform from the Package element. MSI platform
will be automatically detected based on MSBuild's Platform property.
(This was already supported in the Wix MSBuild targets, we just
weren't taking advantage of it.)
* Update vcbuild.bat to set MSBuild's Platform property appropriately,
defaulting to x86 if not explicitly supplied by the user. Note that
creating an x64 build requires that vcbuild.bat be run from a VS
64-bit command prompt.
Closes #3312
Closes #3356
Diffstat (limited to 'vcbuild.bat')
-rw-r--r-- | vcbuild.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 92eef6feb65..b417f680f15 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -13,6 +13,7 @@ if /i "%1"=="/?" goto help @rem Process arguments. set config=Release +set msiplatform=x86 set target=Build set target_arch=ia32 set debug_arg= @@ -62,6 +63,7 @@ if defined upload goto upload if defined jslint goto jslint if "%config%"=="Debug" set debug_arg=--debug +if "%target_arch%"=="x64" set msiplatform=x64 if defined nosnapshot set nosnapshot_arg=--without-snapshot :project-gen @@ -115,7 +117,7 @@ python "%~dp0tools\getnodeversion.py" > "%temp%\node_version.txt" if not errorlevel 0 echo Cannot determine current version of node.js & goto exit for /F "tokens=*" %%i in (%temp%\node_version.txt) do set NODE_VERSION=%%i heat dir deps\npm -var var.NPMSourceDir -dr NodeModulesFolder -cg NPMFiles -gg -template fragment -nologo -out npm.wxs -msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo +msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:Configuration=%config% /p:Platform=%msiplatform% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo if errorlevel 1 goto exit if defined nosign goto run @@ -166,7 +168,7 @@ python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --noj goto exit :help -echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [nobuild] [nosign] +echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [nobuild] [nosign] [x86/x64] echo Examples: echo vcbuild.bat : builds release build echo vcbuild.bat debug : builds debug build |