fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-09-19 00:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
  * harbour-win-spec
  * harbour-wce-spec
  * Makefile
  * source/pp/Makefile
  * source/Makefile
  * config/global.mk
    * Renamed HB_HOST_BUILD to HB_BUILD_PART. Values 'yes' changed
      to compiler.
    + Documented HB_BUILD_PART in INSTALL.

  * mpkg_deb.sh
  * mpkg_rpm.sh
  * mpkg_rpm_win.sh
  * mpkg_rpm_wce.sh
    ! Changed bin/pack_src.sh to mpkg_src.sh.
This commit is contained in:
Viktor Szakats
2009-09-18 22:30:44 +00:00
parent f3f6653a48
commit 73bec3a94a
12 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,24 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-19 00:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* harbour-win-spec
* harbour-wce-spec
* Makefile
* source/pp/Makefile
* source/Makefile
* config/global.mk
* Renamed HB_HOST_BUILD to HB_BUILD_PART. Values 'yes' changed
to compiler.
+ Documented HB_BUILD_PART in INSTALL.
* mpkg_deb.sh
* mpkg_rpm.sh
* mpkg_rpm_win.sh
* mpkg_rpm_wce.sh
! Changed bin/pack_src.sh to mpkg_src.sh.
2009-09-19 00:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/common/hbgete.c
* harbour/source/common/hbprintf.c

2
harbour/INSTALL
View File

@@ -472,6 +472,8 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
- HB_BUILD_MODE=[cpp|c] Changes default build mode to C++ or C.
Default: c, except for msvc* and watcom
compilers, where it's cpp.
- HB_BUILD_PART=
[all|compiler|lib] Build only specific part of Harbour.
- 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

30
harbour/Makefile
View File

@@ -4,26 +4,26 @@
ROOT := ./
ifeq ($(HB_HOST_BUILD),yes)
ifeq ($(HB_BUILD_PART),compiler)
DIRS := \
source \
DIRS := \
source \
else
ifeq ($(HB_HOST_BUILD),lib)
HB_UTIL_DIR :=
else
HB_UTIL_DIR := utils{source}
endif
ifeq ($(HB_BUILD_PART),lib)
HB_UTIL_DIR :=
else
HB_UTIL_DIR := utils{source}
endif
DIRS := \
doc \
include \
external \
source{external} \
$(HB_UTIL_DIR) \
contrib{source} \
DIRS := \
doc \
include \
external \
source{external} \
$(HB_UTIL_DIR) \
contrib{source} \
endif

13
harbour/config/global.mk
View File

@@ -241,7 +241,6 @@ ifeq ($(HB_INIT_DONE),)
ifneq ($(MAKE_381),)
# Some additional ones to be given a standard name:
# HB_HOST_BUILD [yes|all|lib] -> ? (yes = build harbour/hbpp bin only, all = default, lib = build libs only)
# HB_DB_DRVEXT -> -
# HB_COMMERCE -> ?
# HB_BIN_COMPILE -> HB_BUILD_BIN_DIR
@@ -539,8 +538,8 @@ ifeq ($(HB_COMPILER),)
HB_PLATFORM := win
export HB_TOOLS_PREF := hbw
export HB_BUILD_EXTDEF := no
ifneq ($(HB_HOST_BUILD),all)
HB_HOST_BUILD := lib
ifneq ($(HB_BUILD_PART),all)
HB_BUILD_PART := lib
endif
else
$(error ! Harbour build could not find mingw32 cross-compiler. Please install it, or point HB_CCPATH/HB_CCPREFIX environment variables to it)
@@ -601,8 +600,8 @@ ifeq ($(HB_COMPILER),)
HB_PLATFORM := wce
export HB_TOOLS_PREF := hbce
export HB_BUILD_EXTDEF := no
ifneq ($(HB_HOST_BUILD),all)
HB_HOST_BUILD := lib
ifneq ($(HB_BUILD_PART),all)
HB_BUILD_PART := lib
endif
else
$(error ! Harbour build could not find cegcc cross-compiler. Please install it to /opt/mingw32ce, or point HB_CCPATH/HB_CCPREFIX environment variables to it)
@@ -639,8 +638,8 @@ ifeq ($(HB_COMPILER),)
HB_PLATFORM := dos
export HB_TOOLS_PREF := hbce
export HB_BUILD_EXTDEF := no
ifneq ($(HB_HOST_BUILD),all)
HB_HOST_BUILD := lib
ifneq ($(HB_BUILD_PART),all)
HB_BUILD_PART := lib
endif
else
$(error ! Harbour build could not find djgpp cross-compiler. Please install it to /usr/local/i586-pc-msdosdjgpp, or point HB_CCPATH/HB_CCPREFIX environment variables to it)

