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

@@ -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.

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
 

harbour/contrib/hbide/projects/hbide.hbi

@@ -5,9 +5,9 @@ Location          = <IdeSrc>projects
 WorkingFolder     = <IdeSrc>projects
 DestinationFolder = <IdeSrc>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
--o<IdeSrc>projects\hbides.exe
--workdir=<IdeSrc>projects/${hb_comp}/hbide
- 
+-LC:\qt\2009.01\qt\lib
+-o<IdeSrc>projects\hbides
+-workdir=<IdeSrc>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     =
 
 <IdeSrc>hbide.ch
 <IdeSrc>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 <SomeValue>
 #
 IdeSrc  =  hb_dirBase()
- 

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"