From f456885e76a8d24c096bd5bd114ea6b2ac36ad81 Mon Sep 17 00:00:00 2001
From: Yuchen Zeng <zyc@google.com>
Date: Tue, 16 Aug 2016 23:15:03 -0700
Subject: [PATCH] Fix node on windows
---
src/c-ares/gen_build_yaml.py | 1 +
templates/package.json.template | 2 +-
tools/run_tests/sources_and_headers.json | 1 +
vsprojects/vcxproj/ares/ares.vcxproj | 1 +
vsprojects/vcxproj/ares/ares.vcxproj.filters | 3 +++
5 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/c-ares/gen_build_yaml.py b/src/c-ares/gen_build_yaml.py
index 33ad44eebf..ae61c7856a 100755
--- a/src/c-ares/gen_build_yaml.py
+++ b/src/c-ares/gen_build_yaml.py
@@ -136,6 +136,7 @@ try:
"third_party/c-ares/ares_strdup.h",
"third_party/c-ares/ares_version.h",
"third_party/c-ares/bitncmp.h",
+ "third_party/c-ares/config-win32.h",
"third_party/c-ares/setup_once.h",
"src/c-ares/ares_build.h",
"src/c-ares/config_linux/ares_config.h",
diff --git a/templates/package.json.template b/templates/package.json.template
index 6891e16317..d0150f6bf8 100644
--- a/templates/package.json.template
+++ b/templates/package.json.template
@@ -25,7 +25,7 @@
"test": "./node_modules/.bin/mocha src/node/test && npm run-script lint",
"gen_docs": "./node_modules/.bin/jsdoc -c src/node/jsdoc_conf.json",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test",
- "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build --library='static_library'"
+ "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build --library=static_library"
},
"bundledDependencies": ["node-pre-gyp"],
"dependencies": {
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index a186f55b55..4103ff7b92 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5409,6 +5409,7 @@
"third_party/c-ares/ares_strdup.h",
"third_party/c-ares/ares_version.h",
"third_party/c-ares/bitncmp.h",
+ "third_party/c-ares/config-win32.h",
"third_party/c-ares/setup_once.h"
],
"language": "c",
diff --git a/vsprojects/vcxproj/ares/ares.vcxproj b/vsprojects/vcxproj/ares/ares.vcxproj
index eb2f369d83..3a0b179684 100644
--- a/vsprojects/vcxproj/ares/ares.vcxproj
+++ b/vsprojects/vcxproj/ares/ares.vcxproj
@@ -166,6 +166,7 @@
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\ares_strdup.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\ares_version.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\bitncmp.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\c-ares\config-win32.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\setup_once.h" />
<ClInclude Include="$(SolutionDir)\..\src\c-ares\ares_build.h" />
<ClInclude Include="$(SolutionDir)\..\src\c-ares\config_linux\ares_config.h" />
diff --git a/vsprojects/vcxproj/ares/ares.vcxproj.filters b/vsprojects/vcxproj/ares/ares.vcxproj.filters
index b733289163..47378f17ce 100644
--- a/vsprojects/vcxproj/ares/ares.vcxproj.filters
+++ b/vsprojects/vcxproj/ares/ares.vcxproj.filters
@@ -207,6 +207,9 @@
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\bitncmp.h">
<Filter>third_party\c-ares</Filter>
</ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\c-ares\config-win32.h">
+ <Filter>third_party\c-ares</Filter>
+ </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\c-ares\setup_once.h">
<Filter>third_party\c-ares</Filter>
</ClInclude>
--
GitLab