Commit d615a525 authored by Rob Pike's avatar Rob Pike

deps.bash: attempt to fix the windows build

Use simpler shell constructs.

R=golang-dev
CC=golang-dev
https://golang.org/cl/5297080
parent f4cd8022
...@@ -21,14 +21,16 @@ dirpat=$(echo $dirs C | awk '{ ...@@ -21,14 +21,16 @@ dirpat=$(echo $dirs C | awk '{
gsub("/", "\\/", x) gsub("/", "\\/", x)
printf("/^(%s)$/\n", x) printf("/^(%s)$/\n", x)
} }
}' }')
# Add packages' old names. TODO: clean up after renaming.
echo "/^(asn1)$/" # Append old names of renamed packages. TODO: clean up after renaming.
echo "/^(csv)$/" dirpat="$dirpat
echo "/^(gob)$/" /^(asn1)$/
echo "/^(json)$/" /^(csv)$/
echo "/^(xml)$/" /^(gob)$/
) /^(json)$/
/^(xml)$/
"
for dir in $dirs; do ( for dir in $dirs; do (
cd $dir >/dev/null || exit 1 cd $dir >/dev/null || exit 1
...@@ -47,15 +49,12 @@ for dir in $dirs; do ( ...@@ -47,15 +49,12 @@ for dir in $dirs; do (
grep -v "^$dir\$" | grep -v "^$dir\$" |
sed 's/$/.install/' | sed 's/$/.install/' |
# TODO: rename the dependencies for renamed directories. TODO: clean up after renaming. # TODO: rename the dependencies for renamed directories. TODO: clean up after renaming.
# awk is overkill but it's easy to understand. sed 's;^asn1.install$;encoding/asn1.install;' |
awk ' sed 's;^csv.install$;encoding/csv.install;' |
/^asn1.install$/ { print "encoding/asn1.install"; next } sed 's;^gob.install$;encoding/gob.install;' |
/^csv.install$/ { print "encoding/csv.install"; next } sed 's;^json.install$;encoding/json.install;' |
/^gob.install$/ { print "encoding/gob.install"; next } sed 's;^xml.install$;encoding/xml.install;' |
/^json.install$/ { print "encoding/json.install"; next } # TODO: end of renamings.
/^xml.install$/ { print "encoding/xml.install"; next }
{print}
' |
sed 's;^C\.install;runtime/cgo.install;' | sed 's;^C\.install;runtime/cgo.install;' |
sort -u sort -u
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment