* utils/hbmk2/hbmk2.prg
! Fixed -gh switch detection and workings.
(Francesco, pls check now allmod.hbm)
+ -gt switch can now be filtered. (-gtwin{win})
! -gui switch won't anymore add '-Wl,-mwindows' C compiler switch
on *nix systems. Someone pls confirm this is right.
* icc will use -vc postfixed .dlls. They seem to be binary
compatible, but I didn't test.
% Using __PLATFORM__UNIX macro where applicable.
! Ignoring -o Harbour option passed using '-prgflag:'
* INSTALL
+ Added some details.
* mpkg_win.bat
! Don't create install files if the make process returned
with error.
* source/lang/msg_tpl.c
! Removed ending ';'.
* source/vm/Makefile
+ Added icc to generate maindllh.lib.
* source/common/hbfsapi.c
! Removed obsolete 'extern hb_fhnd_ForceLink()'.
* config/rules.cf
* config/lib.cf
* config/bin.cf
% Compiling all .prg files with -n1 switch.
* contrib/examples/uhttpd/uhttpdc.c
* Cleaned Windows headers usage.
#define HB_OS_WIN_USED is safe to use on all platforms,
it just requests the Windows headers, and if compiled on
Windows, it will #include them.
* contrib/examples/uhttpd/uhttpd.prg
+ Automatically sets USE_HB_INET on non-Windows platforms.
- contrib/examples/uhttpd/uhttpd-inet.hbm
- contrib/examples/uhttpd/uhttpdgd-inet.hbm
- Removed files no longer necessary.
* contrib/examples/uhttpd/uhttpd.hbm
+ Added comment about -DUSE_HB_INET option.
% Removed -lhbct
80 lines
2.2 KiB
Batchfile
80 lines
2.2 KiB
Batchfile
@rem
|
|
@rem $Id$
|
|
@rem
|
|
|
|
@echo off
|
|
|
|
rem ---------------------------------------------------------------
|
|
rem Installer creator for Harbour Project
|
|
rem
|
|
rem Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
rem See doc/license.txt for licensing terms.
|
|
rem
|
|
rem This script requires:
|
|
rem - Windows NT or upper
|
|
rem - NullSoft Installer installed (NSIS)
|
|
rem https://sourceforge.net/project/showfiles.php?group_id=22049&package_id=15374
|
|
rem - makensis.exe (part of NSIS) in PATH
|
|
rem - Info-ZIP zip.exe in PATH
|
|
rem https://sourceforge.net/project/showfiles.php?group_id=118012
|
|
rem - HB_COMPILER envvar configured (see INSTALL doc)
|
|
rem - C compiler and GNU Make configured (see INSTALL doc)
|
|
rem ---------------------------------------------------------------
|
|
|
|
if not "%OS%" == "Windows_NT" goto END
|
|
|
|
setlocal
|
|
|
|
rem ; Basic setup
|
|
set HB_VERSION=1.1.0dev
|
|
set HB_ARCHITECTURE=win
|
|
set HB_PKGNAME=harbour-%HB_VERSION%-%HB_ARCHITECTURE%-%HB_COMPILER%
|
|
set HB_DIRNAME=harbour-%HB_COMPILER%
|
|
|
|
rem ; Dir setup
|
|
set HB_INSTALL_BASE=%~dp0_hb_install_temp
|
|
set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\%HB_DIRNAME%
|
|
set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin
|
|
set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
|
|
set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
|
|
set HB_DOC_INSTALL=%HB_INSTALL_PREFIX%\doc
|
|
|
|
rem ; Cleanup
|
|
if exist %HB_INSTALL_BASE% rmdir /q /s %HB_INSTALL_BASE%
|
|
|
|
rem ; Build
|
|
if "%HB_COMPILER%" == "mingw" ( sh make_gnu.sh clean install && goto MK_PKG )
|
|
if "%HB_COMPILER%" == "cygwin" ( sh make_gnu.sh clean install && goto MK_PKG )
|
|
set HB_DIR_IMPLIB=no
|
|
set HB_BUILD_DLL=yes
|
|
call make_gnu.bat
|
|
|
|
:MK_PKG
|
|
|
|
if errorlevel 1 goto MK_ERROR
|
|
|
|
rem ; Post build cleanup
|
|
|
|
if exist "%HB_BIN_INSTALL%\*.tds" del "%HB_BIN_INSTALL%\*.tds"
|
|
if exist "%HB_BIN_INSTALL%\*.lib" del "%HB_BIN_INSTALL%\*.lib"
|
|
if exist "%HB_BIN_INSTALL%\*.exp" del "%HB_BIN_INSTALL%\*.exp"
|
|
|
|
rem ; Installer package
|
|
makensis.exe %~dp0mpkg_win.nsi
|
|
|
|
rem ; .zip package
|
|
if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
|
|
pushd
|
|
cd %HB_INSTALL_BASE%
|
|
zip -X -r -o %~dp0%HB_PKGNAME%.zip *
|
|
popd
|
|
|
|
:MK_ERROR
|
|
|
|
rem ; Cleanup
|
|
if "%1" == "--deltemp" rmdir /q /s %HB_INSTALL_BASE%
|
|
|
|
endlocal
|
|
|
|
:END
|