From: Ian Jackson Date: Sun, 3 Mar 2019 21:02:58 +0000 (+0000) Subject: cope with name change of plag-mangle from planar-graph X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ff3499ff678cfc5c513bd9f5e9360dc0d7592654;p=pandemic-rising-tide.git cope with name change of plag-mangle from planar-graph --- diff --git a/Makefile b/Makefile index ee8052a..fef7280 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,14 @@ export PERL_HASH_SEED=1 # PLAG_DEBUG ?= $(PLAG) # effectively # PLAG_RELEASE ?= $(PLAG) # ie caller may set these -PLAG_DIR ?= ../planar-graph +PLAG_DIR ?= ../plag-mangle USE_PLAG_DEBUG := $(shell ./find-plag \ debug:release "$(PLAG_DIR)" "$(PLAG_DEBUG)" "$(PLAG_RELEASE)" "$(PLAG)") USE_PLAG_RELEASE := $(shell ./find-plag \ release:debug "$(PLAG_DIR)" "$(PLAG_RELEASE)" "$(PLAG_DEBUG)" "$(PLAG)") -# with planar-graph 74bbc2b1da372d3456c00bcb07f3358c739e5721 +# works with plag-mangle 16446a44d3f1f467765879492fa85a01222f8052 default: all diff --git a/find-plag b/find-plag index 45b9773..9ec851e 100755 --- a/find-plag +++ b/find-plag @@ -1,7 +1,7 @@ #!/bin/bash set -e -cmd=planar-graph +cmd=plag-mangle want="$1"; shift dir="$1"; shift @@ -31,5 +31,5 @@ for which in ${want//\:/ }; do done printf >&2 ' no!\n' -echo missing-planar-graph-utility +echo missing-plag-mangle-utility exit 16 diff --git a/generate-plag b/generate-plag index 72986e9..a77cbe0 100755 --- a/generate-plag +++ b/generate-plag @@ -16,7 +16,7 @@ sub output_planar_graph () { o(" ", plag_prs($adj->{Name}), "\n"); } } - # RUST_BACKBACE=1 target/release/planar-graph <../pandemic-rising-tide/map.plag R DUAL OUTER-F2V OUTER-SPLIT B T OUTER-F2V OUTER-F12VA PCO CP RAE PRINT-VI-NAMES NLOPT WG t.dot | qtdebug/vtrace + # RUST_BACKTRACE=1 target/release/plag-mangle <../pandemic-rising-tide/map.plag R DUAL OUTER-F2V OUTER-SPLIT B T OUTER-F2V OUTER-F12VA PCO CP RAE PRINT-VI-NAMES NLOPT WG t.dot | qtdebug/vtrace }