diff --git a/ChangeLog.txt b/ChangeLog.txt index 653cf10f6c..c491b2b416 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,32 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-15 18:27 UTC+0100 Viktor Szakats (harbour syenar.net) + * package/* + * src/compiler/harbour.y + * src/compiler/harbour.yyc + * src/macro/macro.y + * src/macro/macro.yyc + * src/pp/hbpp.1 + * tests/*/* + * utils/* + * stripped svn header manually + + * tests/hbdocext.hb + * tests/lang2po.hb + * tests/big5_gen.prg + * tests/uc16_gen.prg + * do not add svn ids to generated sources + + + tests/stripsvn.hb + + added script to strip svn header from sources + +2013-03-15 17:53 UTC+0100 Viktor Szakats (harbour syenar.net) + * tests/hbdocext.hb + * tests/lang2po.hb + * tests/uc16_gen.prg + * tests/big5_gen.prg + 2013-03-15 17:31 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + replaced HBRawVersion() with better implementation diff --git a/Makefile b/Makefile index a8cba09f28..81d4a97f84 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ROOT := ./ include $(ROOT)config/global.mk diff --git a/bin/3rdpatch.hb b/bin/3rdpatch.hb index 13b68d3f81..014d048e35 100755 --- a/bin/3rdpatch.hb +++ b/bin/3rdpatch.hb @@ -1,7 +1,4 @@ #!/usr/bin/hbmk2 -/* - * $Id$ - */ /* * 3rdpatch - a tool to help update 3rd party components while keeping local fixes diff --git a/bin/commit.hb b/bin/commit.hb index 147a6111a1..80aa13dff2 100644 --- a/bin/commit.hb +++ b/bin/commit.hb @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Commit preparer diff --git a/bin/harbour.ucf b/bin/harbour.ucf index 5d56d73212..9f81269e8f 100644 --- a/bin/harbour.ucf +++ b/bin/harbour.ucf @@ -1,7 +1,3 @@ -# -# $Id$ -# - # --------------------------------------------------------------- # uncrustify config file for Harbour C sources. # http://uncrustify.sourceforge.net/ diff --git a/package/harb_win.rc b/package/harb_win.rc index 000e212b96..33ff430ae8 100644 --- a/package/harb_win.rc +++ b/package/harb_win.rc @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* --------------------------------------------------------------- Copyright 2011 Viktor Szakats (harbour syenar.net) See COPYING.txt for licensing terms. diff --git a/package/harbour-wce.spec.in b/package/harbour-wce.spec.in index 92ad2ebc67..869647f46f 100644 --- a/package/harbour-wce.spec.in +++ b/package/harbour-wce.spec.in @@ -1,7 +1,3 @@ -# -# $Id$ -# - # --------------------------------------------------------------- # Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl), # Harbour-WinCE cross build RPM spec file diff --git a/package/harbour-win.spec.in b/package/harbour-win.spec.in index 9415ad67f6..0adb3b9878 100644 --- a/package/harbour-win.spec.in +++ b/package/harbour-win.spec.in @@ -1,7 +1,3 @@ -# -# $Id$ -# - # --------------------------------------------------------------- # Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl), # Harbour-MinGW cross build RPM spec file diff --git a/package/harbour.spec b/package/harbour.spec index 2e897369ab..dcd59013bb 100644 --- a/package/harbour.spec +++ b/package/harbour.spec @@ -1,7 +1,3 @@ -# -# $Id$ -# - # --------------------------------------------------------------- # Copyright 2003 Przemyslaw Czerpak , # Dave Pearson diff --git a/package/mpkg_rpm.sh b/package/mpkg_rpm.sh index 3a1a88020c..fee1e38a9b 100755 --- a/package/mpkg_rpm.sh +++ b/package/mpkg_rpm.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # --------------------------------------------------------------- # Copyright 2003 Przemyslaw Czerpak diff --git a/package/mpkg_rpm_wce.sh b/package/mpkg_rpm_wce.sh index 48d44d6ce6..7e51f4ce0b 100755 --- a/package/mpkg_rpm_wce.sh +++ b/package/mpkg_rpm_wce.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # --------------------------------------------------------------- # Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl) diff --git a/package/mpkg_rpm_win.sh b/package/mpkg_rpm_win.sh index f288fc7254..82195ba677 100755 --- a/package/mpkg_rpm_win.sh +++ b/package/mpkg_rpm_win.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # --------------------------------------------------------------- # Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl) diff --git a/package/mpkg_ver.sh b/package/mpkg_ver.sh index c5a6c0195f..332865d5cd 100755 --- a/package/mpkg_ver.sh +++ b/package/mpkg_ver.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # --------------------------------------------------------------- # Copyright 2003 Przemyslaw Czerpak diff --git a/package/mpkg_win.nsi b/package/mpkg_win.nsi index 61d1c51892..689aae775f 100644 --- a/package/mpkg_win.nsi +++ b/package/mpkg_win.nsi @@ -1,7 +1,3 @@ -; -; $Id$ -; - ; --------------------------------------------------------------- ; Copyright 2009 Viktor Szakats (harbour syenar.net) ; See COPYING.txt for licensing terms. diff --git a/package/winuni/mpkg_win_uni.bat b/package/winuni/mpkg_win_uni.bat index 4e884e9f1f..c83535e1be 100644 --- a/package/winuni/mpkg_win_uni.bat +++ b/package/winuni/mpkg_win_uni.bat @@ -1,165 +1,161 @@ -@rem -@rem $Id$ -@rem - -@echo off - -rem --------------------------------------------------------------- -rem Copyright 2009-2011 Viktor Szakats (harbour syenar.net) -rem See COPYING.txt for licensing terms. -rem --------------------------------------------------------------- - -rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, -rem create required packages beforehand. -rem - Requires BCC in PATH or HB_DIR_BCC_IMPLIB (for implib). -rem - Run this from vanilla official source tree only. -rem - Requires GNU sed tool in PATH - -echo ! Self: %0 - -if "%HB_VS%" == "" set HB_VS=32 -if "%HB_VL%" == "" set HB_VL=320 -if "%HB_VM%" == "" set HB_VM=3.2 -if "%HB_VF%" == "" set HB_VF=3.2.0dev -if "%HB_RT%" == "" set HB_RT=C:\hb\ - -set HB_DR=hb%HB_VS%\ -set HB_ABSROOT=%HB_RT%%HB_DR% - -rem ; Assemble unified package from per-target builds - -if exist %HB_ABSROOT% rd /q /s %HB_ABSROOT% - -xcopy /y %~dp0RELNOTES.txt %HB_ABSROOT% -xcopy /y /s %~dp0..\..\extras\*.* %HB_ABSROOT%extras\ -xcopy /y /s %~dp0..\..\tests\*.* %HB_ABSROOT%tests\ -xcopy /y %~dp0HARBOUR_README_ADDONS.txt %HB_ABSROOT%addons\ -xcopy /y %~dp0HARBOUR_README_DJGPP.txt %HB_ABSROOT%comp\djgpp\ -xcopy /y %~dp0HARBOUR_README_MINGW.txt %HB_ABSROOT%comp\mingw\ -xcopy /y %~dp0HARBOUR_README_MINGW64.txt %HB_ABSROOT%comp\mingw64\ -xcopy /y %~dp0HARBOUR_README_MINGWARM.txt %HB_ABSROOT%comp\mingwarm\ -xcopy /y %~dp0HARBOUR_README_POCC.txt %HB_ABSROOT%comp\pocc\ -xcopy /y %~dp0HARBOUR_README_WATCOM.txt %HB_ABSROOT%comp\watcom\ - -xcopy /y /s %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw %HB_ABSROOT% - -xcopy /y /s %~dp0..\..\pkg\linux\watcom\harbour-%HB_VF%-linux-watcom\lib %HB_ABSROOT%lib\linux\watcom\ -xcopy /y /s %~dp0..\..\pkg\dos\watcom\hb%HB_VL%wa\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\os2\watcom\harbour-%HB_VF%-os2-watcom\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\bcc\harbour-%HB_VF%-win-bcc\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\bcc64\harbour-%HB_VF%-win-bcc64\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\msvc\harbour-%HB_VF%-win-msvc\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\lib %HB_ABSROOT%lib\ -xcopy /y /s %~dp0..\..\pkg\win\watcom\harbour-%HB_VF%-win-watcom\lib %HB_ABSROOT%lib\ - -xcopy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\*.dll %HB_ABSROOT%bin\ -xcopy /y %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\bin\*.dll %HB_ABSROOT%bin\ - -rem ; Create special implibs for Borland (requires BCC in PATH) -rem NOTE: Using intermediate .def files, because direct .dll to .lib conversion -rem is buggy in BCC55 and BCC58 (no other versions tested), leaving off -rem leading underscore from certain ("random") symbols, resulting in -rem unresolved externals, when trying to use it. [vszakats] -for %%a in ( %HB_ABSROOT%bin\*-%HB_VS%.dll ) do ( - "%HB_DIR_BCC_IMPLIB%impdef.exe" -a "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" "%%a" - echo s/LIBRARY %%~na.DLL/LIBRARY "%%~na.dll"/Ig> _hbtemp.sed - sed -f _hbtemp.sed < "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" > "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" - "%HB_DIR_BCC_IMPLIB%implib.exe" -c -a "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.lib" "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" - del "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" - del "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" -) -del _hbtemp.sed - - copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbmk2.exe %HB_ABSROOT%bin\hbmk2-x64.exe - copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbnetio.exe %HB_ABSROOT%bin\hbnetio-x64.exe - copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbrun.exe %HB_ABSROOT%bin\hbrun-x64.exe - copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbtest.exe %HB_ABSROOT%bin\hbtest-x64.exe - -xcopy /y "%HB_DIR_UPX%upx.exe" %HB_ABSROOT%bin\ - copy /y "%HB_DIR_UPX%LICENSE" %HB_ABSROOT%bin\upx_LICENSE.txt - -xcopy /y /s /e "%HB_DIR_MINGW%" %HB_ABSROOT%comp\mingw\ -rem del %HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe - -xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_DIR_MINGW%\bin\mingwm10.dll" %HB_ABSROOT%bin\ - -rem ; Create unified installer - -pushd - -cd %HB_RT% - -if exist %HB_RT%harbour-%HB_VF%-win-log.txt del %HB_RT%harbour-%HB_VF%-win-log.txt -if exist %HB_RT%harbour-%HB_VF%-win.exe del %HB_RT%harbour-%HB_VF%-win.exe - -"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% %~dp0mpkg_win_uni.nsi >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 - -rem ; Create unified archive - -echo.> _hbfiles -echo "%HB_DR%RELNOTES.txt" >> _hbfiles -echo "%HB_DR%README.txt" >> _hbfiles -echo "%HB_DR%COPYING.txt" >> _hbfiles -echo "%HB_DR%ChangeLog*.txt" >> _hbfiles -echo "%HB_DR%bin\*-%HB_VS%.dll" >> _hbfiles -echo "%HB_DR%bin\harbour.exe" >> _hbfiles -echo "%HB_DR%bin\hbformat.exe" >> _hbfiles -echo "%HB_DR%bin\hbi18n.exe" >> _hbfiles -echo "%HB_DR%bin\hbmk2.exe" >> _hbfiles -echo "%HB_DR%bin\hbmk2.*.hbl" >> _hbfiles -echo "%HB_DR%bin\hbnetio.exe" >> _hbfiles -echo "%HB_DR%bin\hbpp.exe" >> _hbfiles -echo "%HB_DR%bin\hbrun.exe" >> _hbfiles -echo "%HB_DR%bin\hbtest.exe" >> _hbfiles -if exist "%HB_DR%bin\*.hb" echo "%HB_DR%bin\*.hb" >> _hbfiles -if exist "%HB_DR%bin\*.hbr" echo "%HB_DR%bin\*.hbr" >> _hbfiles -if exist "%HB_DR%bin\*.ucf" echo "%HB_DR%bin\*.ucf" >> _hbfiles -if exist "%HB_DR%bin\hbmk.hbc" echo "%HB_DR%bin\hbmk.hbc" >> _hbfiles -echo "%HB_DR%bin\upx*.*" >> _hbfiles -echo "%HB_DR%include\*.*" >> _hbfiles -echo "%HB_DR%bin\hbmk2-x64.exe" >> _hbfiles -echo "%HB_DR%bin\hbnetio-x64.exe" >> _hbfiles -echo "%HB_DR%bin\hbrun-x64.exe" >> _hbfiles -echo "%HB_DR%bin\hbtest-x64.exe" >> _hbfiles -echo "%HB_DR%lib\win\mingw\*.*" >> _hbfiles -echo "%HB_DR%lib\win\mingw64\*.*" >> _hbfiles -echo "%HB_DR%lib\wce\mingwarm\*.*" >> _hbfiles -echo "%HB_DR%addons\HARBOUR_README_ADDONS.txt" >> _hbfiles -rem echo "%HB_DR%comp\djgpp\HARBOUR_README_DJGPP.txt" >> _hbfiles -echo "%HB_DR%comp\watcom\HARBOUR_README_WATCOM.txt" >> _hbfiles -echo "%HB_DR%comp\pocc\HARBOUR_README_POCC.txt" >> _hbfiles -echo "%HB_DR%comp\mingw\HARBOUR_README_MINGW.txt" >> _hbfiles -echo "%HB_DR%comp\mingw64\HARBOUR_README_MINGW64.txt" >> _hbfiles -echo "%HB_DR%comp\mingwarm\HARBOUR_README_MINGWARM.txt" >> _hbfiles -rem echo "%HB_DR%lib\dos\djgpp\*.*" >> _hbfiles -echo "%HB_DR%lib\dos\watcom\*.*" >> _hbfiles -echo "%HB_DR%lib\linux\watcom\*.*" >> _hbfiles -echo "%HB_DR%lib\os2\watcom\*.*" >> _hbfiles -echo "%HB_DR%lib\win\msvc\*.*" >> _hbfiles -echo "%HB_DR%lib\win\msvc64\*.*" >> _hbfiles -rem echo "%HB_DR%bin\harbour-%HB_VS%-bcc.dll" >> _hbfiles -echo "%HB_DR%lib\win\bcc\*.*" >> _hbfiles -echo "%HB_DR%lib\win\bcc64\*.*" >> _hbfiles -echo "%HB_DR%lib\win\watcom\*.*" >> _hbfiles -rem echo "%HB_DR%lib\win\pocc\*.*" >> _hbfiles -rem echo "%HB_DR%lib\win\pocc64\*.*" >> _hbfiles -rem echo "%HB_DR%lib\wce\poccarm\*.*" >> _hbfiles -echo "%HB_DR%bin\*-%HB_VS%-x64.dll" >> _hbfiles -echo "%HB_DR%bin\harbour-%HB_VS%-wce-arm.dll" >> _hbfiles -rem echo "%HB_DR%bin\harbour-%HB_VS%-os2.dll" >> _hbfiles -echo "%HB_DR%tests\*.*" >> _hbfiles -echo "%HB_DR%doc\*.*" >> _hbfiles -echo "%HB_DR%comp\mingw\*" >> _hbfiles -echo "%HB_DR%extras\*.*" >> _hbfiles -echo "%HB_DR%contrib\*.*" >> _hbfiles - -if exist %HB_RT%harbour-%HB_VF%-win.7z del %HB_RT%harbour-%HB_VF%-win.7z -"%HB_DIR_7Z%7za.exe" a -r %HB_RT%harbour-%HB_VF%-win.7z @_hbfiles >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 - -del _hbfiles - -popd +@echo off + +rem --------------------------------------------------------------- +rem Copyright 2009-2011 Viktor Szakats (harbour syenar.net) +rem See COPYING.txt for licensing terms. +rem --------------------------------------------------------------- + +rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, +rem create required packages beforehand. +rem - Requires BCC in PATH or HB_DIR_BCC_IMPLIB (for implib). +rem - Run this from vanilla official source tree only. +rem - Requires GNU sed tool in PATH + +echo ! Self: %0 + +if "%HB_VS%" == "" set HB_VS=32 +if "%HB_VL%" == "" set HB_VL=320 +if "%HB_VM%" == "" set HB_VM=3.2 +if "%HB_VF%" == "" set HB_VF=3.2.0dev +if "%HB_RT%" == "" set HB_RT=C:\hb\ + +set HB_DR=hb%HB_VS%\ +set HB_ABSROOT=%HB_RT%%HB_DR% + +rem ; Assemble unified package from per-target builds + +if exist %HB_ABSROOT% rd /q /s %HB_ABSROOT% + +xcopy /y %~dp0RELNOTES.txt %HB_ABSROOT% +xcopy /y /s %~dp0..\..\extras\*.* %HB_ABSROOT%extras\ +xcopy /y /s %~dp0..\..\tests\*.* %HB_ABSROOT%tests\ +xcopy /y %~dp0HARBOUR_README_ADDONS.txt %HB_ABSROOT%addons\ +xcopy /y %~dp0HARBOUR_README_DJGPP.txt %HB_ABSROOT%comp\djgpp\ +xcopy /y %~dp0HARBOUR_README_MINGW.txt %HB_ABSROOT%comp\mingw\ +xcopy /y %~dp0HARBOUR_README_MINGW64.txt %HB_ABSROOT%comp\mingw64\ +xcopy /y %~dp0HARBOUR_README_MINGWARM.txt %HB_ABSROOT%comp\mingwarm\ +xcopy /y %~dp0HARBOUR_README_POCC.txt %HB_ABSROOT%comp\pocc\ +xcopy /y %~dp0HARBOUR_README_WATCOM.txt %HB_ABSROOT%comp\watcom\ + +xcopy /y /s %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw %HB_ABSROOT% + +xcopy /y /s %~dp0..\..\pkg\linux\watcom\harbour-%HB_VF%-linux-watcom\lib %HB_ABSROOT%lib\linux\watcom\ +xcopy /y /s %~dp0..\..\pkg\dos\watcom\hb%HB_VL%wa\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\os2\watcom\harbour-%HB_VF%-os2-watcom\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\bcc\harbour-%HB_VF%-win-bcc\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\bcc64\harbour-%HB_VF%-win-bcc64\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\msvc\harbour-%HB_VF%-win-msvc\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\lib %HB_ABSROOT%lib\ +xcopy /y /s %~dp0..\..\pkg\win\watcom\harbour-%HB_VF%-win-watcom\lib %HB_ABSROOT%lib\ + +xcopy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\*.dll %HB_ABSROOT%bin\ +xcopy /y %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\bin\*.dll %HB_ABSROOT%bin\ + +rem ; Create special implibs for Borland (requires BCC in PATH) +rem NOTE: Using intermediate .def files, because direct .dll to .lib conversion +rem is buggy in BCC55 and BCC58 (no other versions tested), leaving off +rem leading underscore from certain ("random") symbols, resulting in +rem unresolved externals, when trying to use it. [vszakats] +for %%a in ( %HB_ABSROOT%bin\*-%HB_VS%.dll ) do ( + "%HB_DIR_BCC_IMPLIB%impdef.exe" -a "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" "%%a" + echo s/LIBRARY %%~na.DLL/LIBRARY "%%~na.dll"/Ig> _hbtemp.sed + sed -f _hbtemp.sed < "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" > "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" + "%HB_DIR_BCC_IMPLIB%implib.exe" -c -a "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.lib" "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" + del "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" + del "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def" +) +del _hbtemp.sed + + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbmk2.exe %HB_ABSROOT%bin\hbmk2-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbnetio.exe %HB_ABSROOT%bin\hbnetio-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbrun.exe %HB_ABSROOT%bin\hbrun-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbtest.exe %HB_ABSROOT%bin\hbtest-x64.exe + +xcopy /y "%HB_DIR_UPX%upx.exe" %HB_ABSROOT%bin\ + copy /y "%HB_DIR_UPX%LICENSE" %HB_ABSROOT%bin\upx_LICENSE.txt + +xcopy /y /s /e "%HB_DIR_MINGW%" %HB_ABSROOT%comp\mingw\ +rem del %HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe + +xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll" %HB_ABSROOT%bin\ +xcopy /y "%HB_DIR_MINGW%\bin\mingwm10.dll" %HB_ABSROOT%bin\ + +rem ; Create unified installer + +pushd + +cd %HB_RT% + +if exist %HB_RT%harbour-%HB_VF%-win-log.txt del %HB_RT%harbour-%HB_VF%-win-log.txt +if exist %HB_RT%harbour-%HB_VF%-win.exe del %HB_RT%harbour-%HB_VF%-win.exe + +"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% %~dp0mpkg_win_uni.nsi >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 + +rem ; Create unified archive + +echo.> _hbfiles +echo "%HB_DR%RELNOTES.txt" >> _hbfiles +echo "%HB_DR%README.txt" >> _hbfiles +echo "%HB_DR%COPYING.txt" >> _hbfiles +echo "%HB_DR%ChangeLog*.txt" >> _hbfiles +echo "%HB_DR%bin\*-%HB_VS%.dll" >> _hbfiles +echo "%HB_DR%bin\harbour.exe" >> _hbfiles +echo "%HB_DR%bin\hbformat.exe" >> _hbfiles +echo "%HB_DR%bin\hbi18n.exe" >> _hbfiles +echo "%HB_DR%bin\hbmk2.exe" >> _hbfiles +echo "%HB_DR%bin\hbmk2.*.hbl" >> _hbfiles +echo "%HB_DR%bin\hbnetio.exe" >> _hbfiles +echo "%HB_DR%bin\hbpp.exe" >> _hbfiles +echo "%HB_DR%bin\hbrun.exe" >> _hbfiles +echo "%HB_DR%bin\hbtest.exe" >> _hbfiles +if exist "%HB_DR%bin\*.hb" echo "%HB_DR%bin\*.hb" >> _hbfiles +if exist "%HB_DR%bin\*.hbr" echo "%HB_DR%bin\*.hbr" >> _hbfiles +if exist "%HB_DR%bin\*.ucf" echo "%HB_DR%bin\*.ucf" >> _hbfiles +if exist "%HB_DR%bin\hbmk.hbc" echo "%HB_DR%bin\hbmk.hbc" >> _hbfiles +echo "%HB_DR%bin\upx*.*" >> _hbfiles +echo "%HB_DR%include\*.*" >> _hbfiles +echo "%HB_DR%bin\hbmk2-x64.exe" >> _hbfiles +echo "%HB_DR%bin\hbnetio-x64.exe" >> _hbfiles +echo "%HB_DR%bin\hbrun-x64.exe" >> _hbfiles +echo "%HB_DR%bin\hbtest-x64.exe" >> _hbfiles +echo "%HB_DR%lib\win\mingw\*.*" >> _hbfiles +echo "%HB_DR%lib\win\mingw64\*.*" >> _hbfiles +echo "%HB_DR%lib\wce\mingwarm\*.*" >> _hbfiles +echo "%HB_DR%addons\HARBOUR_README_ADDONS.txt" >> _hbfiles +rem echo "%HB_DR%comp\djgpp\HARBOUR_README_DJGPP.txt" >> _hbfiles +echo "%HB_DR%comp\watcom\HARBOUR_README_WATCOM.txt" >> _hbfiles +echo "%HB_DR%comp\pocc\HARBOUR_README_POCC.txt" >> _hbfiles +echo "%HB_DR%comp\mingw\HARBOUR_README_MINGW.txt" >> _hbfiles +echo "%HB_DR%comp\mingw64\HARBOUR_README_MINGW64.txt" >> _hbfiles +echo "%HB_DR%comp\mingwarm\HARBOUR_README_MINGWARM.txt" >> _hbfiles +rem echo "%HB_DR%lib\dos\djgpp\*.*" >> _hbfiles +echo "%HB_DR%lib\dos\watcom\*.*" >> _hbfiles +echo "%HB_DR%lib\linux\watcom\*.*" >> _hbfiles +echo "%HB_DR%lib\os2\watcom\*.*" >> _hbfiles +echo "%HB_DR%lib\win\msvc\*.*" >> _hbfiles +echo "%HB_DR%lib\win\msvc64\*.*" >> _hbfiles +rem echo "%HB_DR%bin\harbour-%HB_VS%-bcc.dll" >> _hbfiles +echo "%HB_DR%lib\win\bcc\*.*" >> _hbfiles +echo "%HB_DR%lib\win\bcc64\*.*" >> _hbfiles +echo "%HB_DR%lib\win\watcom\*.*" >> _hbfiles +rem echo "%HB_DR%lib\win\pocc\*.*" >> _hbfiles +rem echo "%HB_DR%lib\win\pocc64\*.*" >> _hbfiles +rem echo "%HB_DR%lib\wce\poccarm\*.*" >> _hbfiles +echo "%HB_DR%bin\*-%HB_VS%-x64.dll" >> _hbfiles +echo "%HB_DR%bin\harbour-%HB_VS%-wce-arm.dll" >> _hbfiles +rem echo "%HB_DR%bin\harbour-%HB_VS%-os2.dll" >> _hbfiles +echo "%HB_DR%tests\*.*" >> _hbfiles +echo "%HB_DR%doc\*.*" >> _hbfiles +echo "%HB_DR%comp\mingw\*" >> _hbfiles +echo "%HB_DR%extras\*.*" >> _hbfiles +echo "%HB_DR%contrib\*.*" >> _hbfiles + +if exist %HB_RT%harbour-%HB_VF%-win.7z del %HB_RT%harbour-%HB_VF%-win.7z +"%HB_DIR_7Z%7za.exe" a -r %HB_RT%harbour-%HB_VF%-win.7z @_hbfiles >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 + +del _hbfiles + +popd diff --git a/package/winuni/mpkg_win_uni.nsi b/package/winuni/mpkg_win_uni.nsi index 0c634d3f10..d8451978ee 100644 --- a/package/winuni/mpkg_win_uni.nsi +++ b/package/winuni/mpkg_win_uni.nsi @@ -1,7 +1,3 @@ -; -; $Id$ -; - ; --------------------------------------------------------------- ; NSIS installer script for Harbour ; diff --git a/src/compiler/harbour.y b/src/compiler/harbour.y index e8cbf52afc..1f215ffdfe 100644 --- a/src/compiler/harbour.y +++ b/src/compiler/harbour.y @@ -3,10 +3,6 @@ %lex-param { PHB_COMP pComp } %name-prefix = "hb_comp_yy" %{ -/* - * $Id$ - */ - /* * Harbour Project source code: * Compiler YACC rules and actions diff --git a/src/compiler/harbour.yyc b/src/compiler/harbour.yyc index 2dfb3c51dd..ca5c9e6eb6 100644 --- a/src/compiler/harbour.yyc +++ b/src/compiler/harbour.yyc @@ -76,10 +76,6 @@ /* Line 268 of yacc.c */ #line 5 "harbour.y" -/* - * $Id$ - */ - /* * Harbour Project source code: * Compiler YACC rules and actions diff --git a/src/macro/macro.y b/src/macro/macro.y index 3cb8fae843..21cf4efd4c 100644 --- a/src/macro/macro.y +++ b/src/macro/macro.y @@ -4,10 +4,6 @@ %name-prefix = "hb_macro_yy" %{ -/* - * $Id$ - */ - /* * Harbour Project source code: * Macro compiler YACC rules and actions diff --git a/src/macro/macro.yyc b/src/macro/macro.yyc index ec44e32940..6775965dd1 100644 --- a/src/macro/macro.yyc +++ b/src/macro/macro.yyc @@ -76,10 +76,6 @@ /* Line 268 of yacc.c */ #line 6 "macro.y" -/* - * $Id$ - */ - /* * Harbour Project source code: * Macro compiler YACC rules and actions diff --git a/src/pp/hbpp.1 b/src/pp/hbpp.1 index 5c4583f6f7..fc736d3898 100644 --- a/src/pp/hbpp.1 +++ b/src/pp/hbpp.1 @@ -1,4 +1,3 @@ -.\" $Id$ .TH HBPP 1 .SH NAME diff --git a/tests/big5_gen.prg b/tests/big5_gen.prg index 456ae2ac3b..692ac54045 100644 --- a/tests/big5_gen.prg +++ b/tests/big5_gen.prg @@ -132,10 +132,6 @@ proc main() cResult := ; - "/*" + hb_eol() + ; - " * $Id$" + hb_eol() + ; - " */" + hb_eol() + ; - hb_eol() + ; "/*" + hb_eol() + ; " * Harbour Project source code:" + hb_eol() + ; " * BIG5 <-> UCS16 conversion tables" + hb_eol() + ; diff --git a/tests/bldtest/Makefile b/tests/bldtest/Makefile index 9d5a181169..e358ecef23 100644 --- a/tests/bldtest/Makefile +++ b/tests/bldtest/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ROOT := ../../ C_MAIN := bldtest.c diff --git a/tests/bldtest/bldtest.c b/tests/bldtest/bldtest.c index 03d5523edd..42562c2e35 100644 --- a/tests/bldtest/bldtest.c +++ b/tests/bldtest/bldtest.c @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #include "hbdefs.h" diff --git a/tests/hbdocext.hb b/tests/hbdocext.hb index 2d2532e9cb..578a20428f 100644 --- a/tests/hbdocext.hb +++ b/tests/hbdocext.hb @@ -23,10 +23,7 @@ PROCEDURE Main() LOCAL cFile LOCAL cDst - LOCAL cHdr := ; - "/*" + hb_eol() + ; - " * $" + "Id" + "$" + hb_eol() + ; - " */" + hb_eol() + LOCAL cHdr := "" FOR EACH aFile IN Directory( hb_osFileMask() ) cFile := __hbdoc_ToSource( __hbdoc_FromSource( MemoRead( aFile[ F_NAME ] ) ) ) diff --git a/tests/hbpptest/compare.bat b/tests/hbpptest/compare.bat index b290e22ced..460eb841fd 100644 --- a/tests/hbpptest/compare.bat +++ b/tests/hbpptest/compare.bat @@ -1,7 +1,4 @@ @echo off -rem -rem $Id$ -rem copy pp_test.prg _pp_hb.prg copy pp_test.prg _pp_c5x.prg diff --git a/tests/hbpptest/hbpptest.hbp b/tests/hbpptest/hbpptest.hbp index 5a22d7a859..6ea87c61ff 100644 --- a/tests/hbpptest/hbpptest.hbp +++ b/tests/hbpptest/hbpptest.hbp @@ -1,7 +1,3 @@ -# -# $Id$ -# - hbpptest.prg -nulrdd diff --git a/tests/hbpptest/hbpptest.prg b/tests/hbpptest/hbpptest.prg index c3cc929d82..e242f3fcca 100644 --- a/tests/hbpptest/hbpptest.prg +++ b/tests/hbpptest/hbpptest.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #ifndef __HARBOUR__ #xtranslate hb_eol() => ( Chr( 13 ) + Chr( 10 ) ) diff --git a/tests/hbpptest/pp_test.prg b/tests/hbpptest/pp_test.prg index fbabbbb542..d87e84c3d2 100644 --- a/tests/hbpptest/pp_test.prg +++ b/tests/hbpptest/pp_test.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* Test file to check the preprocessor. * * Usage: diff --git a/tests/lang2po.hb b/tests/lang2po.hb index 098bb5fa06..0efff47054 100644 --- a/tests/lang2po.hb +++ b/tests/lang2po.hb @@ -32,12 +32,7 @@ PROCEDURE Main() cName := SubStr( cName, Len( "HB_LANG_" ) + 1 ) IF Len( cName ) != 5 .AND. ; ! "|" + cName + "|" $ "|RUKOI8|UAKOI8|ZHB5|ZHGB|" - cPO := ; - "/*" + hb_eol() + ; - " * $" + "Id" + "$" + hb_eol() + ; - " */" + hb_eol() + ; - hb_eol() - cPO += Item( "", Meta() ) + cPO := Item( "", Meta() ) /* TODO: do something with the metadata (position 0 to 5) */ FOR tmp1 := HB_LANG_ITEM_BASE_MONTH TO HB_LANG_ITEM_MAX_ - 1 IF ! Empty( hb_langMessage( tmp1, "en" ) ) diff --git a/tests/mt/mttest01.prg b/tests/mt/mttest01.prg index 151393b0c2..c2cad5d009 100644 --- a/tests/mt/mttest01.prg +++ b/tests/mt/mttest01.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for thread return complex values diff --git a/tests/mt/mttest02.prg b/tests/mt/mttest02.prg index 75dc5c2910..271e7c9924 100644 --- a/tests/mt/mttest02.prg +++ b/tests/mt/mttest02.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using QUIT commands and ALWAYS statements diff --git a/tests/mt/mttest03.prg b/tests/mt/mttest03.prg index 8bba564b1c..ab8a6407eb 100644 --- a/tests/mt/mttest03.prg +++ b/tests/mt/mttest03.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using QUIT commands and ALWAYS statements diff --git a/tests/mt/mttest04.prg b/tests/mt/mttest04.prg index fe2319a410..c7787fcafa 100644 --- a/tests/mt/mttest04.prg +++ b/tests/mt/mttest04.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for modifying simple variable by different diff --git a/tests/mt/mttest05.prg b/tests/mt/mttest05.prg index 70591710e5..5c5e633876 100644 --- a/tests/mt/mttest05.prg +++ b/tests/mt/mttest05.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for thread static variables diff --git a/tests/mt/mttest06.prg b/tests/mt/mttest06.prg index 025ffbe2d3..b6975cefd3 100644 --- a/tests/mt/mttest06.prg +++ b/tests/mt/mttest06.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using memvars in threads diff --git a/tests/mt/mttest07.prg b/tests/mt/mttest07.prg index 0d2bbfa48a..09dc3649ff 100644 --- a/tests/mt/mttest07.prg +++ b/tests/mt/mttest07.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using mutexes to send/receive diff --git a/tests/mt/mttest08.prg b/tests/mt/mttest08.prg index 9f1f7d2f95..f8091b3726 100644 --- a/tests/mt/mttest08.prg +++ b/tests/mt/mttest08.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using memvar variables sharing and diff --git a/tests/mt/mttest09.prg b/tests/mt/mttest09.prg index 92d066b230..c92ba2fbdd 100644 --- a/tests/mt/mttest09.prg +++ b/tests/mt/mttest09.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using the same work area in different diff --git a/tests/mt/mttest10.prg b/tests/mt/mttest10.prg index 644e68d5a7..5c84f2f55d 100644 --- a/tests/mt/mttest10.prg +++ b/tests/mt/mttest10.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for using independent console window in diff --git a/tests/mt/mttest11.prg b/tests/mt/mttest11.prg index bcdbdcb8bc..e54358cc0c 100644 --- a/tests/mt/mttest11.prg +++ b/tests/mt/mttest11.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for asynchronous screen updating without diff --git a/tests/mt/mttest12.prg b/tests/mt/mttest12.prg index 14019e630a..1cb0c21aa4 100644 --- a/tests/mt/mttest12.prg +++ b/tests/mt/mttest12.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * demonstration/test code for thread static variables diff --git a/tests/multifnc/multifnc.hbp b/tests/multifnc/multifnc.hbp index 62f0a79819..090e646bdc 100644 --- a/tests/multifnc/multifnc.hbp +++ b/tests/multifnc/multifnc.hbp @@ -1,7 +1,3 @@ -# -# $Id$ -# - # Testing dirty function overload -ldflag={allgcc}-Wl,--allow-multiple-definition -ldflag={allmsvc|allpocc|xcc|watcom}/force:multiple diff --git a/tests/multifnc/t0.prg b/tests/multifnc/t0.prg index 97955ef9d8..cd30cdfdf3 100644 --- a/tests/multifnc/t0.prg +++ b/tests/multifnc/t0.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ proc main() ? OS(), VERSION(), DATE(), TIME() diff --git a/tests/multifnc/t1.prg b/tests/multifnc/t1.prg index 0fec6ca3df..b6682e12b5 100644 --- a/tests/multifnc/t1.prg +++ b/tests/multifnc/t1.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ proc main2() ? "main2", procfile("main2"), procfile(@main2()) diff --git a/tests/multifnc/t2.prg b/tests/multifnc/t2.prg index 13a884aa64..b167dc8839 100644 --- a/tests/multifnc/t2.prg +++ b/tests/multifnc/t2.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ proc main3() ? "main3", procfile("main3"), procfile(@main3()) diff --git a/tests/rddtest/adscl52.prg b/tests/rddtest/adscl52.prg index 58399dc9c4..578be699df 100644 --- a/tests/rddtest/adscl52.prg +++ b/tests/rddtest/adscl52.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/adscl53.prg b/tests/rddtest/adscl53.prg index 65dec81672..40fd431112 100644 --- a/tests/rddtest/adscl53.prg +++ b/tests/rddtest/adscl53.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/cdxcl52.prg b/tests/rddtest/cdxcl52.prg index a542b04efa..5c8f5e244a 100644 --- a/tests/rddtest/cdxcl52.prg +++ b/tests/rddtest/cdxcl52.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/cdxcl53.prg b/tests/rddtest/cdxcl53.prg index a117860298..0d741025ca 100644 --- a/tests/rddtest/cdxcl53.prg +++ b/tests/rddtest/cdxcl53.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/make_c52.bat b/tests/rddtest/make_c52.bat index 10a8e8f944..aa651b7970 100644 --- a/tests/rddtest/make_c52.bat +++ b/tests/rddtest/make_c52.bat @@ -1,7 +1,3 @@ -@rem -@rem $Id$ -@rem - @echo off rem DBFCDX diff --git a/tests/rddtest/make_c53.bat b/tests/rddtest/make_c53.bat index fe104ef043..ddf98039b6 100644 --- a/tests/rddtest/make_c53.bat +++ b/tests/rddtest/make_c53.bat @@ -1,7 +1,3 @@ -@rem -@rem $Id$ -@rem - @echo off rem DBFCDX diff --git a/tests/rddtest/ntxcl52.prg b/tests/rddtest/ntxcl52.prg index 54113913f0..46fce41807 100644 --- a/tests/rddtest/ntxcl52.prg +++ b/tests/rddtest/ntxcl52.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/ntxcl53.prg b/tests/rddtest/ntxcl53.prg index 4ca971e338..2adbdbb506 100644 --- a/tests/rddtest/ntxcl53.prg +++ b/tests/rddtest/ntxcl53.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/rddmktst.prg b/tests/rddtest/rddmktst.prg index 4c05b48411..b1cddf82e4 100644 --- a/tests/rddtest/rddmktst.prg +++ b/tests/rddtest/rddmktst.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/rddtest/rddtst.prg b/tests/rddtest/rddtst.prg index 6b17b09162..25bc87b6f3 100644 --- a/tests/rddtest/rddtst.prg +++ b/tests/rddtest/rddtst.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * RDD tests diff --git a/tests/stripsvn.hb b/tests/stripsvn.hb new file mode 100644 index 0000000000..6f2fd1e0eb --- /dev/null +++ b/tests/stripsvn.hb @@ -0,0 +1,81 @@ +/* + * Strips svn headers from source files + * + * Copyright 2013 Viktor Szakats (harbour syenar.net) + * www - http://harbour-project.org + * + */ + +#pragma -w3 +#pragma -km+ +#pragma -ko+ + +#include "directry.ch" + +PROCEDURE Main() + + LOCAL aFile + LOCAL cExt + LOCAL tmp + + LOCAL cHdr1 := ; + "/*" + hb_eol() + ; + " * $" + "Id" + "$" + hb_eol() + ; + " */" + hb_eol() + + LOCAL cHdr2 := ; + "/*" + hb_eol() + ; + " * $" + "Id" + "$" + hb_eol() + ; + " */" + hb_eol() + + LOCAL cHdr3 := ; + "#" + hb_eol() + ; + "# $" + "Id" + "$" + hb_eol() + ; + "#" + hb_eol() + + LOCAL cHdr4 := ; + "@rem" + hb_eol() + ; + "@rem $" + "Id" + "$" + hb_eol() + ; + "@rem" + hb_eol() + + LOCAL cHdr5 := ; + "rem" + hb_eol() + ; + "rem $" + "Id" + "$" + hb_eol() + ; + "rem" + hb_eol() + + LOCAL cHdr6 := ; + ";" + hb_eol() + ; + "; $" + "Id" + "$" + hb_eol() + ; + ";" + hb_eol() + + LOCAL cHdr7 := ; + "'" + hb_eol() + ; + "' $" + "Id" + "$" + hb_eol() + ; + "'" + hb_eol() + + FOR EACH aFile IN Directory( hb_osFileMask() ) + + cExt := hb_FNameExt( aFile[ F_NAME ] ) + + IF "|" + cExt + "|" $ "|.c|.hb|.prg|.hbm|.hbp|.hbc|.ini|.bat|.sh|.vbs|.def" + + tmp := MemoRead( aFile[ F_NAME ] ) + tmp := StrTran( tmp, cHdr1 ) + tmp := StrTran( tmp, cHdr2 ) + tmp := StrTran( tmp, cHdr3 ) + tmp := StrTran( tmp, cHdr4 ) + tmp := StrTran( tmp, cHdr5 ) + tmp := StrTran( tmp, cHdr6 ) + tmp := StrTran( tmp, cHdr7 ) + + IF Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "//" .OR. ; + Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "/*" .OR. ; + Left( tmp, Len( hb_eol() ) + 1 ) == hb_eol() + ";" + tmp := SubStr( tmp, Len( hb_eol() ) + 1 ) + ENDIF + + hb_MemoWrit( aFile[ F_NAME ], tmp ) + ENDIF + NEXT + + RETURN diff --git a/tests/uc16_gen.prg b/tests/uc16_gen.prg index 78acb089a5..6e852f5c35 100644 --- a/tests/uc16_gen.prg +++ b/tests/uc16_gen.prg @@ -166,10 +166,6 @@ proc main() cResult := ; - "/*" + hb_eol() + ; - " * $Id$" + hb_eol() + ; - " */" + hb_eol() + ; - hb_eol() + ; "/*" + hb_eol() + ; " * Harbour Project source code:" + hb_eol() + ; " * Unicode character tables" + hb_eol() + ; diff --git a/tests/usrrdd/exarr.prg b/tests/usrrdd/exarr.prg index ddb11ab871..66bad941c5 100644 --- a/tests/usrrdd/exarr.prg +++ b/tests/usrrdd/exarr.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * ARRAY RDD example diff --git a/tests/usrrdd/exfcm.prg b/tests/usrrdd/exfcm.prg index 9df1f15609..40a7b1a153 100644 --- a/tests/usrrdd/exfcm.prg +++ b/tests/usrrdd/exfcm.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ REQUEST FCOMMA diff --git a/tests/usrrdd/exhsx.prg b/tests/usrrdd/exhsx.prg index 2f1f04f1d4..421522726a 100644 --- a/tests/usrrdd/exhsx.prg +++ b/tests/usrrdd/exhsx.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #include "dbinfo.ch" diff --git a/tests/usrrdd/exlog.prg b/tests/usrrdd/exlog.prg index 5b2999d26f..5b8c0eb466 100644 --- a/tests/usrrdd/exlog.prg +++ b/tests/usrrdd/exlog.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #include "dbinfo.ch" #include "hbusrrdd.ch" diff --git a/tests/usrrdd/exmemo.prg b/tests/usrrdd/exmemo.prg index bed1a596d1..aaeb8f99bb 100644 --- a/tests/usrrdd/exmemo.prg +++ b/tests/usrrdd/exmemo.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ REQUEST DBTCDX REQUEST FPTCDX diff --git a/tests/usrrdd/exrlx.prg b/tests/usrrdd/exrlx.prg index eb924e6119..388e559267 100644 --- a/tests/usrrdd/exrlx.prg +++ b/tests/usrrdd/exrlx.prg @@ -1,6 +1,3 @@ -/* - * $Id$ - */ REQUEST RLCDX diff --git a/utils/Makefile b/utils/Makefile index 270c44acec..de86b6f31c 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ROOT := ../ ifneq ($(HB_BUILD_PARTS),lib) diff --git a/utils/hbi18n/Makefile b/utils/hbi18n/Makefile index b9a62ad146..c9a634b7ba 100644 --- a/utils/hbi18n/Makefile +++ b/utils/hbi18n/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ROOT := ../../ PRG_SOURCES := \ diff --git a/utils/hbi18n/hbi18n.hbp b/utils/hbi18n/hbi18n.hbp index f656cfeb0b..c642d53dd9 100644 --- a/utils/hbi18n/hbi18n.hbp +++ b/utils/hbi18n/hbi18n.hbp @@ -1,7 +1,3 @@ -# -# $Id$ -# - -q0 -w3 -es2 -kmo -l -nulrdd diff --git a/utils/hbi18n/hbi18n.prg b/utils/hbi18n/hbi18n.prg index d4fef9d951..200f62153a 100644 --- a/utils/hbi18n/hbi18n.prg +++ b/utils/hbi18n/hbi18n.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Harbour i18n .pot/.hbl file manger diff --git a/utils/hbmk2/examples/contrib.hbc b/utils/hbmk2/examples/contrib.hbc index 5d63babdd1..190b3a99fd 100644 --- a/utils/hbmk2/examples/contrib.hbc +++ b/utils/hbmk2/examples/contrib.hbc @@ -1,7 +1,3 @@ -# -# $Id$ -# - # Some popular and portable Harbour contribs hbcs=hbct hbmzip diff --git a/utils/hbmk2/examples/plug_bis.hb b/utils/hbmk2/examples/plug_bis.hb index cdac05c0a6..7fcb744710 100644 --- a/utils/hbmk2/examples/plug_bis.hb +++ b/utils/hbmk2/examples/plug_bis.hb @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * hbmk2 plugin script, implementing support for bison * diff --git a/utils/hbmk2/examples/plug_tpl.hb b/utils/hbmk2/examples/plug_tpl.hb index b41ca84a28..ab6994a3ce 100644 --- a/utils/hbmk2/examples/plug_tpl.hb +++ b/utils/hbmk2/examples/plug_tpl.hb @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * hbmk2 plugin example * diff --git a/utils/hbmk2/examples/xbgtk.hbc b/utils/hbmk2/examples/xbgtk.hbc index 1fbe658d73..8cd558d64d 100644 --- a/utils/hbmk2/examples/xbgtk.hbc +++ b/utils/hbmk2/examples/xbgtk.hbc @@ -1,7 +1,3 @@ -# -# $Id$ -# - libs=xbgtk {win}libs=gdk-win32-2.0. gdk_pixbuf-2.0. gtk-win32-2.0. glib-2.0. gobject-2.0. pango-1.0. pangocairo-1.0. glade-2.0. diff --git a/utils/hbtest/Makefile b/utils/hbtest/Makefile index add0af8007..1162140a16 100644 --- a/utils/hbtest/Makefile +++ b/utils/hbtest/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ROOT := ../../ PRG_SOURCES := \ diff --git a/utils/hbtest/hbtest.hbp b/utils/hbtest/hbtest.hbp index d14d1808ef..b9ddd4e2f0 100644 --- a/utils/hbtest/hbtest.hbp +++ b/utils/hbtest/hbtest.hbp @@ -1,7 +1,3 @@ -# -# $Id$ -# - -q0 -w3 -es2 -kmo hbtest.prg diff --git a/utils/hbtest/hbtest.prg b/utils/hbtest/hbtest.prg index 5dd736ed9c..ec9d5c91f7 100644 --- a/utils/hbtest/hbtest.prg +++ b/utils/hbtest/hbtest.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (main) diff --git a/utils/hbtest/make_c5x.bat b/utils/hbtest/make_c5x.bat index 3e22552476..b3f14c11e0 100644 --- a/utils/hbtest/make_c5x.bat +++ b/utils/hbtest/make_c5x.bat @@ -1,7 +1,3 @@ -@rem -@rem $Id$ -@rem - @echo off rem --------------------------------------------------------------- diff --git a/utils/hbtest/make_xpp.bat b/utils/hbtest/make_xpp.bat index aa5b465e21..b1c511576d 100644 --- a/utils/hbtest/make_xpp.bat +++ b/utils/hbtest/make_xpp.bat @@ -1,7 +1,3 @@ -@rem -@rem $Id$ -@rem - @echo off rem ; TOFIX: Add compilation for C sources diff --git a/utils/hbtest/rt_array.prg b/utils/hbtest/rt_array.prg index 893dd1440a..7cd302488c 100644 --- a/utils/hbtest/rt_array.prg +++ b/utils/hbtest/rt_array.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (array) diff --git a/utils/hbtest/rt_class.prg b/utils/hbtest/rt_class.prg index d36456a5a3..970a8f7cae 100644 --- a/utils/hbtest/rt_class.prg +++ b/utils/hbtest/rt_class.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Harbour class/OOP test diff --git a/utils/hbtest/rt_date.prg b/utils/hbtest/rt_date.prg index 2c7a9350ae..1353e8ab7f 100644 --- a/utils/hbtest/rt_date.prg +++ b/utils/hbtest/rt_date.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (date) diff --git a/utils/hbtest/rt_file.prg b/utils/hbtest/rt_file.prg index 61f0fce59c..56134fac49 100644 --- a/utils/hbtest/rt_file.prg +++ b/utils/hbtest/rt_file.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (file) diff --git a/utils/hbtest/rt_hvm.prg b/utils/hbtest/rt_hvm.prg index 37ca524fbd..a81785cd28 100644 --- a/utils/hbtest/rt_hvm.prg +++ b/utils/hbtest/rt_hvm.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (HVM) diff --git a/utils/hbtest/rt_hvma.prg b/utils/hbtest/rt_hvma.prg index 62b94925dc..773e114fd6 100644 --- a/utils/hbtest/rt_hvma.prg +++ b/utils/hbtest/rt_hvma.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (HVM) diff --git a/utils/hbtest/rt_init.ch b/utils/hbtest/rt_init.ch index 5b213ee4ad..c8720ce131 100644 --- a/utils/hbtest/rt_init.ch +++ b/utils/hbtest/rt_init.ch @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (common code) diff --git a/utils/hbtest/rt_main.ch b/utils/hbtest/rt_main.ch index da67237842..7e3a215b55 100644 --- a/utils/hbtest/rt_main.ch +++ b/utils/hbtest/rt_main.ch @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (header) diff --git a/utils/hbtest/rt_main.h b/utils/hbtest/rt_main.h index 6c03634190..5204188746 100644 --- a/utils/hbtest/rt_main.h +++ b/utils/hbtest/rt_main.h @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * C level header for regression test help functions. diff --git a/utils/hbtest/rt_math.prg b/utils/hbtest/rt_math.prg index 37482d0086..75f93bc5cd 100644 --- a/utils/hbtest/rt_math.prg +++ b/utils/hbtest/rt_math.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (math) diff --git a/utils/hbtest/rt_misc.prg b/utils/hbtest/rt_misc.prg index 2cfa28f1f4..35c29f39a7 100644 --- a/utils/hbtest/rt_misc.prg +++ b/utils/hbtest/rt_misc.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (misc) diff --git a/utils/hbtest/rt_miscc.c b/utils/hbtest/rt_miscc.c index 90a9bfe9a8..44ca607eea 100644 --- a/utils/hbtest/rt_miscc.c +++ b/utils/hbtest/rt_miscc.c @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * C level helper functions for regression tests diff --git a/utils/hbtest/rt_mt.prg b/utils/hbtest/rt_mt.prg index d1d437a722..8ea39ccb51 100644 --- a/utils/hbtest/rt_mt.prg +++ b/utils/hbtest/rt_mt.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Harbour MT simple test diff --git a/utils/hbtest/rt_str.prg b/utils/hbtest/rt_str.prg index f11abe4909..24ce9a57e3 100644 --- a/utils/hbtest/rt_str.prg +++ b/utils/hbtest/rt_str.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (strings) diff --git a/utils/hbtest/rt_stra.prg b/utils/hbtest/rt_stra.prg index 0cb90fd850..b91e52048e 100644 --- a/utils/hbtest/rt_stra.prg +++ b/utils/hbtest/rt_stra.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (strings) diff --git a/utils/hbtest/rt_trans.prg b/utils/hbtest/rt_trans.prg index 4a2da18afa..5efc9941bb 100644 --- a/utils/hbtest/rt_trans.prg +++ b/utils/hbtest/rt_trans.prg @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (strings) diff --git a/utils/hbtest/rt_vars.ch b/utils/hbtest/rt_vars.ch index 7f3cf056d4..0b22e1800e 100644 --- a/utils/hbtest/rt_vars.ch +++ b/utils/hbtest/rt_vars.ch @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * Harbour Project source code: * Regression tests for the runtime library (variable declarations)