diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ff3f9c9b9c..0119c6a8e2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-25 20:41 UTC+0200 Viktor Szakats (harbour syenar.net) + * package/mpkg_win_nightly.bat + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * remmed HBQT/HBIDE related logic + + * package/winuni/RELNOTES + * deleted QT 4.8.0 reference + 2012-09-25 19:28 UTC+0200 Viktor Szakats (harbour syenar.net) + package/updt_web_nightly.sh + added automatic nightly script to update live website from SVN. diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index fdb2b8aa48..9cdafe8ba6 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -76,7 +76,7 @@ set HB_WITH_MYSQL=%_HB_DIR_3RD%mysql\include set HB_WITH_OCILIB=%_HB_DIR_3RD%ocilib\include set HB_WITH_OPENSSL=%_HB_DIR_3RD%openssl\include set HB_WITH_PGSQL=%_HB_DIR_3RD%pgsql\include -set HB_WITH_QT=%_HB_DIR_3RD%qt\include +rem set HB_WITH_QT=%_HB_DIR_3RD%qt\include echo ! Building Harbour... diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 339488587d..bf5cd929ce 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -58,7 +58,6 @@ Tool/lib versions used to create this package: OCILIB 3.10.0 OpenSSL 1.0.1 PostgreSQL 9.2.0-1 - QT 4.8.0 WATTCP 2.2.10 Changes since previous (2.0.0) release: diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 17e72fd5e7..f5488d0bb4 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -86,18 +86,18 @@ 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\ -xcopy /y "%HB_WITH_QT%\..\bin\QtCore4.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\QtGui4.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\QtNetwork4.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\QtSql4.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\uic.exe" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\rcc.exe" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\lib\libQtCore4.a" %HB_ABSROOT%lib\win\mingw\ -xcopy /y "%HB_WITH_QT%\..\lib\libQtGui4.a" %HB_ABSROOT%lib\win\mingw\ -xcopy /y "%HB_WITH_QT%\..\lib\libQtNetwork4.a" %HB_ABSROOT%lib\win\mingw\ -xcopy /y "%HB_WITH_QT%\..\lib\libQtSql4.a" %HB_ABSROOT%lib\win\mingw\ - copy /y "%HB_WITH_QT%\..\LICENSE.LGPL" %HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt - copy /y "%HB_WITH_QT%\..\LGPL_EXCEPTION.txt" %HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt +rem xcopy /y "%HB_WITH_QT%\..\bin\QtCore4.dll" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\bin\QtGui4.dll" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\bin\QtNetwork4.dll" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\bin\QtSql4.dll" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\bin\uic.exe" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\bin\rcc.exe" %HB_ABSROOT%bin\ +rem xcopy /y "%HB_WITH_QT%\..\lib\libQtCore4.a" %HB_ABSROOT%lib\win\mingw\ +rem xcopy /y "%HB_WITH_QT%\..\lib\libQtGui4.a" %HB_ABSROOT%lib\win\mingw\ +rem xcopy /y "%HB_WITH_QT%\..\lib\libQtNetwork4.a" %HB_ABSROOT%lib\win\mingw\ +rem xcopy /y "%HB_WITH_QT%\..\lib\libQtSql4.a" %HB_ABSROOT%lib\win\mingw\ +rem copy /y "%HB_WITH_QT%\..\LICENSE.LGPL" %HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt +rem copy /y "%HB_WITH_QT%\..\LGPL_EXCEPTION.txt" %HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt rem ; Create unified installer @@ -129,17 +129,17 @@ 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\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 -if exist "%HB_DR%bin\QtCore4.dll" echo "%HB_DR%bin\QtCore4.dll" >> _hbfiles -if exist "%HB_DR%bin\QtGui4.dll" echo "%HB_DR%bin\QtGui4.dll" >> _hbfiles -if exist "%HB_DR%bin\QtNetwork4.dll" echo "%HB_DR%bin\QtNetwork4.dll" >> _hbfiles -if exist "%HB_DR%bin\QtSql4.dll" echo "%HB_DR%bin\QtSql4.dll" >> _hbfiles -if exist "%HB_DR%bin\uic.exe" echo "%HB_DR%bin\uic.exe" >> _hbfiles -if exist "%HB_DR%bin\rcc.exe" echo "%HB_DR%bin\rcc.exe" >> _hbfiles -if exist "%HB_DR%bin\Qt_LICENSE_LGPL.txt" echo "%HB_DR%bin\Qt_LICENSE_LGPL.txt" >> _hbfiles -if exist "%HB_DR%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" echo "%HB_DR%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" >> _hbfiles +rem if exist "%HB_DR%bin\hbide.exe" echo "%HB_DR%bin\hbide.exe" >> _hbfiles +rem if exist "%HB_DR%bin\libgcc_s_dw2-1.dll" echo "%HB_DR%bin\libgcc_s_dw2-1.dll" >> _hbfiles +rem if exist "%HB_DR%bin\mingwm10.dll" echo "%HB_DR%bin\mingwm10.dll" >> _hbfiles +rem if exist "%HB_DR%bin\QtCore4.dll" echo "%HB_DR%bin\QtCore4.dll" >> _hbfiles +rem if exist "%HB_DR%bin\QtGui4.dll" echo "%HB_DR%bin\QtGui4.dll" >> _hbfiles +rem if exist "%HB_DR%bin\QtNetwork4.dll" echo "%HB_DR%bin\QtNetwork4.dll" >> _hbfiles +rem if exist "%HB_DR%bin\QtSql4.dll" echo "%HB_DR%bin\QtSql4.dll" >> _hbfiles +rem if exist "%HB_DR%bin\uic.exe" echo "%HB_DR%bin\uic.exe" >> _hbfiles +rem if exist "%HB_DR%bin\rcc.exe" echo "%HB_DR%bin\rcc.exe" >> _hbfiles +rem if exist "%HB_DR%bin\Qt_LICENSE_LGPL.txt" echo "%HB_DR%bin\Qt_LICENSE_LGPL.txt" >> _hbfiles +rem if exist "%HB_DR%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" echo "%HB_DR%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" >> _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 diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index 45d2710f39..50be7b4734 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -106,16 +106,16 @@ Section "Main components" hb_main File "$%HB_ABSROOT%bin\upx*.*" ; QT - File "$%HB_ABSROOT%bin\libgcc_s_dw2-1.dll" - File "$%HB_ABSROOT%bin\mingwm10.dll" - File "$%HB_ABSROOT%bin\QtCore4.dll" - File "$%HB_ABSROOT%bin\QtGui4.dll" - File "$%HB_ABSROOT%bin\QtNetwork4.dll" - File "$%HB_ABSROOT%bin\QtSql4.dll" - File "$%HB_ABSROOT%bin\uic.exe" - File "$%HB_ABSROOT%bin\rcc.exe" - File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt" - File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" +; File "$%HB_ABSROOT%bin\libgcc_s_dw2-1.dll" +; File "$%HB_ABSROOT%bin\mingwm10.dll" +; File "$%HB_ABSROOT%bin\QtCore4.dll" +; File "$%HB_ABSROOT%bin\QtGui4.dll" +; File "$%HB_ABSROOT%bin\QtNetwork4.dll" +; File "$%HB_ABSROOT%bin\QtSql4.dll" +; File "$%HB_ABSROOT%bin\uic.exe" +; File "$%HB_ABSROOT%bin\rcc.exe" +; File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt" +; File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" SetOutPath $INSTDIR\include File "$%HB_ABSROOT%include\*.*" @@ -149,12 +149,12 @@ Section /o "x64 tools" hb_main_x64 SectionEnd !endif -!ifndef PKG_NO_IDE -Section /o "IDE" hb_ide - SetOutPath $INSTDIR\bin - File "$%HB_ABSROOT%bin\hbide.exe" -SectionEnd -!endif +; !ifndef PKG_NO_IDE +; Section /o "IDE" hb_ide +; SetOutPath $INSTDIR\bin +; File "$%HB_ABSROOT%bin\hbide.exe" +; SectionEnd +; !endif !ifndef PKG_NO_CC_MINGW Section "MinGW compiler" hb_mingw @@ -348,7 +348,7 @@ Section "Start Menu and Desktop icons" hb_shortcuts CreateShortCut "$SMPROGRAMS\Harbour $%HB_VM%\Harbour (Command line).lnk" "cmd.exe" "/k cd $INSTDIR\bin" "cmd.exe" 0 CreateShortCut "$SMPROGRAMS\Harbour $%HB_VM%\Harbour.lnk" "$INSTDIR" "" "$INSTDIR" 0 CreateShortCut "$SMPROGRAMS\Harbour $%HB_VM%\Harbour (Interactive shell).lnk" "$INSTDIR\bin\hbrun.exe" "" "$INSTDIR\bin\hbrun.exe" 0 - ; TOFIX: Only create this shortcut, if 'hb_ide' component was enabled at install time (or when the target filename exists) +; ; TOFIX: Only create this shortcut, if 'hb_ide' component was enabled at install time (or when the target filename exists) ;!ifndef PKG_NO_IDE ; CreateShortCut "$SMPROGRAMS\Harbour $%HB_VM%\hbide.lnk" "$INSTDIR\bin\hbide.exe" "" "$INSTDIR\bin\hbide.exe" 0 ;!endif @@ -372,9 +372,9 @@ SectionEnd LangString DESC_hb_main_x64 ${LANG_ENGLISH} "Harbour x64 tools" LangString DESC_hb_dlls_x64 ${LANG_ENGLISH} "Harbour dlls for x64" !endif -!ifndef PKG_NO_IDE - LangString DESC_hb_ide ${LANG_ENGLISH} "Harbour IDE" -!endif +; !ifndef PKG_NO_IDE +; LangString DESC_hb_ide ${LANG_ENGLISH} "Harbour IDE" +; !endif !ifndef PKG_NO_COMP_MINGWARM LangString DESC_hb_dlls_arm ${LANG_ENGLISH} "Harbour dlls for WinCE/ARM" !endif @@ -445,9 +445,9 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${hb_main_x64} $(DESC_hb_main_x64) !insertmacro MUI_DESCRIPTION_TEXT ${hb_dlls_x64} $(DESC_hb_dlls_x64) !endif -!ifndef PKG_NO_IDE - !insertmacro MUI_DESCRIPTION_TEXT ${hb_ide} $(DESC_hb_ide) -!endif +; !ifndef PKG_NO_IDE +; !insertmacro MUI_DESCRIPTION_TEXT ${hb_ide} $(DESC_hb_ide) +; !endif !ifndef PKG_NO_COMP_MINGWARM !insertmacro MUI_DESCRIPTION_TEXT ${hb_dlls_arm} $(DESC_hb_dlls_arm) !endif