Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>2017-05-05 20:55:16 +0300
committerRebecca Turner <me@re-becca.org>2017-08-17 21:45:41 +0300
commit0756d687d4ccfcd4a7fd83db0065eceb9261befb (patch)
tree9cd8b7718758fa6d3892dded8af7b6dd17fc1e2f /scripts
parent0ef320cb40222693b7367b97c60ddffabc2d58c5 (diff)
makefile: fix doc build tools dependencies
The build tools for the documentation need to be built/installed before the documents, even with parallel builds. Make has a simple mechanism which was made exactly for that: target dependencies. PR-URL: https://github.com/npm/npm/pull/16550 Credit: @metux Reviewed-By: @iarna
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/doc-build.sh52
1 files changed, 0 insertions, 52 deletions
diff --git a/scripts/doc-build.sh b/scripts/doc-build.sh
index b951eb7d3..a37a5e261 100755
--- a/scripts/doc-build.sh
+++ b/scripts/doc-build.sh
@@ -6,58 +6,6 @@ fi
set -o errexit
set -o pipefail
-if ! [ -x node_modules/.bin/marked-man ]; then
- ps=0
- if [ -f .building_marked-man ]; then
- pid=$(cat .building_marked-man)
- ps=$(ps -p $pid | grep $pid | wc -l) || true
- fi
-
- if [ -f .building_marked-man ] && [ $ps != 0 ]; then
- while [ -f .building_marked-man ]; do
- sleep 1
- done
- else
- # a race to see which make process will be the one to install marked-man
- echo $$ > .building_marked-man
- sleep 1
- if [ $(cat .building_marked-man) == $$ ]; then
- make node_modules/.bin/marked-man
- rm .building_marked-man
- else
- while [ -f .building_marked-man ]; do
- sleep 1
- done
- fi
- fi
-fi
-
-if ! [ -x node_modules/.bin/marked ]; then
- ps=0
- if [ -f .building_marked ]; then
- pid=$(cat .building_marked)
- ps=$(ps -p $pid | grep $pid | wc -l) || true
- fi
-
- if [ -f .building_marked ] && [ $ps != 0 ]; then
- while [ -f .building_marked ]; do
- sleep 1
- done
- else
- # a race to see which make process will be the one to install marked
- echo $$ > .building_marked
- sleep 1
- if [ $(cat .building_marked) == $$ ]; then
- make node_modules/.bin/marked
- rm .building_marked
- else
- while [ -f .building_marked ]; do
- sleep 1
- done
- fi
- fi
-fi
-
src=$1
dest=$2
name=$(basename ${src%.*})