Skip to content

Commit

Permalink
etw,build: always generate .rc and .h files
Browse files Browse the repository at this point in the history
We can assume the Windows SDK is installed, hence the intermediate
files generated from manifest should not be part of the source tree.
This also fixes incorrect detection of ctrpp.exe, that should be in
the path.

PR-URL: nodejs#5657
Reviewed-By: Alexis Campailla <[email protected]>
  • Loading branch information
joaocgreis committed Mar 29, 2016
1 parent b6475b9 commit ccd8188
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 173 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ ipch/
/dist-osx
/npm.wxs
/tools/msvs/npm.wixobj
/tools/msvs/genfiles/
/tools/osx-pkg.pmdoc/index.xml
/test/addons/??_*/
email.md
Expand Down
16 changes: 0 additions & 16 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -846,21 +846,6 @@ def configure_static(o):
o['libraries'] += ['-static-libasan']


def configure_winsdk(o):
if flavor != 'win':
return

winsdk_dir = os.environ.get('WindowsSdkDir')

if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
print('Found ctrpp in WinSDK--will build generated files '
'into tools/msvs/genfiles.')
o['variables']['node_has_winsdk'] = 'true'
return

print('ctrpp not found in WinSDK path--using pre-gen files '
'from tools/msvs/genfiles.')

def write(filename, data):
filename = os.path.join(root_dir, filename)
print 'creating ', filename
Expand Down Expand Up @@ -1139,7 +1124,6 @@ configure_library('http_parser', output)
configure_library('libuv', output)
configure_v8(output)
configure_openssl(output)
configure_winsdk(output)
configure_intl(output)
configure_static(output)

Expand Down
5 changes: 2 additions & 3 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
'node_use_etw%': 'false',
'node_use_perfctr%': 'false',
'node_no_browser_globals%': 'false',
'node_has_winsdk%': 'false',
'node_shared_zlib%': 'false',
'node_shared_http_parser%': 'false',
'node_shared_libuv%': 'false',
Expand Down Expand Up @@ -471,7 +470,7 @@
'target_name': 'node_etw',
'type': 'none',
'conditions': [
[ 'node_use_etw=="true" and node_has_winsdk=="true"', {
[ 'node_use_etw=="true"', {
'actions': [
{
'action_name': 'node_etw',
Expand All @@ -492,7 +491,7 @@
'target_name': 'node_perfctr',
'type': 'none',
'conditions': [
[ 'node_use_perfctr=="true" and node_has_winsdk=="true"', {
[ 'node_use_perfctr=="true"', {
'actions': [
{
'action_name': 'node_perfctr_man',
Expand Down
Binary file removed tools/msvs/genfiles/MSG00001.bin
Binary file not shown.
59 changes: 0 additions & 59 deletions tools/msvs/genfiles/node_etw_provider.h

This file was deleted.

3 changes: 0 additions & 3 deletions tools/msvs/genfiles/node_etw_provider.rc

This file was deleted.

Binary file removed tools/msvs/genfiles/node_etw_providerTEMP.BIN
Binary file not shown.
92 changes: 0 additions & 92 deletions tools/msvs/genfiles/node_perfctr_provider.h

This file was deleted.

Binary file removed tools/msvs/genfiles/node_perfctr_provider.rc
Binary file not shown.

0 comments on commit ccd8188

Please sign in to comment.