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

2011-02-08 23:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* Makefile
  * contrib/Makefile
    + Changed script runner tool to hbmk2 (from hbrun).
      So now hbrun is not required for build process.

  * utils/Makefile
  * package/harbour.spec
  * INSTALL
    * Changed to reflect that now hbmk2 runs the build scripts.

  * utils/hbmk2/hbmk2.prg
  * utils/hbrun/hbrun.prg
    + Added hbrun_ProgrName() function to return runner executable name.
This commit is contained in:
Viktor Szakats
2011-02-08 22:23:10 +00:00
parent 2425da0075
commit f6c7dde00c
8 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -16,6 +16,21 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-08 23:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* Makefile
* contrib/Makefile
+ Changed script runner tool to hbmk2 (from hbrun).
So now hbrun is not required for build process.
* utils/Makefile
* package/harbour.spec
* INSTALL
* Changed to reflect that now hbmk2 runs the build scripts.
* utils/hbmk2/hbmk2.prg
* utils/hbrun/hbrun.prg
+ Added hbrun_ProgrName() function to return runner executable name.
2011-02-08 22:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added experimental hbrun script runner "emulation" to hbmk2.

4
harbour/INSTALL
View File

@@ -220,7 +220,7 @@ HARBOUR
If you want to rebuild one specific contrib package, use this:
cd contrib/<name>
..\..\bin\<plat>\<comp>\hbrun ..\make.hbs [clean] [install] [custom hbmk2 options]
..\..\bin\<plat>\<comp>\hbmk2 ..\make.hbs [clean] [install] [custom hbmk2 options]
@@ -771,7 +771,7 @@ HARBOUR
If you leave this value empty, the make system will try to autodetect it,
so in practice all you have to do is to create a native build first (no
'install' required), then create the cross-build. If you set this value
manually, it may be useful to know that harbour, hbpp, hbmk2, hbrun
manually, it may be useful to know that harbour, hbpp and hbmk2
executables are required for a cross-build process to succeed.

4
harbour/Makefile
View File

@@ -14,7 +14,7 @@ ifeq ($(HB_BUILD_PARTS),compiler)
else
# When doing a plain clean, we must not clean hbrun and hbmk2
# When doing a plain clean, we must not clean hbmk2
# before calling it to clean the contrib area.
_CONTRIB_FIRST :=
ifneq ($(filter clean,$(HB_MAKECMDGOALS)),)
@@ -48,6 +48,6 @@ include $(ROOT)config/dir.mk
ifneq ($(HB_NO_HBSCRIPT),yes)
first clean install::
$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)config/postinst.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbrun not found, config/postinst.hbs skipped.$(ECHOQUOTE))
$(if $(wildcard $(HB_HOST_BIN_DIR)/hbmk2$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbmk2$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)config/postinst.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbmk2 not found, config/postinst.hbs skipped.$(ECHOQUOTE))
endif

2
harbour/contrib/Makefile
View File

@@ -9,6 +9,6 @@ include $(ROOT)config/global.mk
ifneq ($(HB_NO_HBSCRIPT),yes)
first clean install::
$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),-$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/make.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbrun not found, contrib/make.hbs skipped.$(ECHOQUOTE))
$(if $(wildcard $(HB_HOST_BIN_DIR)/hbmk2$(HB_HOST_BIN_EXT)),-$(HB_HOST_BIN_DIR)/hbmk2$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)contrib/make.hbs $@,@$(ECHO) $(ECHOQUOTE)! Warning: hbmk2 not found, contrib/make.hbs skipped.$(ECHOQUOTE))
endif

2
harbour/package/harbour.spec
View File

@@ -406,7 +406,7 @@ make %{?_smp_mflags}
%install
%{hb_env}
# necessary for shared linked hbrun used to execute postinst.hbs
# necessary for shared linked hbmk2 used to execute postinst.hbs
export LD_LIBRARY_PATH=$HB_INSTALL_LIB
make install %{?_smp_mflags}

2
harbour/utils/Makefile
View File

@@ -7,13 +7,13 @@ ROOT := ../
ifneq ($(HB_BUILD_PARTS),lib)
DIRS := \
hbrun \
hbmk2 \
ifneq ($(HB_BUILD_PARTS),compiler)
DIRS += \
hbi18n \
hbrun \
hbtest \
$(__HB_UTIL_ADDONS)

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

@@ -512,6 +512,7 @@ REQUEST HB_FGETATTR
/* For hbrun emulation */
STATIC s_cDirBase_hbrun
STATIC s_cProgName_hbrun
/* NOTE: Security token to protect against plugins accessing our
internal structures referenced from context variable */
@@ -11511,6 +11512,7 @@ PROCEDURE hbmk2_hbrun_minimal( cFile, ... )
ENDIF
CASE ".hrb"
s_cDirBase_hbrun := hb_DirBase()
s_cProgName_hbrun := hb_ProgName()
hb_argShift( .T. )
hb_hrbRun( cFile, ... )
EXIT
@@ -11525,6 +11527,10 @@ PROCEDURE hbmk2_hbrun_minimal( cFile, ... )
FUNCTION hbrun_DirBase()
RETURN s_cDirBase_hbrun
/* Public hbrun API */
FUNCTION hbrun_ProgName()
RETURN s_cProgName_hbrun
/* Public hbrun API */
PROCEDURE hbrun_gtInteractive()
hb_gtSelect( hb_gtCreate( hbrun_gtDefault() ) )

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

@@ -87,6 +87,7 @@ STATIC s_lPreserveHistory := .T.
STATIC s_lWasLoad := .F.
STATIC s_cDirBase
STATIC s_cProgName
/* ********************************************************************** */
@@ -166,6 +167,7 @@ PROCEDURE _APPMAIN( cFile, ... )
ENDIF
OTHERWISE
s_cDirBase := hb_DirBase()
s_cProgName := hb_ProgName()
hb_argShift( .T. )
hb_hrbRun( cFile, ... )
EXIT
@@ -271,6 +273,10 @@ STATIC FUNCTION hbrun_CoreHeaderFiles()
FUNCTION hbrun_DirBase()
RETURN s_cDirBase
/* Public hbrun API */
FUNCTION hbrun_ProgName()
RETURN s_cProgName
EXIT PROCEDURE hbrun_exit()
hbrun_HistorySave()