2008-11-07 17:48 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* bin/hbmk.bat + Added support for 'owatcom' as HB_COMPILER. ; NOTE: If there are no objections I'll remove Harbour support for 'watcom' HB_COMPILER, which was used for old non-opensource version of this compiler, but I guess it doesn't make too much sense having them anymore. * source/common/hbverdsp.c * Minor change in /build output. * include/hbver.ch * source/rtl/version.c * Changed ordering of parameter constants to make more sense. * bin/hbmk.bat * config/w32/owatcom.cf * Removed 'debug all' linker option to make executable sizes significantly smaller by default. If you need debug info, use 'L_USR=debug all'. ; NOTE: I'd suggest doing the same for other platform supported by owatcom. If there are no objections I can do this. * source/rtl/gtwvt/gtwvt.c * Typo, minor formatting.
2008-11-07 16:54:27 +00:00
parent eb912f672b
commit ca828aaca4
7 changed files with 57 additions and 24 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,34 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-11-07 17:48 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hbmk.bat
+    + Added support for 'owatcom' as HB_COMPILER.
+    ; NOTE: If there are no objections I'll remove Harbour 
+            support for 'watcom' HB_COMPILER, which was 
+            used for old non-opensource version of this 
+            compiler, but I guess it doesn't make too much 
+            sense having them anymore.
+
+  * source/common/hbverdsp.c
+    * Minor change in /build output.
+
+  * include/hbver.ch
+  * source/rtl/version.c
+    * Changed ordering of parameter constants to make more sense.
+
+  * bin/hbmk.bat
+  * config/w32/owatcom.cf
+    * Removed 'debug all' linker option to make executable sizes 
+      significantly smaller by default. If you need debug info, 
+      use 'L_USR=debug all'.
+    ; NOTE: I'd suggest doing the same for other platform supported 
+            by owatcom. If there are no objections I can do this.
+
+  * source/rtl/gtwvt/gtwvt.c
+    * Typo, minor formatting.
+
+
 2008-11-07 14:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/source/vm/set.c
    + finished hb_setSetFile() used internally for HB_SET_ALTFILE,
--- a/harbour/bin/hbmk.bat
+++ b/harbour/bin/hbmk.bat
@@ -78,6 +78,7 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
   echo     HB_COMPILER:
   echo       - When HB_ARCHITECTURE=dos
   echo         - djgpp   (Delorie GNU C, DOS 32-bit)
+   echo         - owatcom (OpenWatcom, DOS 32-bit)
   echo         - watcom  (OpenWatcom, DOS 32-bit)
   echo         - rxs32   (EMX/RSXNT/DOS GNU C, DOS 32-bit)
   echo       - When HB_ARCHITECTURE=w32
@@ -85,6 +86,7 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
   echo         - mingw   (MinGW GNU C, Windows 32-bit)
   echo         - gcc     (Cygnus/Cygwin GNU C, Windows 32-bit)
   echo         - bcc32   (Borland C++ 4.x, 5.x, 6.x, Windows 32-bit)
+   echo         - owatcom (OpenWatcom, Windows 32-bit)
   echo         - watcom  (OpenWatcom, Windows 32-bit)
   echo         - rxsnt   (EMX/RSXNT/Win32 GNU C, Windows 32-bit)
   goto END
@@ -158,10 +160,13 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt

 :A_DOS_RSX32_NOT

+   if "%HB_COMPILER%" == "owatcom" goto A_DOS_WATCOM
   if not "%HB_COMPILER%" == "watcom" goto END

+      :A_DOS_WATCOM
+
      wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
-      echo debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
+      echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
      echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp
      echo LIB hbcpage.lib >> _hb_mk.tmp
      echo LIB hbdebug.lib >> _hb_mk.tmp
@@ -224,10 +229,13 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt

 :A_WIN_RSXNT_NOT

+   if "%HB_COMPILER%" == "owatcom" goto A_WIN_WATCOM
   if not "%HB_COMPILER%" == "watcom" goto END

+      :A_WIN_WATCOM
+
      wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
-      echo debug all OP osn=NT OP stack=65536 OP CASEEXACT NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
+      echo OP osn=NT OP stack=65536 OP CASEEXACT %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
      echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp
      echo LIB hbcpage.lib >> _hb_mk.tmp
      echo LIB hbdebug.lib >> _hb_mk.tmp
--- a/harbour/config/w32/owatcom.cf
+++ b/harbour/config/w32/owatcom.cf
@@ -59,7 +59,7 @@ echo LIB kernel32.lib, user32.lib, wsock32.lib, winspool.lib, oleaut32.lib, uuid
 endef

 LD = wlink
-LDFLAGS = debug all OP osn=NT OP stack=65536 OP CASEEXACT
+LDFLAGS = OP osn=NT OP stack=65536 OP CASEEXACT

 ifeq ($(HB_LIB_COMPILE),)
   LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
--- a/harbour/include/hbver.ch
+++ b/harbour/include/hbver.ch
@@ -63,13 +63,13 @@
 #define HB_VERSION_RELEASE          4
 #define HB_VERSION_STATUS           5
 #define HB_VERSION_REVISION         6
