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

2011-02-10 21:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/dynlib/Makefile
  * config/postinst.hbs
  * config/global.mk
  * config/bin.mk
    * Cleaned up names after previous change.
This commit is contained in:
Viktor Szakats
2011-02-10 20:51:49 +00:00
parent 64eec33e40
commit 1db06691e5
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-10 21:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/dynlib/Makefile
* config/postinst.hbs
* config/global.mk
* config/bin.mk
* Cleaned up names after previous change.
2011-02-10 19:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
- src/dynlib/mt
* src/dynlib/Makefile
@@ -36,7 +43,7 @@
internal build-time option: _HB_BUILD_DYN_ST=yes
; Please test.
; TODO: Do a final cleanup on internal variable names to not have "ST" in them.
; TODO: Do a final cleanup on internal variable names to not have "ST" in them. [DONE]
2011-02-10 13:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/make.hbs

4
harbour/config/bin.mk
View File

@@ -45,8 +45,8 @@ ifeq ($(BUILD_SHARED),yes)
endif
endif
HB_LIBS_ST_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_ST)
HB_LIBS_MT_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_ST)
HB_LIBS_ST_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_NAME)
HB_LIBS_MT_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_NAME)
HB_LIBS_ST_NORDD := $(HB_LIBS_ST_RDD)
HB_LIBS_MT_NORDD := $(HB_LIBS_ST_RDD)

12
harbour/config/global.mk
View File

@@ -1792,19 +1792,19 @@ ifeq ($(HB_INIT_DONE),)
endif
endif
HB_DYNLIB_BASE_ST := harbour
HB_DYNLIB_BASE := harbour
ifeq ($(HB_PLATFORM),dos)
HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
else
ifeq ($(HB_PLATFORM),os2)
HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
else
HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)$(DYNNAME_POST)
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)$(DYNNAME_POST)
endif
endif
export HB_DYNLIB_BASE_ST
export HB_DYNLIB_ST
export HB_DYNLIB_BASE
export HB_DYNLIB_NAME
endif
endif

18
harbour/config/postinst.hbs
View File

@@ -35,8 +35,8 @@ PROCEDURE Main( ... )
LOCAL cSH_Script
LOCAL nAttr
LOCAL cST_Versioned
LOCAL cST_Versionless
LOCAL cDynVersioned
LOCAL cDynVersionless
IF Empty( GetEnvC( "HB_PLATFORM" ) ) .OR. ;
Empty( GetEnvC( "HB_COMPILER" ) ) .OR. ;
@@ -136,10 +136,10 @@ PROCEDURE Main( ... )
OutStd( "! Creating dynamic lib symlinks..." + hb_eol() )
cST_Versioned := GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_ST" ) + GetEnvC( "HB_DYNLIB_EXT" )
cST_Versionless := GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_BASE_ST" ) + GetEnvC( "HB_DYNLIB_EXT" )
cDynVersioned := GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_NAME" ) + GetEnvC( "HB_DYNLIB_EXT" )
cDynVersionless := GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_BASE" ) + GetEnvC( "HB_DYNLIB_EXT" )
mk_hb_FLinkSym( cST_Versioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + cST_Versionless )
mk_hb_FLinkSym( cDynVersioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + cDynVersionless )
DO CASE
CASE EndsWith( GetEnvC( "HB_INSTALL_DYN" ), "/usr/lib/harbour" ) .OR. ;
@@ -147,8 +147,8 @@ PROCEDURE Main( ... )
EndsWith( GetEnvC( "HB_INSTALL_DYN" ), "/usr/local/lib/harbour" ) .OR. ;
EndsWith( GetEnvC( "HB_INSTALL_DYN" ), "/usr/local/lib64/harbour" )
mk_hb_FLinkSym( "harbour" + hb_ps() + cST_Versioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + ".." + hb_ps() + cST_Versionless )
mk_hb_FLinkSym( "harbour" + hb_ps() + cST_Versioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + ".." + hb_ps() + cST_Versioned )
mk_hb_FLinkSym( "harbour" + hb_ps() + cDynVersioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + ".." + hb_ps() + cDynVersionless )
mk_hb_FLinkSym( "harbour" + hb_ps() + cDynVersioned, PathSepToSelf( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + ".." + hb_ps() + cDynVersioned )
CASE GetEnvC( "HB_INSTALL_DYN" ) == "/usr/local/harbour/lib"
/* TOFIX: Rewrite this in .prg */
@@ -464,10 +464,10 @@ STATIC FUNCTION mk_extern_core()
LOCAL aExtern
IF GetEnvC( "HB_REBUILD_EXTERN" ) == "yes" .AND. ;
! Empty( GetEnvC( "HB_DYNLIB_ST" ) )
! Empty( GetEnvC( "HB_DYNLIB_NAME" ) )
/* TOFIX: Use list of libs instead of dynamic lib */
IF ( aExtern := __hb_extern_get_list( PathSepToSelf( GetEnvC( "HB_DYNLIB_DIR" ) ) + hb_ps() + GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_ST" ) + GetEnvC( "HB_DYNLIB_EXT" ) ) ) != NIL
IF ( aExtern := __hb_extern_get_list( PathSepToSelf( GetEnvC( "HB_DYNLIB_DIR" ) ) + hb_ps() + GetEnvC( "HB_DYNLIB_PREF" ) + GetEnvC( "HB_DYNLIB_NAME" ) + GetEnvC( "HB_DYNLIB_EXT" ) ) ) != NIL
OutStd( "! Generating core extern headers..." + hb_eol() )

4
harbour/src/dynlib/Makefile
View File

@@ -13,8 +13,8 @@ ifneq ($(DYNDIRLIST_BASE),)
else
DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
endif
DYNNAME := $(HB_DYNLIB_ST)
DYNNAME2 := $(HB_DYNLIB_BASE_ST)
DYNNAME := $(HB_DYNLIB_NAME)
DYNNAME2 := $(HB_DYNLIB_BASE)
include $(TOP)$(ROOT)config/dyn.mk