Skip to content

Commit

Permalink
Fix make deps on Windows
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Dominic Della Valle <[email protected]>
  • Loading branch information
djdv committed Feb 13, 2018
1 parent f2e38f5 commit e613e9d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
6 changes: 5 additions & 1 deletion bin/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp
PATH := $(realpath $(d)):$(PATH)

$(TGTS_$(d)):
rm -f $@
rm -f $@$(?exe)
ifeq ($(WINDOWS),1)
cp $^$(?exe) $@$(?exe)
else
ln -s $(notdir $^) $@
endif

bin/gx-v%:
@echo "installing gx $(@:bin/gx-%=%)"
Expand Down
11 changes: 9 additions & 2 deletions bin/dist_get
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ unarchive() {
ua_infile="$2"
ua_outfile="$3"
ua_distname="$4"
ua_binpostfix=""
ua_os=$(uname -o)

if [ "$ua_os" = "Msys" ] || [ "$ua_os" = "Cygwin" ] ; then
ua_binpostfix=".exe"
fi
ua_outfile="$ua_outfile$ua_binpostfix"

if ! check_writeable "$ua_outfile"; then
die "unarchive error: cannot write to $ua_outfile"
Expand All @@ -66,7 +73,7 @@ unarchive() {
tar.gz)
if have_binary tar; then
echo "==> using 'tar' to extract binary from archive"
< "$ua_infile" tar -Ozxf - "$ua_distname/$ua_distname" > "$ua_outfile" \
< "$ua_infile" tar -Ozxf - "$ua_distname/$ua_distname$ua_binpostfix" > "$ua_outfile" \
|| die "tar has failed"
else
die "no binary on system for extracting tar files"
Expand All @@ -75,7 +82,7 @@ unarchive() {
zip)
if have_binary unzip; then
echo "==> using 'unzip' to extract binary from archive"
unzip -p "$ua_infile" "$ua_distname/$ua_distname" > "$ua_outfile" \
unzip -p "$ua_infile" "$ua_distname/$ua_distname$ua_binpostfix" > "$ua_outfile" \
|| die "unzip has failed"
else
die "no installed method for extracting .zip archives"
Expand Down

0 comments on commit e613e9d

Please sign in to comment.