2009-03-04 10:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkdyn.sh
* bin/postinst.sh
+ Added some level of cygwin support.
; TOFIX: .dlls are not generated.
* make_gnu.sh
* Change recently added '==' operators to '='.
+ Added link to GNU bash and POSIX shell docs.
For Harbour we need to comply with the latter
(at least for OS neutral script parts).
* INSTALL
* mpkg_win.bat
* config/global.cf
* Formatting.
This commit is contained in:
@@ -8,6 +8,23 @@
|
||||
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
|
||||
*/
|
||||
|
||||
2009-03-04 10:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
|
||||
* bin/hb-mkdyn.sh
|
||||
* bin/postinst.sh
|
||||
+ Added some level of cygwin support.
|
||||
; TOFIX: .dlls are not generated.
|
||||
|
||||
* make_gnu.sh
|
||||
* Change recently added '==' operators to '='.
|
||||
+ Added link to GNU bash and POSIX shell docs.
|
||||
For Harbour we need to comply with the latter
|
||||
(at least for OS neutral script parts).
|
||||
|
||||
* INSTALL
|
||||
* mpkg_win.bat
|
||||
* config/global.cf
|
||||
* Formatting.
|
||||
|
||||
2009-03-04 00:34 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
* harbour/contrib/gtwvg/wvgsink.c
|
||||
! Pacified long-standing warning.
|
||||
|
||||
@@ -51,8 +51,6 @@ HOW TO BUILD AND INSTALL HARBOUR
|
||||
Windows with Cygwin
|
||||
-------------------
|
||||
Make sure to have Cygwin properly properly configured.
|
||||
Make sure to use Harbour sources with LF line termination,
|
||||
if you see a bash error, try 'dos2unix make_gnu.sh'.
|
||||
|
||||
> set HB_INSTALL_PREFIX=<DIR>
|
||||
> sh make_gnu.sh install
|
||||
|
||||
@@ -25,10 +25,10 @@ fi
|
||||
linker_options=""
|
||||
|
||||
case "$hb_arch" in
|
||||
*windows*|*mingw32*|msys*) hb_arch="win" ;;
|
||||
*os/2*) hb_arch="os2" ;;
|
||||
*dos) hb_arch="dos" ;;
|
||||
*bsd) hb_arch="bsd" ;;
|
||||
*windows*|*mingw32*|msys*|cygwin*) hb_arch="win" ;;
|
||||
*os/2*) hb_arch="os2" ;;
|
||||
*dos) hb_arch="dos" ;;
|
||||
*bsd) hb_arch="bsd" ;;
|
||||
esac
|
||||
|
||||
case "$hb_arch" in
|
||||
|
||||
@@ -42,6 +42,7 @@ fi
|
||||
|
||||
if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \
|
||||
[ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \
|
||||
[ "$HB_COMPILER" = "cygwin" ] || \
|
||||
[ "$HB_COMPILER" = "djgpp" ] || [ "$HB_COMPILER" = "icc" ]
|
||||
then
|
||||
RANLIB=""
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
# $Id$
|
||||
#
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# See GNU make docs here:
|
||||
# http://www.gnu.org/software/make/manual/make.html
|
||||
# http://www.gnu.org/software/make/manual/make.html
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
# This isn't strictly necessary, but it does signficantly reduce
|
||||
# the number of rules that make has to evaluate otherwise, which may give
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
# See doc/license.txt for licensing terms.
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# See GNU bash docs here:
|
||||
# http://www.gnu.org/software/bash/manual/bashref.html
|
||||
# See POSIX shell docs here:
|
||||
# http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
if [ -z "$HB_ARCHITECTURE" ]; then
|
||||
if [ "$OSTYPE" = "msdosdjgpp" ]; then
|
||||
hb_arch="dos"
|
||||
@@ -41,7 +48,7 @@ if [ -z "$HB_COMPILER" ]; then
|
||||
export HB_COMPILER
|
||||
fi
|
||||
|
||||
if [ "$HB_ARCHITECTURE" == "cyg" ]
|
||||
if [ "$HB_ARCHITECTURE" = "cyg" ]
|
||||
then
|
||||
export HB_ARCHITECTURE=win
|
||||
fi
|
||||
@@ -120,9 +127,9 @@ then
|
||||
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
|
||||
fi
|
||||
|
||||
if [ "$HB_ARCHITECTURE" == "win" ] || \
|
||||
[ "$HB_ARCHITECTURE" == "dos" ] || \
|
||||
[ "$HB_ARCHITECTURE" == "os2" ]; then
|
||||
if [ "$HB_ARCHITECTURE" = "win" ] || \
|
||||
[ "$HB_ARCHITECTURE" = "dos" ] || \
|
||||
[ "$HB_ARCHITECTURE" = "os2" ]; then
|
||||
if [ -n "$HB_INSTALL_PREFIX" ]; then
|
||||
export HB_INSTALL_PREFIX="${HB_INSTALL_PREFIX//\\//}"
|
||||
fi
|
||||
@@ -158,9 +165,9 @@ if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$HB_INSTALL_PREFIX/bin;
|
||||
if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$HB_INSTALL_PREFIX/lib$hb_instsubdir; fi
|
||||
if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$HB_INSTALL_PREFIX/include$hb_instsubdir; fi
|
||||
|
||||
if [ "$HB_ARCHITECTURE" == "win" ] || \
|
||||
[ "$HB_ARCHITECTURE" == "dos" ] || \
|
||||
[ "$HB_ARCHITECTURE" == "os2" ]; then
|
||||
if [ "$HB_ARCHITECTURE" = "win" ] || \
|
||||
[ "$HB_ARCHITECTURE" = "dos" ] || \
|
||||
[ "$HB_ARCHITECTURE" = "os2" ]; then
|
||||
if [ -z "$HB_DOC_INSTALL" ]; then export HB_DOC_INSTALL=$HB_INSTALL_PREFIX/doc; fi
|
||||
mkdir -p $HB_BIN_INSTALL
|
||||
mkdir -p $HB_LIB_INSTALL
|
||||
|
||||
@@ -15,7 +15,7 @@ rem - Windows NT or upper
|
||||
rem - NullSoft Installer installed (NSIS)
|
||||
rem http://nsis.sourceforge.net
|
||||
rem - makensis.exe (part of NSIS) in PATH
|
||||
rem - Info-ZIP zip.exe in PATH.
|
||||
rem - Info-ZIP zip.exe in PATH
|
||||
rem - HB_COMPILER envvar configured (see INSTALL doc)
|
||||
rem - C compiler and GNU Make configured (see INSTALL doc)
|
||||
rem ---------------------------------------------------------------
|
||||
@@ -50,10 +50,10 @@ call make_gnu.bat
|
||||
|
||||
:MK_PKG
|
||||
|
||||
rem ; Installer
|
||||
rem ; Installer package
|
||||
makensis.exe %~dp0mpkg_win.nsi
|
||||
|
||||
rem ; .zip packages
|
||||
rem ; .zip package
|
||||
if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
|
||||
pushd
|
||||
cd %HB_INSTALL_BASE%
|
||||
|
||||
Reference in New Issue
Block a user