From fb7ec7b0e44fb0cbd30bd234befab40453679841 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 22 Aug 2009 20:04:52 +0000 Subject: [PATCH] 2009-08-22 21:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + config/Makefile + Added Makefile to show an error with simple one-liner instruction to guide users who want to start provided GNU Make executables right in the config dir. This is wrong, they should be started in root. Anyhow maybe I'll move these make executables to root, with these names: dos-make.exe os2-make.exe win-make.exe This will avoid above problem, it simply cannot be [messed] up anymore. Well, so I imagine. These names also won't collide with original names of these tools, so users who want to stick with external tools, can continue to do so. The other option is that I delete them from SVN. * config/global.mk + Showing warning to user if she's using DOS shell (which probably means DOS based GNU Make) on Windows system. It should also work for most features, but not recommended and there is little reason to do this in production environment. * contrib/hbqt/Makefile * contrib/hbqt/generator/hbqtgen.prg + contrib/hbqt/filelist.mk - contrib/hbqt/Makefile_gen * Renamed Makefile to filelist.mk to stick with known short filenames and extensions. * INSTALL * Minor. --- harbour/ChangeLog | 35 +++++++++++++++++++ harbour/INSTALL | 9 +++-- harbour/config/Makefile | 5 +++ harbour/config/global.mk | 10 ++++-- harbour/contrib/hbqt/Makefile | 2 +- .../hbqt/{Makefile_gen => filelist.mk} | 0 harbour/contrib/hbqt/generator/hbqtgen.prg | 2 +- 7 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 harbour/config/Makefile rename harbour/contrib/hbqt/{Makefile_gen => filelist.mk} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e5d221b321..69afe1cc44 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,41 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-22 21:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + + config/Makefile + + Added Makefile to show an error with simple one-liner + instruction to guide users who want to start provided + GNU Make executables right in the config dir. + This is wrong, they should be started in root. + Anyhow maybe I'll move these make executables to root, + with these names: + dos-make.exe + os2-make.exe + win-make.exe + This will avoid above problem, it simply cannot be + [messed] up anymore. Well, so I imagine. + These names also won't collide with original names + of these tools, so users who want to stick with external + tools, can continue to do so. + The other option is that I delete them from SVN. + + * config/global.mk + + Showing warning to user if she's using DOS shell + (which probably means DOS based GNU Make) on Windows system. + It should also work for most features, but not recommended + and there is little reason to do this in production + environment. + + * contrib/hbqt/Makefile + * contrib/hbqt/generator/hbqtgen.prg + + contrib/hbqt/filelist.mk + - contrib/hbqt/Makefile_gen + * Renamed Makefile to filelist.mk to stick + with known short filenames and extensions. + + * INSTALL + * Minor. + 2009-08-22 16:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/rules.mk * config/dyn.mk diff --git a/harbour/INSTALL b/harbour/INSTALL index 08e8988d4b..10ef973fa1 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -69,7 +69,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE http://sourceforge.net/projects/mingw/files/GNU%20Make/Current%20Release_%20mingw32-make-3.81-20080326/mingw32-make-3.81-20080326-3.tar.gz/download Unpack it to your PATH or Harbour source root directory. If you use MinGW compiler, you already have GNU Make. - For convenience you may also use included config/mingw32-make.exe instead. + For convenience you may also use included config/mingw32-make.exe + instead. [ > set HB_COMPILER= ] > mingw32-make install @@ -119,7 +120,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE 2.) You need to get GNU Make. We recommend this link: ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381b.zip Unpack it to your PATH or Harbour source root directory. - For convenience you may also use included config/dj-make.exe instead. + For convenience you may also use included config/dj-make.exe + instead. [ > set HB_COMPILER= ] > make install @@ -141,7 +143,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE ftp://hobbes.nmsu.edu/pub/os2/dev/util/make-3.81-r2-bin-static.zip If you use other host, please refer to other platform instructions in this section. - For convenience you may also use included config/os2-make.exe instead. + For convenience you may also use included config/os2-make.exe + instead. [ > set HB_COMPILER= ] > make install diff --git a/harbour/config/Makefile b/harbour/config/Makefile new file mode 100644 index 0000000000..f8444a7569 --- /dev/null +++ b/harbour/config/Makefile @@ -0,0 +1,5 @@ +# +# $Id$ +# + +all: ; $(error ! Error: GNU Make must be run from the Harbour root directory) diff --git a/harbour/config/global.mk b/harbour/config/global.mk index afd750f77d..2d33da6984 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -220,7 +220,7 @@ ifeq ($(HB_INIT_DONE),) endif ifeq ($(HB_BUILD_PKG),no) - $(warning ! Warning: Use 'clean install' from Harbour root directory to create a release package) + $(warning ! Warning: Use 'clean install' from Harbour root directory to create a release package.) endif # Enforce some basic setting for release packages @@ -469,6 +469,12 @@ ifeq ($(HB_INIT_DONE),) ifneq ($(MAKE_381),) $(info ! HB_HOST_ARCH: $(HB_HOST_ARCH)$(if $(HB_HOST_CPU), ($(HB_HOST_CPU)),) HB_SHELL: $(HB_SHELL)) endif + + ifeq ($(HB_HOST_ARCH)-$(HB_SHELL),win-dos) + $(warning ! Warning: You're using DOS GNU Make executable (or DOS shell) on Windows host.) + $(warning ! Not recommended combination. Some features will be disabled.) + $(warning ! Please use the Windows build of GNU Make.) + endif endif HB_ARCH_AUTO := @@ -828,7 +834,7 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU)) HB_BIN_COMPILE := $(realpath $(HB_BIN_COMPILE)) endif ifeq ($(HB_BIN_COMPILE),) - $(warning ! Warning: HB_BIN_COMPILE not specified. Couldn't find native build) + $(warning ! Warning: HB_BIN_COMPILE not specified. Couldn't find native build.) else ifneq ($(MAKE_381),) $(info ! HB_BIN_COMPILE not specified. Automatically set to: $(HB_BIN_COMPILE)) diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index cdee456d4a..754e65921a 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -68,7 +68,7 @@ ifneq ($(strip $(HB_INC_QT_OK)),spec) HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit) endif -include $(TOP)$(ROOT)contrib/hbqt/Makefile_gen +include $(TOP)$(ROOT)contrib/hbqt/filelist.mk PRG_HEADERS := \ hbqt.ch \ diff --git a/harbour/contrib/hbqt/Makefile_gen b/harbour/contrib/hbqt/filelist.mk similarity index 100% rename from harbour/contrib/hbqt/Makefile_gen rename to harbour/contrib/hbqt/filelist.mk diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index b8f5871171..edfaaba087 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1361,7 +1361,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut ) - LOCAL cFile := cPathOut + s_PathSep + "Makefile_gen" + LOCAL cFile := cPathOut + s_PathSep + "filelist.mk" LOCAL txt_ := {} LOCAL s