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

2009-02-27 19:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* INSTALL
    + Added text to specifically tell to rename mingw32-make.exe 
      to make.exe if the former is found in a distro.
      BTW most probably mingw32-make.exe would also make it, but
      our make_gnu.bat file wants make.exe, and there is no 
      easy way to check (but can be done).

  * utils/hbmk2/hbmk2.prg
    ! Fixed silly typo preventing object files to get their 
      proper extension in -hbcc mode.
    * Minor internal change to avoid changing extensions twice 
      on the same string, since this may cause loss.
This commit is contained in:
Viktor Szakats
2009-02-27 18:59:58 +00:00
parent 03f89cb121
commit 7ef2ee0b48
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-27 19:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* INSTALL
+ Added text to specifically tell to rename mingw32-make.exe
to make.exe if the former is found in a distro.
BTW most probably mingw32-make.exe would also make it, but
our make_gnu.bat file wants make.exe, and there is no
easy way to check (but can be done).
* utils/hbmk2/hbmk2.prg
! Fixed silly typo preventing object files to get their
proper extension in -hbcc mode.
* Minor internal change to avoid changing extensions twice
on the same string, since this may cause loss.
2009-02-27 19:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* INSTALL
* make_gnu.bat

2
harbour/INSTALL
View File

@@ -47,6 +47,8 @@ HOW TO BUILD AND INSTALL HARBOUR
distribution. Use your search engine with 'mingw gnu make'
or try this link:
http://sourceforge.net/project/showfiles.php?group_id=2435
In some packages make.exe is called mingw32-make.exe,
just copy/rename it to make.exe then.
> set HB_COMPILER=<msvc|bcc32|owatcom|...>
> set HB_INSTALL_PREFIX=<DIR>

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

@@ -63,8 +63,6 @@
*
*/
#pragma LINENUMBER=ON
#include "common.ch"
#include "directry.ch"
#include "fileio.ch"
@@ -204,7 +202,6 @@ FUNCTION Main( ... )
LOCAL s_aOPTL
LOCAL s_cPROGDIR
LOCAL s_cPROGNAME
LOCAL s_cMAPNAME
LOCAL s_cFIRST
LOCAL s_aOBJ
LOCAL s_aOBJA
@@ -933,15 +930,6 @@ FUNCTION Main( ... )
s_cPROGNAME := hb_FNameMerge( iif( Empty( cDir ), s_cPROGDIR, cDir ), cName, cExt )
ENDIF
/* Determine map name from output name. */
s_cMAPNAME := FN_ExtSet( s_cPROGNAME, ".map" )
/* Set output name extension. */
IF t_cARCH $ "os2|win|dos"
s_cPROGNAME := FN_ExtSet( s_cPROGNAME, ".exe" )
ELSE
s_cPROGNAME := FN_ExtSet( s_cPROGNAME )
ENDIF
IF lSysLoc
cPrefix := PathNormalize( s_cHB_LIB_INSTALL, lSysLoc )
ELSE
@@ -1699,6 +1687,9 @@ FUNCTION Main( ... )
IF ! Empty( cBin_CompC )
/* Compiling */
IF s_lTRACE
OutStd( "hbmk: C compiler command options:" + hb_osNewLine() + cOpt_CompC + hb_osNewLine() )
ENDIF
/* Order is significant */
cOpt_CompC := StrTran( cOpt_CompC, "{LC}" , ArrayToList( ArrayJoin( ListDirExt( s_aPRG, "", ".c" ), s_aC ) ) )
@@ -1712,9 +1703,9 @@ FUNCTION Main( ... )
cOpt_CompC := StrTran( cOpt_CompC, "{FL}" , iif( s_lBLDFLGL, cSelfFlagL + " ", "" ) +;
GetEnv( "HB_USER_LDFLAGS" ) + " " + ArrayToList( s_aOPTL ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OD}" , PathSepToTarget( FN_DirGet( s_cPROGNAME ) ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OO}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, cObjPrefix ) ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OE}" , PathSepToTarget( s_cPROGNAME ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OM}" , PathSepToTarget( s_cMAPNAME ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OO}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, cObjExt ) ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OE}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, iif( t_cARCH $ "os2|win|dos", ".exe", NIL ) ) ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OM}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, ".map" ) ) )
cOpt_CompC := StrTran( cOpt_CompC, "{DL}" , ArrayToList( ListCook( s_aLIBPATH, cLibPathPrefix ), cLibPathSep ) )
cOpt_CompC := StrTran( cOpt_CompC, "{DB}" , s_cHB_BIN_INSTALL )
cOpt_CompC := StrTran( cOpt_CompC, "{DI}" , s_cHB_INC_INSTALL )
@@ -1767,8 +1758,8 @@ FUNCTION Main( ... )
cOpt_Link := StrTran( cOpt_Link, "{LL}" , ArrayToList( s_aLIB ) )
cOpt_Link := StrTran( cOpt_Link, "{FL}" , iif( s_lBLDFLGL, cSelfFlagL + " ", "" ) +;
GetEnv( "HB_USER_LDFLAGS" ) + " " + ArrayToList( s_aOPTL ) )
cOpt_Link := StrTran( cOpt_Link, "{OE}" , PathSepToTarget( s_cPROGNAME ) )
cOpt_Link := StrTran( cOpt_Link, "{OM}" , PathSepToTarget( s_cMAPNAME ) )
cOpt_Link := StrTran( cOpt_Link, "{OE}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, iif( t_cARCH $ "os2|win|dos", ".exe", NIL ) ) ) )
cOpt_Link := StrTran( cOpt_Link, "{OM}" , PathSepToTarget( FN_ExtSet( s_cPROGNAME, ".map" ) ) )
cOpt_Link := StrTran( cOpt_Link, "{DL}" , ArrayToList( ListCook( s_aLIBPATH, cLibPathPrefix ), cLibPathSep ) )
cOpt_Link := StrTran( cOpt_Link, "{DB}" , s_cHB_BIN_INSTALL )
@@ -1823,6 +1814,7 @@ FUNCTION Main( ... )
IF nErrorLevel != 0
PauseForKey()
ELSEIF s_lRUN
s_cPROGNAME := FN_ExtSet( s_cPROGNAME, iif( t_cARCH $ "os2|win|dos", ".exe", NIL ) )
#if !( defined( __PLATFORM__WINDOWS ) .OR. defined( __PLATFORM__DOS ) .OR. defined( __PLATFORM__OS2 ) )
IF Empty( FN_DirGet( s_cPROGNAME ) )
s_cPROGNAME := "." + hb_osPathSeparator() + s_cPROGNAME