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

2009-09-24 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    * Pelles C support version numbers adjusted.
      6.0 DOESN'T work with Harbour due to multiple bugs in this compilers.
      Don't report such problems to the list.

  * package/winuni/HARBOUR_README_MINGWARM 
    * Updated for latest cegcc binary release.

  * utils/hbmk2/hbmk2.prg
    ! Typo in BSD macro redefinition.

  * config/global.mk
    + Extended platform macro redefinition for all supported platforms.
    + Extended arch bit macro redefinition (didn't test it though)

  * config/globsh.mk
    ! Fixed implib not being deleted when using POSIX shells.
    ! Fixed dynlib and implib not being deleted when using OS/2 or MS-DOS shells.
This commit is contained in:
Viktor Szakats
2009-09-24 07:39:25 +00:00
parent 40ca66681a
commit d5bf6a50fd
6 changed files with 80 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -17,6 +17,26 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-24 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* Pelles C support version numbers adjusted.
6.0 DOESN'T work with Harbour due to multiple bugs in this compilers.
Don't report such problems to the list.
* package/winuni/HARBOUR_README_MINGWARM
* Updated for latest cegcc binary release.
* utils/hbmk2/hbmk2.prg
! Typo in BSD macro redefinition.
* config/global.mk
+ Extended platform macro redefinition for all supported platforms.
+ Extended arch bit macro redefinition (didn't test it though)
* config/globsh.mk
! Fixed implib not being deleted when using POSIX shells.
! Fixed dynlib and implib not being deleted when using OS/2 or MS-DOS shells.
2009-09-23 22:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/common/hbffind.c
! do not use GetVolumeInformation() in WinCE builds
@@ -36,7 +56,6 @@
on cached current key offset - thanks to Jaroslav Janik for
information and self contain example
2009-09-23 16:30 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* contrib/hbmemio/memio.c
! added missing structure field initialization

6
harbour/INSTALL
View File

@@ -436,8 +436,8 @@ SUPPORTED PLATFORMS AND C COMPILERS
bcc - Borland/CodeGear/Embarcadero C++ 4.x and above
icc - Intel(R) C/C++
iccia64 - Intel(R) C/C++ IA-64
pocc - Pelles C 4.5 and above
pocc64 - Pelles C x86-64 5.0 and above
pocc - Pelles C 4.5 and 5.0
pocc64 - Pelles C x86-64 5.0
xcc - Pelles C for xhb
cygwin - Cygwin GNU C
@@ -446,7 +446,7 @@ SUPPORTED PLATFORMS AND C COMPILERS
mingw - MinGW GNU C x86
mingwarm - MinGW GNU C ARM
msvcarm - Microsoft Visual C++ ARM
poccarm - Pelles C ARM 5.0 and above
poccarm - Pelles C ARM 5.0
dos
---

81
harbour/config/global.mk
View File

@@ -1040,43 +1040,60 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
HB_PRGFLAGS += -undef:__PLATFORM__WINDOWS
# We only need this to avoid problems with using Cygwin binaries as native ones.
HB_PRGFLAGS += -undef:__PLATFORM__UNIX
else
ifeq ($(HB_HOST_PLAT),dos)
HB_PRGFLAGS += -undef:__PLATFORM__DOS
else
ifeq ($(HB_HOST_PLAT),os2)
HB_PRGFLAGS += -undef:__PLATFORM__OS2
else
ifeq ($(HB_HOST_PLAT),linux)
HB_PRGFLAGS += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
endif
endif
else ifeq ($(HB_HOST_PLAT),dos)
HB_PRGFLAGS += -undef:__PLATFORM__DOS
else ifeq ($(HB_HOST_PLAT),os2)
HB_PRGFLAGS += -undef:__PLATFORM__OS2
else ifeq ($(HB_HOST_PLAT),linux)
HB_PRGFLAGS += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
else ifeq ($(HB_HOST_PLAT),darwin)
HB_PRGFLAGS += -undef:__PLATFORM__DARWIN -undef:__PLATFORM__UNIX
else ifeq ($(HB_HOST_PLAT),bsd)
HB_PRGFLAGS += -undef:__PLATFORM__BSD -undef:__PLATFORM__UNIX
else ifeq ($(HB_HOST_PLAT),sunos)
HB_PRGFLAGS += -undef:__PLATFORM__SUNOS -undef:__PLATFORM__UNIX
else ifeq ($(HB_HOST_PLAT),hpux)
HB_PRGFLAGS += -undef:__PLATFORM__HPUX -undef:__PLATFORM__UNIX
else ifeq ($(HB_HOST_PLAT),beos)
HB_PRGFLAGS += -undef:__PLATFORM__BEOS -undef:__PLATFORM__UNIX
endif
ifneq ($(HB_HOST_CPU),$(HB_CPU))
ifeq ($(HB_HOST_CPU),x86)
HB_PRGFLAGS += -undef:__ARCH32BIT__
else ifeq ($(HB_HOST_CPU),x86_64)
HB_PRGFLAGS += -undef:__ARCH64BIT__
else ifeq ($(HB_HOST_CPU),ia64)
HB_PRGFLAGS += -undef:__ARCH64BIT__
endif
endif
ifeq ($(HB_PLATFORM),win)
HB_PRGFLAGS += -D__PLATFORM__WINDOWS
ifeq ($(HB_CPU),x86_64)
else ifeq ($(HB_PLATFORM),wce)
HB_PRGFLAGS += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
else ifeq ($(HB_PLATFORM),dos)
HB_PRGFLAGS += -D__PLATFORM__DOS
else ifeq ($(HB_PLATFORM),os2)
HB_PRGFLAGS += -D__PLATFORM__OS2
else ifeq ($(HB_PLATFORM),linux)
HB_PRGFLAGS += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
else ifeq ($(HB_PLATFORM),darwin)
HB_PRGFLAGS += -D__PLATFORM__DARWIN -D__PLATFORM__UNIX
else ifeq ($(HB_PLATFORM),bsd)
HB_PRGFLAGS += -D__PLATFORM__BSD -D__PLATFORM__UNIX
else ifeq ($(HB_PLATFORM),sunos)
HB_PRGFLAGS += -D__PLATFORM__SUNOS -D__PLATFORM__UNIX
else ifeq ($(HB_PLATFORM),hpux)
HB_PRGFLAGS += -D__PLATFORM__HPUX -D__PLATFORM__UNIX
else ifeq ($(HB_PLATFORM),beos)
HB_PRGFLAGS += -D__PLATFORM__BEOS -D__PLATFORM__UNIX
endif
ifneq ($(HB_HOST_CPU),$(HB_CPU))
ifeq ($(HB_CPU),x86)
HB_PRGFLAGS += -D__ARCH32BIT__
else ifeq ($(HB_CPU),x86_64)
HB_PRGFLAGS += -D__ARCH64BIT__
else ifeq ($(HB_CPU),ia64)
HB_PRGFLAGS += -D__ARCH64BIT__
else
ifeq ($(HB_CPU),ia64)
HB_PRGFLAGS += -D__ARCH64BIT__
endif
endif
else
ifeq ($(HB_PLATFORM),wce)
HB_PRGFLAGS += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
else
ifeq ($(HB_PLATFORM),dos)
HB_PRGFLAGS += -D__PLATFORM__DOS
else
ifeq ($(HB_PLATFORM),os2)
HB_PRGFLAGS += -D__PLATFORM__OS2
else
ifeq ($(HB_PLATFORM),linux)
HB_PRGFLAGS += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
endif
endif
endif
endif
endif
endif

6
harbour/config/globsh.mk
View File

@@ -51,7 +51,7 @@ dirbase::
@[ -z "$(IMP_FILE)" ] || [ -d "$(IMP_DIR)" ] || $(MDP) $(IMP_DIR)
clean::
-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE) $(DYN_FILE); \
-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE) $(DYN_FILE) $(IMP_FILE); \
if [ -n "$(LIB_FILE)" ]; then \
$(RM) $(basename $(LIB_FILE)).bak; \
[ "`$(ECHO) $(LIB_DIR)/*`" != "$(LIB_DIR)/*" ] || $(RDP) $(LIB_DIR); \
@@ -145,7 +145,7 @@ dirbase::
$(if $(IMP_FILE),-@$(MDP) $(IMP_DIR),)
clean::
-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS) $(DYN_FILE_OS) $(IMP_FILE_OS)
$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,)
$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
@@ -186,7 +186,7 @@ dirbase::
$(if $(IMP_FILE),-@$(MDP) $(IMP_DIR_OS),)
clean::
-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS) $(DYN_FILE_OS) $(IMP_FILE_OS)
$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,)
$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)

