Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

win, build: add node.lib file into headers package #6600

Closed
wants to merge 2 commits into from
Closed

win, build: add node.lib file into headers package #6600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d65f17
build: add node.exp and node.lib files to tar-headers
gibfahn May 4, 2016
60210c9
build: add vcbuild tar-headers target
gibfahn May 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,13 @@ def headers(action):
], 'include/node/')

# Add the expfile that is created on AIX
if sys.platform.startswith('aix'):
if os.path.isfile('out/Release/node.exp'):
action(['out/Release/node.exp'], 'include/node/')

# Add the x64 windows libfile
if os.path.isfile('Release/node.lib'):
action(['Release/node.lib'], 'include/node/')

subdir_files('deps/v8/include', 'include/node/', action)

if 'false' == variables.get('node_shared_cares'):
Expand Down
14 changes: 14 additions & 0 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ set nosnapshot=
set test_args=
set msi=
set upload=
set tar_headers=
set licensertf=
set jslint=
set buildnodeweak=
Expand Down Expand Up @@ -55,6 +56,7 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
if /i "%1"=="noetw" set noetw=1&goto arg-ok
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
if /i "%1"=="tar-headers" set tar_headers=1&goto arg-ok
if /i "%1"=="test" set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool known_issues message sequential parallel&set build_addons=1&goto arg-ok
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
Expand Down Expand Up @@ -246,6 +248,17 @@ ssh -F %SSHCONFIG% %STAGINGSERVER% "touch nodejs/%DISTTYPEDIR%/v%FULLVERSION%/no
:run
@rem Run tests if requested.

:tar-headers
@rem build headers package
if "%tar_headers%"=="" goto build-node-weak
set HEADERS_ONLY=1
set TARNAME=node-%FULLVERSION%
python tools\install.py install %TARNAME% ""
7z a %TARNAME%-headers.tar %TARNAME%
rmdir /s /q %TARNAME%
7z a %TARNAME%-headers.tar.gz %TARNAME%-headers.tar
del %TARNAME%-headers.tar
Copy link
Member

@joaocgreis joaocgreis May 13, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A zip and 7z would be better (similar to the gz and xz on unix). We did some work to find the best flags for 7z: https://github.com/janeasystems/node/blob/36b525a78119a1fc3af9a6934762b4cee0f78a5c/vcbuild.bat#L243-L251


:build-node-weak
@rem Build node-weak if required
if "%buildnodeweak%"=="" goto build-addons
Expand Down Expand Up @@ -316,6 +329,7 @@ echo Examples:
echo vcbuild.bat : builds release build
echo vcbuild.bat debug : builds debug build
echo vcbuild.bat release msi : builds release build and MSI installer package
echo vcbuild.bat tar-headers : builds header package with node.lib
echo vcbuild.bat test : builds debug build and runs tests
echo vcbuild.bat build-release : builds the release distribution as used by nodejs.org
echo vcbuild.bat enable-vtune : builds nodejs with Intel VTune profiling support to profile JavaScript
Expand Down