-#define HB_VERSION_BUILD_DATE_STR   7
-#define HB_VERSION_BUILD_DATE       8
-#define HB_VERSION_BUILD_TIME       9
-#define HB_VERSION_PCODE_VER        10
-#define HB_VERSION_PCODE_VER_STR    11
-#define HB_VERSION_CHANGELOG_LAST   12
-#define HB_VERSION_CHANGELOG_ID     13
+#define HB_VERSION_CHANGELOG_LAST   7
+#define HB_VERSION_CHANGELOG_ID     8
+#define HB_VERSION_PCODE_VER        9
+#define HB_VERSION_PCODE_VER_STR    10
+#define HB_VERSION_BUILD_DATE_STR   11
+#define HB_VERSION_BUILD_DATE       12
+#define HB_VERSION_BUILD_TIME       13
 #define HB_VERSION_FLAG_PRG         14
 #define HB_VERSION_FLAG_C           15
 #define HB_VERSION_FLAG_LINKER      16
--- a/harbour/source/common/hbverdsp.c
+++ b/harbour/source/common/hbverdsp.c
@@ -101,11 +101,11 @@ void hb_verBuildInfo( void )
      hb_xfree( pszBuildDate );
   }

-   hb_conOutErr( "Last ChangeLog entry: ", 0 );
+   hb_conOutErr( "ChangeLog last entry: ", 0 );
   hb_conOutErr( hb_verSvnLastEntry(), 0 );
   hb_conOutErr( hb_conNewLine(), 0 );

-   hb_conOutErr( "ChangeLog SVN version: ", 0 );
+   hb_conOutErr( "ChangeLog ID: ", 0 );
   hb_conOutErr( hb_verSvnChangeLogID(), 0 );
   hb_conOutErr( hb_conNewLine(), 0 );

--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -255,7 +255,7 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
   pWVT->COLORS[14]        = YELLOW;
   pWVT->COLORS[15]        = BRIGHT_WHITE;

-   /* THEESE are the default font parameters, if not changed by user */
+   /* THESE are the default font parameters, if not changed by user */
   pWVT->PTEXTSIZE.x       = WVT_DEFAULT_FONT_WIDTH;
   pWVT->PTEXTSIZE.y       = WVT_DEFAULT_FONT_HEIGHT;
   pWVT->fontWidth         = WVT_DEFAULT_FONT_WIDTH;
@@ -486,10 +486,10 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
   SelectObject( hdc, hOldFont );
   ReleaseDC( pWVT->hWnd, hdc );

-  /*
-   * we will need to use the font size to handle the transformations from
-   * row column space in the future, so we keep it around in a static!
-   */
+   /*
+    * we will need to use the font size to handle the transformations from
+    * row column space in the future, so we keep it around in a static!
+    */

   pWVT->PTEXTSIZE.x = pWVT->fontWidth < 0 ? -pWVT->fontWidth :
                    tm.tmAveCharWidth; /* For fixed FONT should == tm.tmMaxCharWidth */
@@ -1675,7 +1675,6 @@ static HWND hb_gt_wvt_CreateWindow( HINSTANCE hInstance )

   szAppName = HB_TCHAR_CONVTO( hb_cmdargARGV()[ 0 ] );

-
   hWnd = CreateWindow(
               s_szClassName,                               /* classname */
               szAppName,                                   /* window name */
@@ -1752,9 +1751,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
   HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) );

   if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) )
-   {
      hb_errInternal( 10001, "It's not a GUI program", NULL, NULL );
-   }

   pWVT = hb_gt_wvt_New( pGT, ( HINSTANCE ) hInstance, iCmdShow );
   if( !pWVT )
--- a/harbour/source/rtl/version.c
+++ b/harbour/source/rtl/version.c
@@ -76,13 +76,13 @@ HB_FUNC( HB_VERSION )
   case HB_VERSION_RELEASE:        hb_retni( HB_VER_RELEASE ); break;
   case HB_VERSION_STATUS:         hb_retc( HB_VER_STATUS ); break;
   case HB_VERSION_REVISION:       hb_retni( hb_verSvnID() ); break;
+   case HB_VERSION_CHANGELOG_LAST: hb_retc_const( hb_verSvnLastEntry() ); break;
+   case HB_VERSION_CHANGELOG_ID:   hb_retc_const( hb_verSvnChangeLogID() ); break;
+   case HB_VERSION_PCODE_VER:      hb_retni( HB_PCODE_VER ); break;
+   case HB_VERSION_PCODE_VER_STR:  hb_retc_buffer( hb_verPCode() ); break;
   case HB_VERSION_BUILD_DATE_STR: hb_retc_buffer( hb_verBuildDate() ); break;
   case HB_VERSION_BUILD_DATE:     hb_retds( NULL ); break; /* TODO */
   case HB_VERSION_BUILD_TIME:     hb_retc( NULL ); break; /* TODO */
-   case HB_VERSION_PCODE_VER:      hb_retni( HB_PCODE_VER ); break;
-   case HB_VERSION_PCODE_VER_STR:  hb_retc_buffer( hb_verPCode() ); break;
-   case HB_VERSION_CHANGELOG_LAST: hb_retc_const( hb_verSvnLastEntry() ); break;
-   case HB_VERSION_CHANGELOG_ID:   hb_retc_const( hb_verSvnChangeLogID() ); break;
   case HB_VERSION_FLAG_PRG:       hb_retc_const( hb_verFlagsPRG() ); break;
   case HB_VERSION_FLAG_C:         hb_retc_const( hb_verFlagsC() ); break;
   case HB_VERSION_FLAG_LINKER:    hb_retc_const( hb_verFlagsL() ); break;