[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 8f39614: Improve cygwin-ization
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 8f39614: Improve cygwin-ization |
Date: |
Tue, 14 May 2019 20:50:12 -0400 (EDT) |
branch: master
commit 8f39614768fcc9de0493bc1c0c473a2960ba9551
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Improve cygwin-ization
* install_mingw.make: Remove '7-Zip' commands now that 'bsdtar' works:
a cross-platform program is always better than an msw-specific one;
free software is always better than RAR-tainted; and the two removed
commands differed in that one applied 'cygpath' to the '-o' argument
while the other did not, and it was unknown which was correct.
* install_msw.sh: Fix $PATH for "java"--see:
https://lists.nongnu.org/archive/html/lmi/2019-05/msg00039.html
---
install_mingw.make | 4 +---
install_msw.sh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/install_mingw.make b/install_mingw.make
index 76ed966..a9fa55e 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -131,6 +131,4 @@ WGETFLAGS := --no-verbose
%.7z:
cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(mirror)/$@
cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
- $(BSDTAR) --extract $(BSDTARFLAGS) --directory=$(ad_hoc_dir)
--file=$(cache_dir)/$@ \
- || c:/Program\ Files/7-Zip/7z x `cygpath -w
$(cache_dir)/address@hidden -o$(ad_hoc_dir) \
- || c:/Program\ Files\ \(x86\)/7-Zip/7z x `cygpath -w
$(cache_dir)/address@hidden -o`cygpath -w $(ad_hoc_dir)`
+ $(BSDTAR) --extract $(BSDTARFLAGS) --directory=$(ad_hoc_dir)
--file=$(cache_dir)/$@
diff --git a/install_msw.sh b/install_msw.sh
index 52fd6b2..2c56948 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -42,7 +42,7 @@ minimal_path=${MINIMAL_PATH:-"/usr/bin:/bin:/usr/sbin:/sbin"}
case "$lmi_build_type" in
(*-*-cygwin*)
- java_path="C:/Program\ Files\ \(x86\)/Common\
Files/Oracle/Java/javapath"
+ java_path="/cygdrive/c/Program\ Files\ \(x86\)/Common\
Files/Oracle/Java/javapath"
minimal_path="$minimal_path:$(cygpath --sysdir):$java_path"
;;
esac
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [lmi] master 8f39614: Improve cygwin-ization,
Greg Chicares <=