2009-11-30 14:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* mpkg_rpm.sh
  * INSTALL
  * harbour.spec
  * config/global.mk
  * config/detect.mk
    * HB_COMMERCE renamed to HB_BUILD_NOGPLLIB (in sync with existing
      --without option)
    + HB_BUILD_NOGPLLIB now documented in INSTALL.
    ; Please update your enviroment.
    ; BTW, I'm open to other names which are more generic and clearly
      states what we're talking about exactly. Current terminology
      is limited to GPL license.

harbour/ChangeLog

@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-30 14:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_rpm.sh
+  * INSTALL
+  * harbour.spec
+  * config/global.mk
+  * config/detect.mk
+    * HB_COMMERCE renamed to HB_BUILD_NOGPLLIB (in sync with existing
+      --without option)
+    + HB_BUILD_NOGPLLIB now documented in INSTALL.
+    ; Please update your enviroment.
+    ; BTW, I'm open to other names which are more generic and clearly
+      states what we're talking about exactly. Current terminology
+      is limited to GPL license.
+
 2009-11-30 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * config/bin.mk

harbour/INSTALL

@@ -238,7 +238,7 @@ HARBOUR
          --without x11      - do not build components dependent on x11 (gtxwc)
          --without curses   - do not build components dependent on curses (gtcrs)
          --without slang    - do not build components dependent on slang (gtsln)
-         --without gpllib   - do not build components dependent on GPL 3rd party code (HB_COMMERCE)
+         --without gpllib   - do not build components dependent on GPL 3rd party code
          --without gpm      - build components without gpm support (gttrm, gtsln, gtcrs)
 
    Binary .rpm on Linux (cross-builds)
@@ -580,6 +580,9 @@ HARBOUR
                                         compilers, where it's cpp.
    - HB_BUILD_PARTS=
          [all|compiler|lib]    Build only specific part of Harbour.
+   - HB_BUILD_NOGPLLIB=yes     Disables components dependent on GPL 3rd party code,
+                               to allow Harbour for commercial (closed-source)
+                               projects. Default: no
    - HB_BUILD_EXTDEF=no        Controls autodetection of external components
                                on default systems locations. Default: yes
    - HB_CONTRIBLIBS=no         Don't build any contrib libraries. Default: yes

harbour/config/detect.mk

@@ -31,7 +31,7 @@ export HB_HAS_WATT       :=
 
 # Exclude Harbour-wide features prohibiting commercial use
 
-ifeq ($(HB_COMMERCE),yes)
+ifeq ($(HB_BUILD_NOGPLLIB),yes)
    export HB_INC_GPM := no
    export HB_INC_SLANG := no
 endif

harbour/config/global.mk

@@ -249,7 +249,6 @@ ifeq ($(HB_INIT_DONE),)
    ifneq ($(MAKE_381),)
 
       # Some additional ones to be given a standard name:
-      #   HB_COMMERCE                 -> ?
       #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
       #   HB_DLLIBS                   -> (only used in one location, so it's a local matter)

harbour/harbour.spec

@@ -63,7 +63,7 @@
 %define hb_idir  export HB_INC_INSTALL=%{_includedir}/%{name}
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_edir  export HB_ETC_INSTALL=%{hb_etcdir}
-%define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
+%define hb_cmrc  export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes}
 %define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql hbnf %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_firebird:hbfbird} %{?_with_allegro:gtalleg} %{?_with_qt:hbqt hbxbp}"
 %define hb_env   %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org

harbour/mpkg_rpm.sh

@@ -111,11 +111,11 @@ if [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ]
 then
     INST_PARAM="${INST_PARAM} --with ads"
 fi
-if [ "${HB_COMMERCE}" = "yes" ]
+if [ "${HB_BUILD_NOGPLLIB}" = "yes" ]
 then
     INST_PARAM="${INST_PARAM} --without gpllib"
 fi
-if [ "${HB_COMMERCE}" = "yes" ] || ! test_reqrpm "gpm-devel"
+if [ "${HB_BUILD_NOGPLLIB}" = "yes" ] || ! test_reqrpm "gpm-devel"
 then
     INST_PARAM="${INST_PARAM} --without gpm"
 fi