diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-03-05 11:05:50 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-03-05 14:43:27 -0800 |
| commit | f9ba9f7badf40ad6360526095b7bec8e3319752b (patch) | |
| tree | eddc8f99f9b19c0dead92e8223e98b931f8ce8c6 | |
| parent | 312289b791a5924eec5748fbd19ad6867ff37320 (diff) | |
| download | node-new-f9ba9f7badf40ad6360526095b7bec8e3319752b.tar.gz | |
build: define nightly tag external to build system
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | vcbuild.bat | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -225,8 +225,8 @@ ARCH=x86 endif endif TARNAME=node-$(VERSION) -ifeq ($(NIGHTLY),1) -TAG = nightly-$(shell date "+%Y%m%d") +ifdef NIGHTLY +TAG = nightly-$(NIGHTLY) TARNAME=node-$(VERSION)-$(TAG) endif TARBALL=$(TARNAME).tar.gz @@ -251,7 +251,7 @@ release-only: echo "" >&2 ; \ exit 1 ; \ fi - @if [ "$(NIGHTLY)" = "1" -o "$(RELEASE)" = "1" ]; then \ + @if [ "$(NIGHTLY)" != "" -o "$(RELEASE)" = "1" ]; then \ exit 0; \ else \ echo "" >&2 ; \ diff --git a/vcbuild.bat b/vcbuild.bat index 82bec7b644..5bc63396ed 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -84,10 +84,12 @@ if defined noperfctr set noperfctr_arg=--without-perfctr& set noperfctr_msi_arg= @rem Skip project generation if requested. if defined noprojgen goto msbuild +if defined NIGHTLY set TAG=nightly-%NIGHTLY% + @rem Generate the VS project. SETLOCAL if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat" - python configure %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% + python configure %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG% if errorlevel 1 goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed echo Project files generated. @@ -133,7 +135,7 @@ if not defined msi goto run call :getnodeversion if not defined NIGHTLY goto msibuild -set NODE_VERSION=%NODE_VERSION%-%date:~10,4%%date:~4,2%%date:~7,2% +set NODE_VERSION=%NODE_VERSION%.%NIGHTLY% :msibuild echo Building node-%NODE_VERSION% |