From 8161fa4af67d7d1c70a733f8069b3fc1254194eb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 20 Feb 2011 17:02:34 +0000 Subject: [PATCH] 2011-02-20 18:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/RELNOTES * Updated. * package/winuni/mpkg_win_uni.bat + Using mingw64 .dlls and .exe for win64. (was msvc64) Now mingw64 binaries look fine and they are about the same size as mingw32 ones. * package/winuni/mpkg_win_uni.nsi * Formatting. --- harbour/ChangeLog | 12 +++++++++++ harbour/package/winuni/RELNOTES | 6 +++--- harbour/package/winuni/mpkg_win_uni.bat | 27 ++++++++++++------------- harbour/package/winuni/mpkg_win_uni.nsi | 8 ++++---- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f390734b56..e1268cde6a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-20 18:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/RELNOTES + * Updated. + + * package/winuni/mpkg_win_uni.bat + + Using mingw64 .dlls and .exe for win64. (was msvc64) + Now mingw64 binaries look fine and they are about the + same size as mingw32 ones. + + * package/winuni/mpkg_win_uni.nsi + * Formatting. + 2011-02-20 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbnetio/utils/hbnetio/hbnetio.hbp * contrib/hbformat/utils/hbformat.hbp diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 36720c0826..b4143a30ab 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -45,7 +45,7 @@ Tool/lib versions used to create this package: -------------- MinGW GNU C 4.5.0 (TDM-DW2) (included) - MinGW w64 GNU C 4.4.4-20100129 (prerelease) + MinGW w64 GNU C 4.5.3-20110207 (prerelease) MinGW CEGCC 4.4.0 MSVC 2010 (version bundled with MS Windows SDK 7.1) Open Watcom C 1.9 @@ -58,13 +58,13 @@ Tool/lib versions used to create this package: Allegro 4.2.2 Blat 2.6.2 Cairo 1.8.8 - libcurl 7.21.3 + libcurl 7.21.4 Firebird 2.5.0rc2 FreeImage 3.13.1 GD 2.0.35 MySQL 5.5.8 OCILIB 3.8.0 - OpenSSL 1.0.0a + OpenSSL 1.0.0d PostgreSQL 9.0.1 QT 4.7.1 WATTCP 2.2.10 diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 9f835f114e..a3ece5197e 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -51,21 +51,20 @@ xcopy /y /s %~dp0..\..\pkg\win\msvc\harbour-%HB_VF%-win-msvc\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\ -xcopy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\*.dll %HB_ABSROOT%bin\ rem ; Create special implibs for Borland (requires BCC in PATH) for %%a in ( %HB_ABSROOT%bin\*-%HB_VS%.dll ) do "%HB_DIR_BCC_IMPLIB%implib.exe" -c -a %HB_ABSROOT%lib\win\bcc\%%~na-bcc.lib %%a -rem ; Using msvc64 because mingw64 .dll handling is broken. - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\harbour.exe %HB_ABSROOT%bin\harbour-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbpp.exe %HB_ABSROOT%bin\hbpp-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbformat.exe %HB_ABSROOT%bin\hbformat-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbi18n.exe %HB_ABSROOT%bin\hbi18n-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbmk2.exe %HB_ABSROOT%bin\hbmk2-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbrun.exe %HB_ABSROOT%bin\hbrun-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbtest.exe %HB_ABSROOT%bin\hbtest-x64.exe - copy /y %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\bin\hbnetio.exe %HB_ABSROOT%bin\hbnetio-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\harbour.exe %HB_ABSROOT%bin\harbour-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbformat.exe %HB_ABSROOT%bin\hbformat-x64.exe + copy /y %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbi18n.exe %HB_ABSROOT%bin\hbi18n-x64.exe + 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\hbpp.exe %HB_ABSROOT%bin\hbpp-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 @@ -125,14 +124,14 @@ echo "%HB_DR%TODO" >> _hbfiles echo "%HB_DR%ChangeLog*" >> _hbfiles echo "%HB_DR%bin\harbour-%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 -echo "%HB_DR%bin\hbformat.exe" >> _hbfiles -echo "%HB_DR%bin\hbnetio.exe" >> _hbfiles if exist "%HB_DR%bin\hbide.exe" echo "%HB_DR%bin\hbide.exe" >> _hbfiles if exist "%HB_DR%bin\libgcc_s_dw2-1.dll" echo "%HB_DR%bin\libgcc_s_dw2-1.dll" >> _hbfiles if exist "%HB_DR%bin\mingwm10.dll" echo "%HB_DR%bin\mingwm10.dll" >> _hbfiles @@ -147,13 +146,13 @@ if exist "%HB_DR%bin\hbmk.hbc" echo "%HB_DR%bin\hbmk.hbc" echo "%HB_DR%bin\upx*.*" >> _hbfiles echo "%HB_DR%include\*.*" >> _hbfiles echo "%HB_DR%bin\harbour-x64.exe" >> _hbfiles +echo "%HB_DR%bin\hbformat-x64.exe" >> _hbfiles echo "%HB_DR%bin\hbi18n-x64.exe" >> _hbfiles echo "%HB_DR%bin\hbmk2-x64.exe" >> _hbfiles +echo "%HB_DR%bin\hbnetio-x64.exe" >> _hbfiles echo "%HB_DR%bin\hbpp-x64.exe" >> _hbfiles echo "%HB_DR%bin\hbrun-x64.exe" >> _hbfiles echo "%HB_DR%bin\hbtest-x64.exe" >> _hbfiles -echo "%HB_DR%bin\hbformat-x64.exe" >> _hbfiles -echo "%HB_DR%bin\hbnetio-x64.exe" >> _hbfiles echo "%HB_DR%lib\win\mingw\*.*" >> _hbfiles echo "%HB_DR%lib\win\mingw64\*.*" >> _hbfiles echo "%HB_DR%lib\wce\mingwarm\*.*" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index 2a88444494..d5a4f2866d 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -92,14 +92,14 @@ Section "Main components" hb_main SetOutPath $INSTDIR\bin File "$%HB_ABSROOT%bin\harbour-$%HB_VS%.dll" File "$%HB_ABSROOT%bin\harbour.exe" + File "$%HB_ABSROOT%bin\hbformat.exe" File "$%HB_ABSROOT%bin\hbi18n.exe" File "$%HB_ABSROOT%bin\hbmk2.exe" File "$%HB_ABSROOT%bin\hbmk2.*.hbl" + File "$%HB_ABSROOT%bin\hbnetio.exe" File "$%HB_ABSROOT%bin\hbpp.exe" File "$%HB_ABSROOT%bin\hbrun.exe" File "$%HB_ABSROOT%bin\hbtest.exe" - File "$%HB_ABSROOT%bin\hbformat.exe" - File "$%HB_ABSROOT%bin\hbnetio.exe" File "$%HB_ABSROOT%bin\*.hbs" File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc" File "$%HB_ABSROOT%bin\upx*.*" @@ -141,13 +141,13 @@ SectionEnd Section /o "x64 tools" hb_main_x64 SetOutPath $INSTDIR\bin File "$%HB_ABSROOT%bin\harbour-x64.exe" + File "$%HB_ABSROOT%bin\hbformat-x64.exe" File "$%HB_ABSROOT%bin\hbi18n-x64.exe" File "$%HB_ABSROOT%bin\hbmk2-x64.exe" + File "$%HB_ABSROOT%bin\hbnetio-x64.exe" File "$%HB_ABSROOT%bin\hbpp-x64.exe" File "$%HB_ABSROOT%bin\hbrun-x64.exe" File "$%HB_ABSROOT%bin\hbtest-x64.exe" - File "$%HB_ABSROOT%bin\hbformat-x64.exe" - File "$%HB_ABSROOT%bin\hbnetio-x64.exe" SectionEnd !endif