gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated PATH-checks in common.make for new filesystem support

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24542 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-14 04:44:35 +00:00
parent 5f29633638
commit 125a66d45a
2 changed files with 49 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* common.make: Moved top-level PATH sanity check at the end of the
file. In the check, use GNUSTEP_SYSTEM_TOOLS instead of
GNUSTEP_SYSTEM_ROOT/Tools. Avoid the check on Cygwin where paths
need conversion.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/framework.make ($(DUMMY_FRAMEWORK_FILE)): Return the

95
common.make
View file

@ -89,59 +89,6 @@ ifeq ($(GNUSTEP_BUILD_DIR),)
GNUSTEP_BUILD_DIR = .
endif
#
# Sanity checks - only performed at the first make invocation
#
# FIXME - the sanity checks should probably be removed and/or rewritten.
#
# Please note that _GNUSTEP_TOP_INVOCATION_DONE is set by the first
# time Master/rules.make is read, and propagated to sub-makes. So
# this check will pass only the very first time we parse this file,
# and if Master/rules.make have not yet been parsed.
ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
# Print out a message with our version number and how to get help on
# targets and options.
ifeq ($(MAKE_WITH_INFO_FUNCTION),yes)
$(info This is gnustep-make $(GNUSTEP_MAKE_VERSION). Type 'make print-gnustep-make-help' for help.)
endif
# Sanity check on $PATH - NB: if PATH is wrong, we can't do certain things
# because we can't run the tools (not even using opentool as we can't even
# run opentool if PATH is wrong) - this is particularly bad for gui stuff
# Skip the check if we are on an Apple system. I was told that you can't
# source GNUstep.sh before running Apple's PB and that the only
# friendly solution is to disable the check.
ifneq ($(FOUNDATION_LIB), apple)
# NB - we can't trust PATH here because it's what we are trying to
# check ... but hopefully if we (common.make) have been found, we
# can trust that at least $(GNUSTEP_MAKEFILES) is set up correctly :-)
# We want to check that this path is in the PATH
SYS_TOOLS_PATH = $(GNUSTEP_SYSTEM_ROOT)/Tools
# But on cygwin we might need to first fix it up ...
ifeq ($(findstring cygwin, $(GNUSTEP_HOST_OS)), cygwin)
ifeq ($(shell echo "$(SYS_TOOLS_PATH)" | sed 's/^\([a-zA-Z]:.*\)//'),)
SYS_TOOLS_PATH := $(shell $(GNUSTEP_MAKEFILES)/fixpath.sh -u $(SYS_TOOLS_PATH))
endif
endif
# Under mingw paths are so confused this warning is not worthwhile
ifneq ($(findstring mingw, $(GNUSTEP_HOST_OS)), mingw)
ifeq ($(findstring $(SYS_TOOLS_PATH),$(PATH)),)
$(warning WARNING: Your PATH may not be set up correctly !)
$(warning Please try again after running ". $(GNUSTEP_MAKEFILES)/GNUstep.sh")
endif
endif
endif # code used when FOUNDATION_LIB != apple
endif # End of sanity checks run only at makelevel 0
#
# Get standard messages
#
@ -705,4 +652,46 @@ APP_EXTENSION = app
unexport GNUSTEP_INSTANCE
unexport GNUSTEP_TYPE
#
# Sanity checks - only performed at the first make invocation
#
# FIXME - the sanity checks should probably be removed and/or rewritten.
#
# Please note that _GNUSTEP_TOP_INVOCATION_DONE is set by the first
# time Master/rules.make is read, and propagated to sub-makes. So
# this check will pass only the very first time we parse this file,
# and if Master/rules.make have not yet been parsed.
ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
# Print out a message with our version number and how to get help on
# targets and options.
ifeq ($(MAKE_WITH_INFO_FUNCTION),yes)
$(info This is gnustep-make $(GNUSTEP_MAKE_VERSION). Type 'make print-gnustep-make-help' for help.)
endif
# Sanity check on $PATH - NB: if PATH is wrong, we can't do certain
# things because we can't run the tools (and we can't locate tools
# using opentool because we can't even run opentool if PATH is wrong)
# - this is particularly bad for gui stuff
# Skip the check if we are on an Apple system. I was told that you can't
# source GNUstep.sh before running Apple's PB and that the only
# friendly solution is to disable the check.
ifneq ($(FOUNDATION_LIB), apple)
# Under Win32 paths are so confused this warning is not worthwhile
ifneq ($(findstring mingw, $(GNUSTEP_HOST_OS)), mingw)
ifneq ($(findstring cygwin, $(GNUSTEP_HOST_OS)), cygwin)
ifeq ($(findstring $(GNUSTEP_SYSTEM_TOOLS),$(PATH)),)
$(warning WARNING: Your PATH may not be set up correctly !)
$(warning Please try again after running ". $(GNUSTEP_MAKEFILES)/GNUstep.sh")
endif
endif
endif
endif # code used when FOUNDATION_LIB != apple
endif # End of sanity checks run only at makelevel 0
endif # COMMON_MAKE_LOADED