17
harbour/package/winuni/HARBOUR_README_MINGWARM
View File

@@ -2,21 +2,12 @@
If this directory is empty, download package from link below
and unpack into this directory.
https://sourceforge.net/project/downloading.php?group_id=173455&use_mirror=switch&filename=cygwin-cegcc-mingw32ce-0.51.0-1.tar.gz&a=34126466
http://sourceforge.net/projects/cegcc/files/
NOTES: - In order to unpack and *use* this package, you'll
need Cygwin package (from http://cygwin.com) installed
and put in PATH for Cygwin runtime (cygwin1.dll).
- To unpack:
> sh
$ tar -zxvf cygwin-cegcc-mingw32ce-0.51.0-1.tar.gz
$ exit
- Unpack using these commands:
> bzip2 -d cegcc_mingw32ce_cygwin1.7_r1375.tar.bz2
> tar -xvf cegcc_mingw32ce_cygwin1.7_r1375.tar -h
- Move content of /opt/mingw32ce directory to this one.
- If you feel unconfortable with Cygwin shell, you can
use gzip and GNU Tar to unpack it from Windows command
line, using these commands:
> gzip -d cygwin-cegcc-mingw32ce-0.51.0-1.tar.gz
> tar -xvf cygwin-cegcc-mingw32ce-0.51.0-1.tar -h
UPDATE: It seems the cegcc team doesn't provide this binary download
anymore. Please consult their website for more information.

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

@@ -6146,7 +6146,7 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
AAdd( aDef, "__PLATFORM__DARWIN" )
AAdd( aDef, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "bsd"
AAdd( aDef, "__PLATFORM__BDS" )
AAdd( aDef, "__PLATFORM__BSD" )
AAdd( aDef, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "sunos"
AAdd( aDef, "__PLATFORM__SUNOS" )