1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: define nightly tag external to build system

Browse Source
This commit is contained in:
Timothy J Fontaine 2013-03-05 11:05:50 -08:00 committed by isaacs
parent 312289b791
commit f9ba9f7bad
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -225,8 +225,8 @@ ARCH=x86
endif endif
endif endif
TARNAME=node-$(VERSION) TARNAME=node-$(VERSION)
ifeq ($(NIGHTLY),1) ifdef NIGHTLY
TAG = nightly-$(shell date "+%Y%m%d") TAG = nightly-$(NIGHTLY)
TARNAME=node-$(VERSION)-$(TAG) TARNAME=node-$(VERSION)-$(TAG)
endif endif
TARBALL=$(TARNAME).tar.gz TARBALL=$(TARNAME).tar.gz
@ -251,7 +251,7 @@ release-only:
echo "" >&2 ; \ echo "" >&2 ; \
exit 1 ; \ exit 1 ; \
fi fi
@if [ "$(NIGHTLY)" = "1" -o "$(RELEASE)" = "1" ]; then \ @if [ "$(NIGHTLY)" != "" -o "$(RELEASE)" = "1" ]; then \
exit 0; \ exit 0; \
else \ else \
echo "" >&2 ; \ echo "" >&2 ; \

6
vcbuild.bat
View File

@ -84,10 +84,12 @@ if defined noperfctr set noperfctr_arg=--without-perfctr& set noperfctr_msi_arg=
@rem Skip project generation if requested. @rem Skip project generation if requested.
if defined noprojgen goto msbuild if defined noprojgen goto msbuild
if defined NIGHTLY set TAG=nightly-%NIGHTLY%
@rem Generate the VS project. @rem Generate the VS project.
SETLOCAL SETLOCAL
if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat" 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 errorlevel 1 goto create-msvs-files-failed
if not exist node.sln goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed
echo Project files generated. echo Project files generated.
@ -133,7 +135,7 @@ if not defined msi goto run
call :getnodeversion call :getnodeversion
if not defined NIGHTLY goto msibuild 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 :msibuild
echo Building node-%NODE_VERSION% echo Building node-%NODE_VERSION%