From 95abd11330a10d02ee72e1b91b4f7730ff80d73a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Sep 2012 09:41:51 +0000 Subject: [PATCH] 2012-09-26 11:39 UTC+0200 Viktor Szakats (harbour syenar.net) * debian/control * INSTALL * package/harbour.spec * package/mpkg_rpm.sh * package/mpkg_win_nightly.bat * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi % deleted QT related docs, dependencies and script logic --- harbour/ChangeLog | 10 +++++++++ harbour/INSTALL | 30 ------------------------- harbour/debian/control | 2 +- harbour/package/harbour.spec | 18 +-------------- harbour/package/mpkg_rpm.sh | 6 ----- harbour/package/mpkg_win_nightly.bat | 1 - harbour/package/winuni/mpkg_win_uni.bat | 24 -------------------- harbour/package/winuni/mpkg_win_uni.nsi | 29 ------------------------ 8 files changed, 12 insertions(+), 108 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f07892c4e6..59d072bcb1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-26 11:39 UTC+0200 Viktor Szakats (harbour syenar.net) + * debian/control + * INSTALL + * package/harbour.spec + * package/mpkg_rpm.sh + * package/mpkg_win_nightly.bat + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + % deleted QT related docs, dependencies and script logic + 2012-09-26 11:35 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbnf/clrsel.prg * contrib/hbnf/datecnfg.prg diff --git a/harbour/INSTALL b/harbour/INSTALL index b83f6f7f44..d681385988 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -283,7 +283,6 @@ HARBOUR --with mysql - build components dependent on mysql (hbmysql, sddmy) --with odbc - build components dependent on odbc (hbodbc, sddodbc) --with pgsql - build components dependent on pgsql (hbpgsql, sddpg) - --with qt - build components dependent on qt (hbqt, hbxbp) --with localzlib - build local copy of zlib library --with localpcre - build local copy of pcre library --without x11 - do not build components dependent on x11 (gtxwc) @@ -386,7 +385,6 @@ HARBOUR HB_WITH_PCRE=C:\pcre (defaults to locally hosted version if not found) HB_WITH_PGSQL=C:\pgsql\include HB_WITH_PNG=C:\libpng (defaults to locally hosted version if not found) - HB_WITH_QT=C:\Qt\include (version 4.5.0 or upper is required) HB_WITH_SLANG= (on *nix systems) HB_WITH_SQLITE3=C:\sqlite3 (defaults to locally hosted version if not found) HB_WITH_TIFF=C:\libtiff (defaults to locally hosted version if not found) @@ -403,23 +401,12 @@ HARBOUR where applicable. 'nolocal' will explicitly disable using locally hosted copy. - To enable building libs that link against static version of 3rd party - components: - HB_QT_BUILD_STATIC=yes (only meaningful on Windows platform) - - You can override autodetection of QT 'moc', 'rcc' and 'uic' tools - by using HB_QTPATH and optionally HB_QTPOSTFIX envvars. This may - only be necessary on some *nix systems. F.e.: - HB_QTPATH=/opt/qt45/bin/ - HB_QTPOSTFIX= - Certain contribs can be instructed (when using .hbc files) to link against static build of their 3rd party lib dependencies (for advanced users only): HB_STATIC_ALLEGRO=yes HB_STATIC_CURL=yes HB_STATIC_OPENSSL=yes - HB_STATIC_QT=yes NOTES: - You need to use native path format to your shell/OS. - Spaces in directory names aren't currently supported. @@ -476,7 +463,6 @@ HARBOUR for contrib/hbmysql lib: $ sudo apt-get install libmysqlclient15-dev for contrib/hbodbc lib: $ sudo apt-get install unixodbc-dev for contrib/hbpgsql lib: $ sudo apt-get install libpq-dev - for contrib/hbqt lib: $ sudo apt-get install libqt4-dev Optional, to override locally hosted sources: @@ -514,7 +500,6 @@ HARBOUR for contrib/hbodbc lib: unixodbc-devel OR unixODBC-devel for contrib/hbpgsql lib: postgresql-devel - for contrib/hbqt lib: qt45-devel NOTES: - You can use following commands on different distros to install packages: openSUSE: $ sudo zypper install @@ -1093,7 +1078,6 @@ HARBOUR set HB_WITH_OCILIB=C:\ocilib\include set HB_WITH_OPENSSL=C:\openssl\inc32 set HB_WITH_PGSQL=C:\pgsql\include - set HB_WITH_QT=C:\Qt\include -->8-- for Windows x64 (x86-64) hosts @@ -1694,20 +1678,6 @@ HARBOUR http://www.postgresql.org/ HB_WITH_PNG - libpng [multiplatform, free, open-source] http://www.libpng.org/pub/png/libpng.html - HB_WITH_QT - Nokia QT (GUI) [win, wce, os2, darwin, linux, free, open-source] - http://qt.nokia.com/products/ - http://get.qt.nokia.com/qt/source/ - OS X binary package (or use Homebrew): - qt-mac-opensource-*.dmg in http://get.qt.nokia.com/qt/source/ - Supported Windows binary package: - qt-win-opensource-*-mingw.exe in http://get.qt.nokia.com/qt/source/ - How to create Windows static and MSVC builds: - http://developer.qt.nokia.com/doc/qt-4.8/deployment-windows.html - NOTES: - - QT 4.5.x for Windows requires MinGW builds with SJLJ stack frame unwinding. - (mingw official 3.4.x, or mingw tdm) - - QT 4.6.x (and upper) for Windows requires MinGW builds with DWARF-2 stack frame unwinding. - (mingw official 4.4.0 or upper, or mingw tdm with dwarf2) HB_WITH_SQLITE3 - sqlite3 [multiplatform, free, open-source] http://www.sqlite.org/ HB_WITH_TIFF - libtiff [multiplatform, free, open-source] diff --git a/harbour/debian/control b/harbour/debian/control index b0950b6fd7..3853b58884 100644 --- a/harbour/debian/control +++ b/harbour/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), libjpeg62-dev, libpcre3-dev, libcairo2-dev, libcups2-dev, libexpat1-dev, libfreeimage-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, firebird2.0-dev | firebird2.1-dev, libgd2-noxpm-dev | libgd2-xpm-dev, libmagic-dev, libmysqlclient-dev, - unixodbc-dev, libpq-dev, libqt4-dev, qt4-dev-tools, libssl-dev, + unixodbc-dev, libpq-dev, libssl-dev, libslang2-dev, libncurses5-dev | libncursesw5-dev, libslang2-dev, libx11-dev Standards-Version: 3.6.2 diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index 3e2cc6db97..fe02a7b768 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -78,7 +78,7 @@ %define hb_blds export HB_BUILD_STRIP=all %define hb_bldsh export HB_BUILD_SHARED=%{!?_with_static:yes} %define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes} -%define hb_ctrb export HB_BUILD_CONTRIBS="hbblink hbct hbgt hbmisc hbmzip hbbz2 hbnetio hbtip hbtpathy hbcomm hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbm rddsql hbsqlit3 sddsqlt3 hbnf hbhttpd hbformat hbunix hbzebra hblzf hbmemio hbmlzo hbmxml hbexpat %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_firebird:hbfbird sddfb} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads} hbrun" +%define hb_ctrb export HB_BUILD_CONTRIBS="hbblink hbct hbgt hbmisc hbmzip hbbz2 hbnetio hbtip hbtpathy hbcomm hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbm rddsql hbsqlit3 sddsqlt3 hbnf hbhttpd hbformat hbunix hbzebra hblzf hbmemio hbmlzo hbmxml hbexpat %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_firebird:hbfbird sddfb} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_ads:rddads} hbrun" %define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{shl_path} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_proot} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ddir} ; %{hb_edir} ; %{hb_mdir} ; %{hb_tdir} ; %{hb_ctrb} ; %{hb_cmrc} ; %{hb_blds} ; %{hb_bldsh} ###################################################################### ## Preamble. @@ -369,16 +369,6 @@ statikus szerkesztéshez. %{?_with_pgsql:%{dname} to kompatybilny z językiem CA-Cl*pper kompilator.} %{?_with_pgsql:Ten pakiet udostępnia statyczn+ biliotekę PGSQL dla kompilatora %{dname}.} -## qt library -%{?_with_qt:%package qt} -%{?_with_qt:Summary: QT library bindings for %{dname} compiler} -%{?_with_qt:Group: Development/Languages} -%{?_with_qt:Requires: libqt4-devel %{name} = %{?epoch:%{epoch}:}%{version}-%{release}} - -%{?_with_qt:%description qt} -%{?_with_qt:%{dname} is a Clipper compatible compiler.} -%{?_with_qt:This package provides %{dname} QT libraries for program linking.} - ###################################################################### ## Preperation. @@ -598,12 +588,6 @@ rm -rf $RPM_BUILD_ROOT %{?_with_pgsql:%{_libdir}/%{name}/libhbpgsql.a} %{?_with_pgsql:%{_libdir}/%{name}/libsddpg.a} -%{?_with_qt:%files qt} -%{?_with_qt:%defattr(644,root,root,755)} -%{?_with_qt:%dir %{_libdir}/%{name}} -%{?_with_qt:%{_libdir}/%{name}/libhbqt*.a} -%{?_with_qt:%{_libdir}/%{name}/libhbxbp.a} - ###################################################################### ## Spec file Changelog. ###################################################################### diff --git a/harbour/package/mpkg_rpm.sh b/harbour/package/mpkg_rpm.sh index ccc4b33c10..34fcbc7d82 100755 --- a/harbour/package/mpkg_rpm.sh +++ b/harbour/package/mpkg_rpm.sh @@ -35,7 +35,6 @@ do [ "$1" = "firebird" ] && NEED_RPM="${NEED_RPM} firebird-devel" [ "$1" = "freeimage" ] && NEED_RPM="${NEED_RPM} freeimage-devel" [ "$1" = "allegro" ] && NEED_RPM="${NEED_RPM} allegro-devel" - [ "$1" = "qt" ] && NEED_RPM="${NEED_RPM} libqt4-devel" fi fi LAST="$1" @@ -87,11 +86,6 @@ if test_reqrpm "postgresql-devel" then INST_PARAM="${INST_PARAM} --with pgsql" fi -if test_reqrpm "libqt4-devel" -then - v=` rpm -q --whatprovides libqt4-devel --qf "%{VERSION}"|sed -e "s/[^0-9]*[0-9]*.\([0-9]*\).*/\1/g"` - [ "$v" -ge 5 ] && INST_PARAM="${INST_PARAM} --with qt" -fi if [ "${HB_BUILD_NOGPLLIB}" = "yes" ] then diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index 9cdafe8ba6..fe5d99bb7b 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -76,7 +76,6 @@ 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 -rem set HB_WITH_QT=%_HB_DIR_3RD%qt\include echo ! Building Harbour... diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index f5488d0bb4..34f0a63928 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -86,19 +86,6 @@ 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 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 pushd @@ -129,17 +116,6 @@ 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 -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 50be7b4734..98cdecf78b 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -105,18 +105,6 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc" 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" - SetOutPath $INSTDIR\include File "$%HB_ABSROOT%include\*.*" @@ -149,13 +137,6 @@ 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_CC_MINGW Section "MinGW compiler" hb_mingw SetOutPath $INSTDIR\comp\mingw @@ -348,10 +329,6 @@ 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) -;!ifndef PKG_NO_IDE -; CreateShortCut "$SMPROGRAMS\Harbour $%HB_VM%\hbide.lnk" "$INSTDIR\bin\hbide.exe" "" "$INSTDIR\bin\hbide.exe" 0 -;!endif CreateDirectory "$SMPROGRAMS\Harbour $%HB_VM%\Links" WriteINIStr "$SMPROGRAMS\Harbour $%HB_VM%\Links\Homepage.url" "InternetShortcut" "URL" "http://harbour-project.org/" WriteINIStr "$SMPROGRAMS\Harbour $%HB_VM%\Links\Sourceforge Page.url" "InternetShortcut" "URL" "http://sourceforge.net/projects/harbour-project/" @@ -372,9 +349,6 @@ 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_COMP_MINGWARM LangString DESC_hb_dlls_arm ${LANG_ENGLISH} "Harbour dlls for WinCE/ARM" !endif @@ -445,9 +419,6 @@ 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_COMP_MINGWARM !insertmacro MUI_DESCRIPTION_TEXT ${hb_dlls_arm} $(DESC_hb_dlls_arm) !endif