From cd3346d1b079f596ce469ad63d0afba6477b0f50 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Murillo Date: Fri, 29 Dec 2017 12:12:04 +0100 Subject: [PATCH] Update media server and add distribution script --- .gitignore | 1 + binding.gyp | 2 +- media-server | 2 +- package.json | 5 +++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c2942d2d..137ea830 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ jspm_packages /nbproject/private/ /build /nbproject +/dist diff --git a/binding.gyp b/binding.gyp index 8c7aa1ef..c23f7cec 100644 --- a/binding.gyp +++ b/binding.gyp @@ -10,7 +10,7 @@ "-O3", #"-g", #"-O0", - # "-fsanitize=address" + #"-fsanitize=address" ], "include_dirs" : [ diff --git a/media-server b/media-server index 2f5a1fe4..97f6ae37 160000 --- a/media-server +++ b/media-server @@ -1 +1 @@ -Subproject commit 2f5a1fe468ec5f0df70462c16ab2202865037b68 +Subproject commit 97f6ae373806ca8b621087399af4f89a5d8ce8ef diff --git a/package.json b/package.json index 3ba103f0..7fd5c917 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ "configure": "node-gyp configure", "swig": "swig -javascript -node -c++ src/media-server.i", "build": "node-gyp build --jobs=max", - "install": "node-gyp configure && node-gyp rebuild --jobs=max", + "install": "test -f build/Release/medooze-media-server.node || (node-gyp configure && node-gyp rebuild --jobs=max)", "docs": "documentation build lib/MediaServer.js lib/*.js node_modules/semantic-sdp/lib/*.js --shallow -o docs -f html", - "package": "tar cvzf build/medooze-media-server.tgz ../media-server-node/external/* ../media-server-node/media-server/src/* ../media-server-node/media-server/include/* ../media-server-node/lib/* ../media-server-node/package.json ../media-server-node/index.js ../media-server-node/binding.gyp ../media-server-node/README.md ../media-server-node/src" + "package": "tar cvzf build/medooze-media-server.tgz ../media-server-node/external/* ../media-server-node/media-server/src/* ../media-server-node/media-server/include/* ../media-server-node/lib/* ../media-server-node/package.json ../media-server-node/index.js ../media-server-node/binding.gyp ../media-server-node/README.md ../media-server-node/src", + "dist": "node-gyp build --jobs=max && mkdir -p dist && tar cvzf dist/medooze-media-server-`node -e 'console.log(require(\"./package.json\").version)'`.tgz ../media-server-node/package.json ../media-server-node/index.js ../media-server-node/README.md ../media-server-node/lib/* ../media-server-node/build/Release/medooze-media-server.node" }, "repository": { "type": "git",