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

2010-01-06 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    ! Fixed instructions for .deb binary build.

  * contrib/hbide/hbide.hbp
    + Comment extended.

  * utils/hbmk2/hbmk2.prg
    + Comment extended.

  * config/globsh.mk
    ! Fixed typos in nt clean commands.
      [TOMERGE 2.0]

  * ChangeLog
    + Added TOMERGE 2.0 to prev entry.
This commit is contained in:
Viktor Szakats
2010-01-06 21:27:33 +00:00
parent 7fb88b37b0
commit 24bc432079
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,23 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-06 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
! Fixed instructions for .deb binary build.
* contrib/hbide/hbide.hbp
+ Comment extended.
* utils/hbmk2/hbmk2.prg
+ Comment extended.
* config/globsh.mk
! Fixed typos in nt clean commands.
[TOMERGE 2.0]
* ChangeLog
+ Added TOMERGE 2.0 to prev entry.
2010-01-06 21:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* mpkg_tgz.sh
! Fixed to detect case when tar is mapped to bsdtar
@@ -27,6 +44,7 @@
needs to be fixed, although current command should
work on Snow Leopard.
- Deleted comment no longer valid.
[TOMERGE 2.0]
* utils/hbmk2/hbmk2.prg
! Fixed C++ memory manager override to handle zero size memory

2
harbour/INSTALL
View File

@@ -215,7 +215,7 @@ HARBOUR
Binary .deb on Linux
--------------------
$ fakeroot debian/rules
$ fakeroot debian/rules binary
Binary .rpm on Linux
--------------------

8
harbour/config/globsh.mk
View File

@@ -114,13 +114,13 @@ clean::
$(if $(LIB_FILE),-@if exist "$(LIB_DIR_OS)" if not exist "$(LIB_DIR_OS)\*" $(RDP) "$(LIB_DIR_OS)",)
$(if $(BIN_FILE),-@if exist "$(BIN_FILE_OS)" $(RM) "$(BIN_FILE_OS)",)
$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).tds",)
$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).pdb",)
$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).ilk",)
$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).pdb" $(RM) "$(basename $(BIN_FILE_OS)).pdb",)
$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).ilk" $(RM) "$(basename $(BIN_FILE_OS)).ilk",)
$(if $(BIN_FILE),-@if exist "$(BIN_DIR_OS)" if not exist "$(BIN_DIR_OS)\*" $(RDP) "$(BIN_DIR_OS)",)
$(if $(DYN_FILE),-@if exist "$(DYN_FILE_OS)" $(RM) "$(DYN_FILE_OS)",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).tds",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).pdb",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).ilk",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).pdb" $(RM) "$(basename $(DYN_FILE_OS)).pdb",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).ilk" $(RM) "$(basename $(DYN_FILE_OS)).ilk",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).def" $(RM) "$(basename $(DYN_FILE_OS)).def",)
$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).exp" $(RM) "$(basename $(DYN_FILE_OS)).exp",)
$(if $(DYN_FILE),-@if exist "$(DYN_DIR_OS)" if not exist "$(DYN_DIR_OS)\*" $(RDP) "$(DYN_DIR_OS)",)

2
harbour/contrib/hbide/hbide.hbp
View File

@@ -10,7 +10,7 @@
-ohbide
# Trick to make it link using default Harbour builds
# Trick to make QT 4.6 link using default Harbour builds
-ldflag={msvc}-nodefaultlib:msvcrt.lib
-ldflag={msvc}-defaultlib:libcmt.lib

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

@@ -2997,8 +2997,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
( hbmk[ _HBMK_cPLAT ] == "wce" .AND. hbmk[ _HBMK_cCOMP ] == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */
/* ; Not enabled yet, because it would cause a lot of 3rd party code to
break due to sloppy type conversions and other trivial coding errors
usually not noticed with C compilers. [vszakats] */
break due to sloppy type conversions and other trivial coding mistakes
usually not noticed with C compilers. The other side-effect, is
much slower compilation process. [vszakats] */
#if 0
IF hbmk[ _HBMK_lCPP ] == NIL
hbmk[ _HBMK_lCPP ] := .T.