From 755f5728293a23e6554b8c6c8d9076e699fddae3 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 2 Jul 2008 19:26:53 +0000 Subject: [PATCH] 2008-07-02 21:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_xmingwce.sh * harbour/bin/hb-mkslib.sh * harbour/make_tgz.sh + added Darwin and OS2 to architecure autodetection. --- harbour/ChangeLog | 6 ++++++ harbour/bin/hb-mkslib.sh | 7 +++++-- harbour/make_gnu.sh | 1 + harbour/make_tgz.sh | 6 ++++-- harbour/make_xmingwce.sh | 5 +++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 314d53d8b0..0193ec29bb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-02 21:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/make_xmingwce.sh + * harbour/bin/hb-mkslib.sh + * harbour/make_tgz.sh + + added Darwin and OS2 to architecure autodetection. + 2008-07-02 20:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_gcc.sh * make_gnu.sh diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index 6d1a9fa6c5..8445760bdb 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -24,13 +24,16 @@ fi case "$hb_arch" in *windows*|*mingw32*|msys*) hb_arch="w32" ;; - *dos) hb_arch="dos" ;; - *bsd) hb_arch="bsd" ;; + *os/2*) hb_arch="os2" ;; + *dos) hb_arch="dos" ;; + *bsd) hb_arch="bsd" ;; + *darwin) hb_arch="darwin" ;; esac case "$hb_arch" in darwin) SLIB_EXT=".dylib" ;; w32) SLIB_EXT=".dll" ;; + os2) SLIB_EXT=".dll" ;; hpux) SLIB_EXT=".sl" ;; *) SLIB_EXT=".so" ;; esac diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index e22f678935..725cab5b64 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -22,6 +22,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *os/2*) hb_arch="os2" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; *darwin) hb_arch="darwin" ;; diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh index 8f21a2d6e6..0c2d1905f4 100755 --- a/harbour/make_tgz.sh +++ b/harbour/make_tgz.sh @@ -41,8 +41,10 @@ if [ -z "$HB_ARCHITECTURE" ]; then hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in *windows*|*mingw32*|msys*) hb_arch="w32" ;; - *dos) hb_arch="dos" ;; - *bsd) hb_arch="bsd" ;; + *os/2*) hb_arch="os2" ;; + *dos) hb_arch="dos" ;; + *bsd) hb_arch="bsd" ;; + *darwin) hb_arch="darwin" ;; esac fi export HB_ARCHITECTURE="$hb_arch" diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 31830ca8d1..afcf143363 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -26,8 +26,9 @@ else HB_HOST_CC="gcc" case "$HB_HOST_ARCH" in *windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw32" ;; - *dos) HB_HOST_ARCH="dos" ;; - *bsd) HB_HOST_ARCH="bsd" ;; + *dos) HB_HOST_ARCH="dos" ;; + *bsd) HB_HOST_ARCH="bsd" ;; + *darwin) HB_HOST_ARCH="darwin" ;; esac fi