fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-03-05 16:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* doc/man/hbmk.1
  * INSTALL
  * utils/hbmk2/hbmk2.prg
  - config/win/icc.cf
    - Deleted win/icc from supported compiler list. This was
      never working and the compiler isn't available anymore
      for Windows. For AIX we could support it though.

  * INSTALL
    * Minor typos.

  * mpkg_win.bat
    + Added zip link. Made NSIS link more direct.
This commit is contained in:
Viktor Szakats
2009-03-05 15:19:28 +00:00
parent 5605baae46
commit 75e15add2f
6 changed files with 24 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,21 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-05 16:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* doc/man/hbmk.1
* INSTALL
* utils/hbmk2/hbmk2.prg
- config/win/icc.cf
- Deleted win/icc from supported compiler list. This was
never working and the compiler isn't available anymore
for Windows. For AIX we could support it though.
* INSTALL
* Minor typos.
* mpkg_win.bat
+ Added zip link. Made NSIS link more direct.
2009-03-05 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* INSTALL
* Deeper link to MinGW GNU Make download.

9
harbour/INSTALL
View File

@@ -50,7 +50,7 @@ HOW TO BUILD AND INSTALL HARBOUR
Windows with Cygwin
-------------------
Make sure to have Cygwin properly properly configured.
Make sure to have Cygwin properly configured.
> set HB_INSTALL_PREFIX=<DIR>
> sh make_gnu.sh install
@@ -133,7 +133,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
doc/linux1st.txt.
You can set these environment variables before starting
the build. Make sure to adjust them to your own dirs:
the build. Make sure to adjust them to your own directories:
HB_INC_ADS=C:\ads\acesdk
HB_INC_ALLEGRO=C:\allegro\include
@@ -150,7 +150,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
NOTES: - For mingw and cygwin you have to use forward slashes
and also cygwin drive notation for cygwin.
- Space in dirnames isn't currently supported.
- Space in directory names isn't currently supported.
SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
@@ -176,7 +176,6 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
owatcom - Open Watcom C++
bcc - Borland/CodeGear C++ 4.x and above
cygwin - Cygwin GNU C
icc - IBM Visual Age C++
dmc - Digital Mars C
msvc64 - Microsoft Visual C++ x64
msvcia64 - Microsoft Visual C++ ia64
@@ -224,7 +223,7 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
This is only needed and available for
non-GNU Windows compilers. When using this,
full clean + install cycles will automatically
be executed, so you don't have to explicily
be executed, so you don't have to explicitly
pass them to make_gnu.bat.
- HB_CONTRIBLIBS=no Don't build any contrib libraries.
- HB_CONTRIBLIBS=[<list>] Build space separated <list> of

69
harbour/config/win/icc.cf
View File

@@ -1,69 +0,0 @@
#
# $Id$
#
# The Harbour Project
# GNU MAKE file for IBM Visual Age for C++
#
# This code is NOT TESTED yet! (19990711)
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
OBJ_EXT = .obj
EXE_EXT = .exe
LIB_PREF =
LIB_EXT = .lib
$(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP = $(subst /,\\,$(GRANDP))
_HB_INC_COMPILE = $(subst /,\\,$(HB_INC_COMPILE))
_HL = $(notdir $(HB_LIB_COMPILE))
ifeq ($(_HL),)
#there is an ending slash
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE))
else
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE)/)
endif
CC = icc
CC_IN = /Tp
CC_OUT = /Fo
CPPFLAGS = /C+
CFLAGS = /W2 /Sd /Se+ /Ti+ /i. /i$(_HB_INC_COMPILE)
#Note: The empty line below HAVE TO exist!
define link_file
echo /fo$(file) >> __link__.tmp
endef
define link_exe_file
echo $(LDFLAGS) -Fe$@ > __link__.tmp
$(foreach file, $(^F), $(link_file))
echo $(LINKLIBS) >> __link__.tmp
-$(LD) @__link__.tmp
endef
LD = icc
LDFLAGS = $(CFLAGS)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(_HB_LIB_COMPILE)$(lib))
LINKLIBS += $(foreach lib, $(LIBS), $(_HB_LIB_COMPILE)$(lib))
LD_RULE = $(link_exe_file)
#Note: The empty line below HAVE TO exist!
define lib_object
echo -+$(file) >> __lib__.tmp
endef
define create_library
echo $@ > __lib__.tmp
$(foreach file, $(^F), $(lib_object))
$(AR) @__lib__.tmp
del __lib__.tmp
endef
AR = ilib
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/doc/man/hbmk.1
View File

@@ -123,7 +123,7 @@ Defaults and feature support vary by architecture/compiler.
Supported <comp> values for each supported <arch> value:
linux: gcc, gpp, owatcom, icc, mingw, mingwce
darwin: gcc
win: mingw, msvc, bcc, owatcom, pocc, dmc, icc, cygwin mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc
win: mingw, msvc, bcc, owatcom, pocc, dmc, cygwin mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc
os2: gcc, owatcom, icc
dos: gcc, djgpp, owatcom
bsd, hpux, sunos: gcc

3
harbour/mpkg_win.bat
View File

@@ -13,9 +13,10 @@ rem
rem This script requires:
rem - Windows NT or upper
rem - NullSoft Installer installed (NSIS)
rem http://nsis.sourceforge.net
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 ---------------------------------------------------------------

6
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -457,10 +457,9 @@ FUNCTION Main( ... )
{ {|| FindInPath( "porc64" ) != NIL }, "pocc64" },;
{ {|| FindInPath( "pocc" ) != NIL }, "pocc" },;
{ {|| FindInPath( "dmc" ) != NIL }, "dmc" },;
{ {|| FindInPath( "icc" ) != NIL }, "icc" },;
{ {|| FindInPath( "cygstart" ) != NIL }, "cygwin" },;
{ {|| FindInPath( "xcc" ) != NIL }, "xcc" } }
aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "pocc", "xcc", "dmc", "icc", "cygwin",;
aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "pocc", "xcc", "dmc", "cygwin",;
"msvc64", "msvcia64", "pocc64",;
"mingwce", "msvcce", "poccce" }
cBin_CompPRG := "harbour.exe"
@@ -1596,7 +1595,6 @@ FUNCTION Main( ... )
CASE t_cARCH == "win" .AND. t_cCOMP == "pocc64" /* NOTE: Cross-platform: win/amd64 on win/x86 */
CASE t_cARCH == "win" .AND. t_cCOMP == "poccce" /* NOTE: Cross-platform: wince/ARM on win/x86 */
CASE t_cARCH == "win" .AND. t_cCOMP == "dmc"
CASE t_cARCH == "win" .AND. t_cCOMP == "icc"
CASE t_cARCH $ "win|linux" .AND. t_cCOMP == "mingwce" /* NOTE: Cross-platform: wince/ARM on win/x86 */
IF ! s_lSHARED
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl", "uuid", "ole32" } )
@@ -2869,7 +2867,7 @@ STATIC PROCEDURE ShowHelp( lLong )
" - Supported <comp> values for each supported <arch> value:" ,;
" linux : gcc, gpp, owatcom, icc, mingw, mingwce" ,;
" darwin : gcc" ,;
" win : mingw, msvc, bcc, owatcom, pocc, dmc, icc, cygwin" ,;
" win : mingw, msvc, bcc, owatcom, pocc, dmc, cygwin" ,;
" mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc" ,;
" os2 : gcc, owatcom, icc" ,;
" dos : gcc, djgpp, owatcom" ,;