Skip to content

Commit

Permalink
2017-09-19 22:49 UTC Viktor Szakats (vszakats users.noreply.github.com)
Browse files Browse the repository at this point in the history
  * config/win/watcom.mk
  * utils/hbmk2/hbmk2.prg
    ! remove watcom resource compiler (wrc) option
      "-zm: output Microsoft/IBM format .res files". The option enables
      a buggy codepath, generating a corrupt resource object, which in
      turn makes Windows fail to launch harbour.exe with a manifest
      policy error 'Invalid Xml syntax.'. The XML blob itself is
      identical to a well-working sample. Bug re/disappears by changing
      the XML blob. Tested with OpenWatcom 1.9, 2.0 32-bit + Windows 10.
      Turns out compiling/linking resources works without this option,
      and we don't need interoperability with MS/IBM, so it could be
      safely deleted and the buggy codepath avoided.
      Fixes: https://github.com/vszakats/harbour-core/issues/313

  * README.md
    * flag clang/icc/watcom on Windows with experimental status
      (over the existing 'partial support' status)

  * contrib/hbdoc/hbdoc_head.html
  * docs/_includes/head_stat.html
    * remove crossorigin="anonymous" from GA inclusion. It prevented
      tracking quite nicely, at least according to the Google Analytics
      dashboard
  • Loading branch information
vszakats committed Sep 19, 2017
1 parent 6ab9573 commit 10ab66b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 5 deletions.
25 changes: 25 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,31 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */

2017-09-19 22:49 UTC Viktor Szakats (vszakats users.noreply.github.com)
* config/win/watcom.mk
* utils/hbmk2/hbmk2.prg
! remove watcom resource compiler (wrc) option
"-zm: output Microsoft/IBM format .res files". The option enables
a buggy codepath, generating a corrupt resource object, which in
turn makes Windows fail to launch harbour.exe with a manifest
policy error 'Invalid Xml syntax.'. The XML blob itself is
identical to a well-working sample. Bug re/disappears by changing
the XML blob. Tested with OpenWatcom 1.9, 2.0 32-bit + Windows 10.
Turns out compiling/linking resources works without this option,
and we don't need interoperability with MS/IBM, so it could be
safely deleted and the buggy codepath avoided.
Fixes: https://github.com/vszakats/harbour-core/issues/313

* README.md
* flag clang/icc/watcom on Windows with experimental status
(over the existing 'partial support' status)

* contrib/hbdoc/hbdoc_head.html
* docs/_includes/head_stat.html
* remove crossorigin="anonymous" from GA inclusion. It prevented
tracking quite nicely, at least according to the Google Analytics
dashboard

2017-09-19 14:35 UTC Viktor Szakats (vszakats users.noreply.github.com)
* config/po2lang.hb
* src/lang/l_*.c
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ Press `<Alt+D>` in the app.
* msvc - Microsoft Visual C++ (2010 and above)
* msvc64 - Microsoft Visual C++ x86-64 (2010 and above)

### win (partial support, some features may be missing)
### win (experimental/partial support, some features may be missing)
* clang - Clang
* watcom - Open Watcom C/C++
* icc - Intel(R) C/C++
Expand Down
2 changes: 1 addition & 1 deletion config/win/watcom.mk
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ endif

RC := wrc
RC_OUT := -fo=
RCFLAGS += -i. -i$(GRANDP) -i$(HB_HOST_INC) -q -r -zm -bt=nt
RCFLAGS += -i. -i$(GRANDP) -i$(HB_HOST_INC) -q -r -bt=nt

LD := wlink
ifeq ($(HB_BUILD_DEBUG),yes)
Expand Down
2 changes: 1 addition & 1 deletion contrib/hbdoc/hbdoc_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
ga('set', 'anonymizeIp', true);
ga('send', 'pageview');
</script>
<script async crossorigin="anonymous" src="https://www.google-analytics.com/analytics.js"></script>
<script async src="https://www.google-analytics.com/analytics.js"></script>
2 changes: 1 addition & 1 deletion docs/_includes/head_stat.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
ga('set', 'anonymizeIp', true);
ga('send', 'pageview');
</script>
<script async crossorigin="anonymous" src="https://www.google-analytics.com/analytics.js"></script>
<script async src="https://www.google-analytics.com/analytics.js"></script>
2 changes: 1 addition & 1 deletion utils/hbmk2/hbmk2.prg
Original file line number Diff line number Diff line change
Expand Up @@ -5762,7 +5762,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
IF HBMK_ISPLAT( "win|os2" )
cBin_Res := "wrc" + hbmk[ _HBMK_cCCEXT ]
cResExt := ".res"
cOpt_Res := "-q -r {FR} -zm {IR} -fo={OS}"
cOpt_Res := "-q -r {FR} {IR} -fo={OS}"
DO CASE
CASE hbmk[ _HBMK_cPLAT ] == "win" ; cOpt_Res += " -bt=nt" /* default */
CASE hbmk[ _HBMK_cPLAT ] == "os2" ; cOpt_Res += " -bt=os2"
Expand Down

0 comments on commit 10ab66b

Please sign in to comment.