From d851a20f1395488d9b88d7e78a2c25dca013b96a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 2 Jan 2010 11:23:59 +0000 Subject: [PATCH] 2010-01-02 12:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * mpkg_rpm.sh * Sorted '-with' checks. + Added freeimage and cairo enabler logic (none tested) * INSTALL - Deleted gtk2-devel from instructions. + Added freeimage-devel and cairo-devel to rpm pkg list. (none tested) * contrib/hbide/projects/hbide.hbi ! Deleted .exe extension from output name for portability. ! Fixed -workdir option to also have ${hb_plat} macro for portability. ; Pls remember that hbide is meant to be a portable tool. ; TOFIX: Delete -workdir option altogether. Not needed. ; TOFIX: Hard-wired dir C:\qt\2009.01\qt\lib should be stored in SVN. --- harbour/ChangeLog | 18 +++++++++ harbour/INSTALL | 3 +- harbour/contrib/hbide/projects/hbide.hbi | 17 ++++---- harbour/mpkg_rpm.sh | 51 +++++++++++++----------- 4 files changed, 56 insertions(+), 33 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7591aefba0..ef74bf02f2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-02 12:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_rpm.sh + * Sorted '-with' checks. + + Added freeimage and cairo enabler logic (none tested) + + * INSTALL + - Deleted gtk2-devel from instructions. + + Added freeimage-devel and cairo-devel to rpm pkg list. + (none tested) + + * contrib/hbide/projects/hbide.hbi + ! Deleted .exe extension from output name for portability. + ! Fixed -workdir option to also have ${hb_plat} macro for portability. + ; Pls remember that hbide is meant to be a portable tool. + ; TOFIX: Delete -workdir option altogether. Not needed. + ; TOFIX: Hard-wired dir C:\qt\2009.01\qt\lib should be stored in + SVN. + 2010-01-02 02:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour.spec ! Some local leftovers deleted. diff --git a/harbour/INSTALL b/harbour/INSTALL index 04884e34d3..c0c7e59b1c 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -396,13 +396,14 @@ HARBOUR - xorg-x11-devel OR XFree86-devel - postgresql-devel - firebird-devel - - gtk2-devel + - freeimage-devel - ncurses-devel AND ncurses - slang-devel AND slang - unixodbc-devel OR unixODBC-devel - gd-devel - libmysqlclient-devel OR mysql-devel OR MySQL-devel - allegro-devel + - cairo-devel - curl-devel - gpm-devel diff --git a/harbour/contrib/hbide/projects/hbide.hbi b/harbour/contrib/hbide/projects/hbide.hbi index cfe53078fc..87b56aa12c 100644 --- a/harbour/contrib/hbide/projects/hbide.hbi +++ b/harbour/contrib/hbide/projects/hbide.hbi @@ -5,9 +5,9 @@ Location = projects WorkingFolder = projects DestinationFolder = projects Output = hbide -LaunchParams = -LaunchProgram = - +LaunchParams = +LaunchProgram = + [ FLAGS ] ../../hbxbp/hbxbp.hbc -w3 @@ -16,10 +16,10 @@ LaunchProgram = -es2 -lhbwin -lpsapi --Lc:\qt\2009.01\qt\lib --oprojects\hbides.exe --workdir=projects/${hb_comp}/hbide - +-LC:\qt\2009.01\qt\lib +-oprojects\hbides +-workdir=projects/${hb_plat}/${hb_comp}/hbide + [ SOURCES ] # "Not Equal To == #" is a comment line as is accepted in .hbp # So you can exploit this feature to visualize project source files @@ -35,7 +35,7 @@ LaunchProgram = hbide.ch hbide.ini - + [ METADATA ] # Meta Key/Value pair accepts any valid Harbour defined # function call returning a string value, thus making meta-data @@ -45,4 +45,3 @@ LaunchProgram = # will return the same string as # IdeSrc = hb_dirBase() - diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index c0501bbb67..83525bf070 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -73,26 +73,9 @@ do shift done -if test_reqrpm "MySQL-devel" || test_reqrpm "mysql-devel" +if [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ] then - INST_PARAM="${INST_PARAM} --with mysql" -fi -if test_reqrpm "postgresql-devel" -then - INST_PARAM="${INST_PARAM} --with pgsql" -fi -if test_reqrpm "firebird-devel" -then - INST_PARAM="${INST_PARAM} --with firebird" -fi -if test_reqrpm "gd-devel" -then - v=`rpm -q --whatprovides gd-devel --qf "%{VERSION}"|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"` - [ "$v" -ge 2 ] && INST_PARAM="${INST_PARAM} --with gd" -fi -if test_reqrpm "unixodbc-devel" || test_reqrpm "unixODBC-devel" -then - INST_PARAM="${INST_PARAM} --with odbc" + INST_PARAM="${INST_PARAM} --with ads" fi if test_reqrpm "allegro-devel" then @@ -102,15 +85,37 @@ if test_reqrpm "curl-devel" then INST_PARAM="${INST_PARAM} --with curl" fi +if test_reqrpm "firebird-devel" +then + INST_PARAM="${INST_PARAM} --with firebird" +fi +if test_reqrpm "freeimage-devel" +then + INST_PARAM="${INST_PARAM} --with freeimage" +fi +if test_reqrpm "gd-devel" +then + v=`rpm -q --whatprovides gd-devel --qf "%{VERSION}"|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"` + [ "$v" -ge 2 ] && INST_PARAM="${INST_PARAM} --with gd" +fi +if test_reqrpm "MySQL-devel" || test_reqrpm "mysql-devel" +then + INST_PARAM="${INST_PARAM} --with mysql" +fi +if test_reqrpm "unixodbc-devel" || test_reqrpm "unixODBC-devel" +then + INST_PARAM="${INST_PARAM} --with odbc" +fi +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 [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ] -then - INST_PARAM="${INST_PARAM} --with ads" -fi + if [ "${HB_BUILD_NOGPLLIB}" = "yes" ] then INST_PARAM="${INST_PARAM} --without gpllib"