2017-09-13 18:04 UTC Viktor Szakats (vszakats users.noreply.github.com)

* contrib/hbrun/hbrun.hbp
  * ChangeLog.txt
  * package/harbour-wce.spec.in
  * package/harbour-win.spec.in
  * package/harbour.spec
  * package/mpkg_rpm_wce.sh
  * package/mpkg_rpm_win.sh
  * package/mpkg_rpm.sh
  * package/mpkg_src.sh
  * package/mpkg_ver.sh
  * package/mpkg_win.nsi
  * package/winuni/mpkg_win_uni.nsi
  * utils/hbmk2/hbmk2.hbp
  * utils/hbmk2/hbmk2.prg
  * utils/hbmk2/Makefile
  * package/harb_osx.icns -> package/harbour.icns
  * package/harb_win.ico -> package/harbour.ico
  * package/harb_win.mft -> package/harbour.mft
  * package/harb_win.rc -> package/harbour.rc
  * utils/hbmk2/hbmk2.rc -> utils/hbmk2/harbour.rc
    * sync more file renames with the 3.4 fork
      NOTE: some projects used to rely on harb_win.ico. This will
      not work anymore and these will need to be updated or even
      better fixed to rely on it local .ico file instead.
    * sync bash formatting and fixes. Formatting guidelines here
      https://google.github.io/styleguide/shell.xml
    * sync two hbmk2 macro names

utils/hbmk2/Makefile

@@ -5,8 +5,7 @@ include $(TOP)$(ROOT)config/global.mk
 PRG_SOURCES := \
    hbmk2.prg \
 
-RC_SOURCES := \
-   hbmk2.rc
+RC_SOURCES := harbour.rc
 
 PRG_MAIN := hbmk2.prg
 
@@ -31,6 +30,6 @@ endif
 # is better than Main()
 HB_PRGFLAGS += -DHBMK_USE_APPMAIN
 
-HB_PRGFLAGS += -DHBMK_WITH_ALL_EMBEDDED_HEADERS
+HB_PRGFLAGS += -DHBMK_WITH_BUILTIN_HEADERS_ALL
 
 include $(TOP)$(ROOT)config/bin.mk

utils/hbmk2/harbour.rc

@@ -1,10 +1,9 @@
-
 #if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
 ICON 1 DISCARDABLE "../../package/harb_os2.ico"
 #else
 #if ! defined( __BORLANDC__ )
-1 ICON DISCARDABLE "../../package/harb_win.ico"
+1 ICON DISCARDABLE "../../package/harbour.ico"
 #endif
-#include "../../package/harb_win.rc"
-__HB_CREATEPROCESS_MANIFEST_RESOURCE_ID __HB_RT_MANIFEST "../../package/harb_win.mft"
+#include "../../package/harbour.rc"
+__HB_CREATEPROCESS_MANIFEST_RESOURCE_ID __HB_RT_MANIFEST "../../package/harbour.mft"
 #endif

utils/hbmk2/hbmk2.hbp

@@ -17,15 +17,15 @@ hbmk2.prg
 -main=__hbmk_public_entry
 -DHBMK_USE_CUSTMAIN
 
--DHBMK_WITH_ALL_EMBEDDED_HEADERS
+-DHBMK_WITH_BUILTIN_HEADERS_ALL
 
 -lhbdossrl{dos}
 
 # not using these together with .rc input, because some compilers (mingw)
 # do not support multiple .rc inputs
-#-icon={allwin}../../package/harb_win.ico
+#-icon={allwin}../../package/harbour.ico
 #-icon={os2}../../package/harb_os2.ico
-hbmk2.rc
+harbour.rc
 
 # localization
 po/hbmk2.%{hb_lng}.po

utils/hbmk2/hbmk2.prg

@@ -13654,8 +13654,8 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
 STATIC FUNCTION hbmk_CoreHeaderFiles()
    THREAD STATIC t_hHeaders := NIL
 
-#if defined( HBMK_WITH_EMBEDDED_HEADERS ) .OR. ;
-    defined( HBMK_WITH_ALL_EMBEDDED_HEADERS )
+#if defined( HBMK_WITH_BUILTIN_HEADERS_TOP ) .OR. ;
+    defined( HBMK_WITH_BUILTIN_HEADERS_ALL )
 
    IF t_hHeaders == NIL
       t_hHeaders := { => }
@@ -13667,7 +13667,7 @@ STATIC FUNCTION hbmk_CoreHeaderFiles()
 #if defined( _HBSHELL_EXTRA_HEADER )
       ADD HEADER TO t_hHeaders FILE _HBSHELL_EXTRA_HEADER
 #endif
-#if defined( HBMK_WITH_ALL_EMBEDDED_HEADERS )
+#if defined( HBMK_WITH_BUILTIN_HEADERS_ALL )
       ADD HEADER TO t_hHeaders FILE "achoice.ch"
       ADD HEADER TO t_hHeaders FILE "assert.ch"
       ADD HEADER TO t_hHeaders FILE "blob.ch"
@@ -16548,9 +16548,9 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong )
    AAdd( aLst_File_Shell, { _EXT_FILE_          , hb_StrFormat( I_( "list of extensions to load in interactive Harbour shell. One extension per line, part of line beyond a '#' character is ignored. Alternate filename on %2$s: %1$s. Resides in [*]: %3$s" ), _EXT_FILE_ALT, _EXT_FILE_ALT_OS, __hbshell_ConfigDir( hbmk[ _HBMK_lMarkdown ] ) ) } )
 #endif
 
-#if defined( HBMK_WITH_ALL_EMBEDDED_HEADERS )
+#if defined( HBMK_WITH_BUILTIN_HEADERS_ALL )
    AAdd( aLst_Config, I_( "Embed all core Harbour headers." ) )
-#elif defined( HBMK_WITH_EMBEDDED_HEADERS )
+#elif defined( HBMK_WITH_BUILTIN_HEADERS_TOP )
    AAdd( aLst_Config, I_( "Embed frequently used core Harbour headers." ) )
 #endif
 #ifndef _HBMK_EMBEDDED_