diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/package.json.template | 22 | ||||
| -rw-r--r-- | templates/src/csharp/build_packages.bat.template | 13 | ||||
| -rw-r--r-- | templates/tools/fuzzer/runners.template | 8 |
3 files changed, 21 insertions, 22 deletions
diff --git a/templates/package.json.template b/templates/package.json.template index 9085740f98..5db270608b 100644 --- a/templates/package.json.template +++ b/templates/package.json.template @@ -63,20 +63,14 @@ "src/node/health_check", "src/proto", "etc", - % for module in node_modules: - % for file in module.headers + module.src + module.js: - "${file}", - % endfor - % for dep in module.transitive_deps: - % for lib in libs: - % if lib.name == dep: - % for file in lib.get('public_headers', []) + lib.headers + lib.src: - "${file}", - % endfor - % endif - % endfor - % endfor - % endfor + "src/node/index.js", + "src/node/src", + "src/node/ext", + "include/grpc", + "src/core", + "third_party/nanopb", + "third_party/zlib", + "third_party/boringssl", "binding.gyp" ], "main": "src/node/index.js", diff --git a/templates/src/csharp/build_packages.bat.template b/templates/src/csharp/build_packages.bat.template index 32455683be..3b445a8ac9 100644 --- a/templates/src/csharp/build_packages.bat.template +++ b/templates/src/csharp/build_packages.bat.template @@ -14,12 +14,12 @@ @rem Collect the artifacts built by the previous build step if running on Jenkins @rem TODO(jtattermusch): is there a better way to do this? - xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=windows\artifacts\* grpc.native.csharp\windows_x86${"\\"} - xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=windows\artifacts\* grpc.native.csharp\windows_x64${"\\"} - xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=linux\artifacts\* grpc.native.csharp\linux_x86${"\\"} - xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=linux\artifacts\* grpc.native.csharp\linux_x64${"\\"} - xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=macos\artifacts\* grpc.native.csharp\macosx_x86${"\\"} - xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=macos\artifacts\* grpc.native.csharp\macosx_x64${"\\"} + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=windows\artifacts\* Grpc.Core\windows_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=windows\artifacts\* Grpc.Core\windows_x64${"\\"} + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=linux\artifacts\* Grpc.Core\linux_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=linux\artifacts\* Grpc.Core\linux_x64${"\\"} + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=macos\artifacts\* Grpc.Core\macosx_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=macos\artifacts\* Grpc.Core\macosx_x64${"\\"} @rem Collect protoc artifacts built by the previous build step xcopy /Y /I ..\..\architecture=x86,language=protoc,platform=windows\artifacts\* protoc_plugins\windows_x86${"\\"} @@ -44,7 +44,6 @@ endlocal - %%NUGET% pack grpc.native.csharp\grpc.native.csharp.nuspec -Version %VERSION% || goto :error %%NUGET% pack Grpc.Auth\Grpc.Auth.nuspec -Symbols -Version %VERSION% || goto :error %%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% || goto :error %%NUGET% pack Grpc.HealthCheck\Grpc.HealthCheck.nuspec -Symbols -Version %VERSION_WITH_BETA% -Properties ProtobufVersion=%PROTOBUF_VERSION% || goto :error diff --git a/templates/tools/fuzzer/runners.template b/templates/tools/fuzzer/runners.template index 5228f86c7e..72d0b363f2 100644 --- a/templates/tools/fuzzer/runners.template +++ b/templates/tools/fuzzer/runners.template @@ -35,7 +35,13 @@ template: | # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # - flags="-max_total_time=$runtime -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/ -max_len=${selected.maxlen}" + flags="-max_total_time=$runtime -artifact_prefix=fuzzer_output/ -max_len=${selected.maxlen}" + + if [ "$jobs" != "1" ] + then + flags="-jobs=$jobs -workers=$jobs" + fi + if [ "$config" == "asan-trace-cmp" ] then flags="-use_traces=1 $flags" |