6
harbour/harbour-wce-spec
View File

@@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT
%build
export HB_HOST_BUILD=yes
export HB_BUILD_PART=compiler
export HB_PLATFORM=linux
export HB_COMPILER=gcc
export HB_USER_CFLAGS=
make %{?_smp_mflags}
export HB_HOST_BUILD=lib
export HB_BUILD_PART=lib
export HB_PLATFORM=wce
export HB_COMPILER=mingwarm
@@ -121,7 +121,7 @@ make %{?_smp_mflags}
# Install harbour itself.
export HB_HOST_BUILD=lib
export HB_BUILD_PART=lib
export HB_PLATFORM=wce
export HB_COMPILER=mingwarm

6
harbour/harbour-win-spec
View File

@@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT
%build
export HB_HOST_BUILD=yes
export HB_BUILD_PART=compiler
export HB_PLATFORM=linux
export HB_COMPILER=gcc
export HB_USER_CFLAGS=
make %{?_smp_mflags}
export HB_HOST_BUILD=lib
export HB_BUILD_PART=lib
export HB_PLATFORM=win
export HB_COMPILER=mingw
@@ -121,7 +121,7 @@ make %{?_smp_mflags}
# Install harbour itself.
export HB_HOST_BUILD=lib
export HB_BUILD_PART=lib
export HB_PLATFORM=win
export HB_COMPILER=mingw

6
harbour/mpkg_deb.sh
View File

@@ -120,15 +120,15 @@ fi
if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ]
then
. ./bin/pack_src.sh
. ./mpkg_src.sh
stat="$?"
if [ -z "${hb_filename}" ]
then
echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}"
echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}"
exit 1
elif [ "${stat}" != 0 ]
then
echo "Error during packing the sources in ./bin/pack_src.sh"
echo "Error during packing the sources in ./mpkg_src.sh"
exit 1
elif [ -f ${hb_filename} ]
then

6
harbour/mpkg_rpm.sh
View File

@@ -156,15 +156,15 @@ done
if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ]
then
. ./bin/pack_src.sh
. ./mpkg_src.sh
stat="$?"
if [ -z "${hb_filename}" ]
then
echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}"
echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}"
exit 1
elif [ "${stat}" != 0 ]
then
echo "Error during packing the sources in ./bin/pack_src.sh"
echo "Error during packing the sources in ./mpkg_src.sh"
exit 1
elif [ -f ${hb_filename} ]
then

6
harbour/mpkg_rpm_wce.sh
View File

@@ -84,15 +84,15 @@ done
if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ]
then
. ./bin/pack_src.sh
. ./mpkg_src.sh
stat="$?"
if [ -z "${hb_filename}" ]
then
echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}"
echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}"
exit 1
elif [ "${stat}" != 0 ]
then
echo "Error during packing the sources in ./bin/pack_src.sh"
echo "Error during packing the sources in ./mpkg_src.sh"
exit 1
elif [ -f ${hb_filename} ]
then

6
harbour/mpkg_rpm_win.sh
View File

@@ -106,15 +106,15 @@ done
if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ]
then
. ./bin/pack_src.sh
. ./mpkg_src.sh
stat="$?"
if [ -z "${hb_filename}" ]
then
echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}"
echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}"
exit 1
elif [ "${stat}" != 0 ]
then
echo "Error during packing the sources in ./bin/pack_src.sh"
echo "Error during packing the sources in ./mpkg_src.sh"
exit 1
elif [ -f ${hb_filename} ]
then

4
harbour/source/Makefile
View File

@@ -6,7 +6,7 @@ ROOT := ../
include $(TOP)$(ROOT)config/global.mk
ifeq ($(HB_HOST_BUILD),yes)
ifeq ($(HB_BUILD_PART),compiler)
DIRS := \
common \
@@ -115,7 +115,7 @@ else
export DYNNAME_POST
endif
ifeq ($(HB_HOST_BUILD),lib)
ifeq ($(HB_BUILD_PART),lib)
HB_COMP_DIR :=
HB_COMP_REF :=
else

2
harbour/source/pp/Makefile
View File

@@ -32,7 +32,7 @@ pptable.c : hbpp$(BIN_EXT)
$(HB_HOST_BIN_DIR)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER)
-@$(RM) hbpp$(OBJ_EXT)
ifneq ($(HB_HOST_BUILD),lib)
ifneq ($(HB_BUILD_PART),lib)
ifneq ($(HB_BIN_INSTALL),)
INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT)
INSTALL_DIR := $(HB_BIN_INSTALL)