From d2b5abaadbb17a4626a578827a83ffaad34365be Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Dec 2009 14:01:03 +0000
Subject: [PATCH] 2009-12-22 15:00 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   - package/winuni/HARBOUR_README_ADDINS   +
 package/winuni/HARBOUR_README_ADDONS     * Renamed.

  * package/winuni/mpkg_win_uni_extra_copy.bat
    * Changed to work from its original location.

  * package/winuni/mpkg_win_uni.bat
  * package/winuni/mpkg_win_uni.nsi
    * Added dos/watcom.
    - Commented dos/djgpp
---
 harbour/ChangeLog                             | 13 +++++++
 ...UR_README_ADDINS => HARBOUR_README_ADDONS} |  0
 harbour/package/winuni/mpkg_win_uni.bat       |  5 +--
 harbour/package/winuni/mpkg_win_uni.nsi       | 36 +++++++++++++++++--
 .../winuni/mpkg_win_uni_extra_copy.bat        | 16 ++++++---
 5 files changed, 61 insertions(+), 9 deletions(-)
 rename harbour/package/winuni/{HARBOUR_README_ADDINS => HARBOUR_README_ADDONS} (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dd531e5d8b..6cd1ef9c9c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-22 15:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  - package/winuni/HARBOUR_README_ADDINS
+  + package/winuni/HARBOUR_README_ADDONS
+    * Renamed.
+
+  * package/winuni/mpkg_win_uni_extra_copy.bat
+    * Changed to work from its original location.
+
+  * package/winuni/mpkg_win_uni.bat
+  * package/winuni/mpkg_win_uni.nsi
+    * Added dos/watcom.
+    - Commented dos/djgpp
+
 2009-12-22 13:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.pt_BR.po
     ! Applied fix received from Vailton Renato to prev version.
diff --git a/harbour/package/winuni/HARBOUR_README_ADDINS b/harbour/package/winuni/HARBOUR_README_ADDONS
similarity index 100%
rename from harbour/package/winuni/HARBOUR_README_ADDINS
rename to harbour/package/winuni/HARBOUR_README_ADDONS
diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat
index 3d6a22e47f..6756105b69 100644
--- a/harbour/package/winuni/mpkg_win_uni.bat
+++ b/harbour/package/winuni/mpkg_win_uni.bat
@@ -42,13 +42,14 @@ echo "hb20\lib\win\mingw\*.*"                     >> _hbfiles
 echo "hb20\lib\win\mingw64\*.*"                   >> _hbfiles
 echo "hb20\lib\wce\mingwarm\*.*"                  >> _hbfiles
 echo "hb20\addons\HARBOUR_README_ADDONS"          >> _hbfiles
-echo "hb20\comp\djgpp\HARBOUR_README_DJGPP"       >> _hbfiles
+rem echo "hb20\comp\djgpp\HARBOUR_README_DJGPP"       >> _hbfiles
 echo "hb20\comp\watcom\HARBOUR_README_WATCOM"     >> _hbfiles
 echo "hb20\comp\pocc\HARBOUR_README_POCC"         >> _hbfiles
 echo "hb20\comp\mingw\HARBOUR_README_MINGW"       >> _hbfiles
 echo "hb20\comp\mingw64\HARBOUR_README_MINGW64"   >> _hbfiles
 echo "hb20\comp\mingwarm\HARBOUR_README_MINGWARM" >> _hbfiles
-echo "hb20\lib\dos\djgpp\*.*"                     >> _hbfiles
+rem echo "hb20\lib\dos\djgpp\*.*"                     >> _hbfiles
+echo "hb20\lib\dos\watcom\*.*"                    >> _hbfiles
 echo "hb20\lib\linux\watcom\*.*"                  >> _hbfiles
 echo "hb20\lib\os2\watcom\*.*"                    >> _hbfiles
 echo "hb20\lib\win\msvc\*.*"                      >> _hbfiles
diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi
index d98df3a7aa..5ab47f1a32 100644
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -25,6 +25,8 @@ SetDateSave on
 SetDatablockOptimize on
 CRCCheck on
 
+!define PKG_NODJGPP
+
 !define /date NOW "%Y%m%d"
 
 !ifdef PKG_FULL
@@ -250,6 +252,15 @@ Section "Libs for Open Watcom OS/2" hb_lib_os2
 SectionEnd
 !endif
 
+!ifndef PKG_NODOS
+Section "Libs for Open Watcom MS-DOS" hb_lib_dos
+  SetOutPath $INSTDIR\lib\dos\watcom
+  File "hb20\lib\dos\watcom\*.*"
+  SetOutPath $INSTDIR\comp\watcom
+  File "hb20\comp\watcom\HARBOUR_README_WATCOM"
+SectionEnd
+!endif
+
 !ifndef PKG_NODJGPP
 Section "Libs for DJGPP MS-DOS" hb_lib_djgpp
   SetOutPath $INSTDIR\lib\dos\djgpp
@@ -275,8 +286,18 @@ SectionEnd
 !ifndef PKG_NOOS2
 Section /o "Dlls for OS/2" hb_dlls_os2
   SetOutPath $INSTDIR\bin
-  File "hb20\bin\harbour-20-os2.dll"
-  File "hb20\bin\harbourmt-20-os2.dll"
+  ; TOFIX: .dll name collision with MS-DOS
+  File "hb20\bin\harbour.dll"
+  File "hb20\bin\harbourm.dll"
+SectionEnd
+!endif
+
+!ifndef PKG_NODOS
+Section /o "Dlls for MS-DOS" hb_dlls_dos
+  SetOutPath $INSTDIR\bin
+  ; TOFIX: .dll name collision with OS/2
+  File "hb20\bin\harbour.dll"
+  File "hb20\bin\harbourm.dll"
 SectionEnd
 !endif
 !endif
@@ -323,8 +344,13 @@ SectionEnd
   LangString DESC_hb_main_x64     ${LANG_ENGLISH} "Harbour shared x64 tools"
   LangString DESC_hb_dlls_x64     ${LANG_ENGLISH} "Harbour dlls for x64"
   LangString DESC_hb_dlls_arm     ${LANG_ENGLISH} "Harbour dlls for WinCE/ARM"
+!ifdef _NEVER_
 !ifndef PKG_NOOS2
   LangString DESC_hb_dlls_os2     ${LANG_ENGLISH} "Harbour dlls for OS/2"
+!endif
+!ifndef PKG_NODOS
+  LangString DESC_hb_dlls_dos     ${LANG_ENGLISH} "Harbour dlls for MS-DOS"
+!endif
 !endif
   LangString DESC_hb_mingw        ${LANG_ENGLISH} "MinGW compiler"
 !ifdef PKG_FULL
@@ -349,6 +375,9 @@ SectionEnd
 !ifndef PKG_NOOS2
   LangString DESC_hb_lib_os2      ${LANG_ENGLISH} "Harbour libs for Open Watcom OS/2"
 !endif
+!ifndef PKG_NODOS
+  LangString DESC_hb_lib_dos      ${LANG_ENGLISH} "Harbour libs for Open Watcom MS-DOS"
+!endif
 !ifndef PKG_NODJGPP
   LangString DESC_hb_lib_djgpp    ${LANG_ENGLISH} "Harbour libs for DJGPP MS-DOS"
 !endif
@@ -385,6 +414,9 @@ SectionEnd
 !ifndef PKG_NOOS2
     !insertmacro MUI_DESCRIPTION_TEXT ${hb_lib_os2}      $(DESC_hb_lib_os2)
 !endif
+!ifndef PKG_NODOS
+    !insertmacro MUI_DESCRIPTION_TEXT ${hb_lib_dos}      $(DESC_hb_lib_dos)
+!endif
 !ifndef PKG_NODJGPP
     !insertmacro MUI_DESCRIPTION_TEXT ${hb_lib_djgpp}    $(DESC_hb_lib_djgpp)
 !endif
diff --git a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
index 25f189a901..721c3dcc4e 100644
--- a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
+++ b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
@@ -6,15 +6,21 @@
 
 @rem has to be run from contrib root. Adjust target dir.
 
+pushd
+
+cd ..\..\contrib
+
 for /F %%a in ( 'dir /b /ad' ) do (
    echo %%a
-   xcopy /y /s %%a\*.hbc     C:\hb\hb20\contrib\%%a\
-   xcopy /y /s %%a\tests\*.* C:\hb\hb20\contrib\%%a\tests\
-   xcopy /y /s %%a\utils\*.* C:\hb\hb20\contrib\%%a\utils\
+   xcopy /y /s %%a\*.hbc     F:\hb\hb20\contrib\%%a\
+   xcopy /y /s %%a\tests\*.* F:\hb\hb20\contrib\%%a\tests\
+   xcopy /y /s %%a\utils\*.* F:\hb\hb20\contrib\%%a\utils\
 )
 
 for /F %%a in ( 'dir /b /ad rddsql' ) do (
    echo %%a
-   xcopy /y /s rddsql\%%a\*.hbc     C:\hb\hb20\contrib\rddsql\%%a\
-   xcopy /y /s rddsql\%%a\tests\*.* C:\hb\hb20\contrib\rddsql\%%a\tests\
+   xcopy /y /s rddsql\%%a\*.hbc     F:\hb\hb20\contrib\rddsql\%%a\
+   xcopy /y /s rddsql\%%a\tests\*.* F:\hb\hb20\contrib\rddsql\%%a\tests\
 )
+
+popd