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

Fix for a race condition when building tools with resources

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@33394 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-06-27 14:27:50 +00:00
parent 9c35c51d04
commit 8bb4ff86cc
2 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-06-27 Nicola Pero <nicola.pero@meta-innovation.com>
Fix for a race condition during parallel builds of tools with
resources.
* Master/tool.make (MAYBE_GNUSTEP_BUILD_DIR_RESOURCES): New.
($(GNUSTEP_BUILD_DIR)/Resources): New rule.
(internal-all): Depend on MAYBE_GNUSTEP_BUILD_DIR_RESOURCES.
2011-06-26 Wolfgang Lux <wolfgang.lux@gmail.com>
* Instance/framework.make (FRAMEWORK_LIBRARY_FILE): Get names of

46
Master/tool.make
View file

@ -26,10 +26,31 @@ endif
TOOL_NAME := $(strip $(TOOL_NAME))
# We need to create/delete the GNUSTEP_BUILD_DIR/Resources directory
# in the Master invocation stage, to prevent different tools, built in
# parallel, from trying to create it concurrently and causing race
# conditions. But, if no tool has a resource bundle, we don't create
# or delete the directory at all. ;-)
TOOLS_WITH_RESOURCE_BUNDLES = $(strip $(foreach tool,$(TOOL_NAME),$($(tool)_HAS_RESOURCE_BUNDLE:yes=$(tool))))
ifneq ($(TOOLS_WITH_RESOURCE_BUNDLES),)
MAYBE_GNUSTEP_BUILD_DIR_RESOURCES = $(GNUSTEP_BUILD_DIR)/Resources
$(GNUSTEP_BUILD_DIR)/Resources:
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
# On distclean, we want to efficiently wipe out the Resources/
# directory.
internal-clean::
rm -rf $(GNUSTEP_BUILD_DIR)/Resources
else
MAYBE_GNUSTEP_BUILD_DIR_RESOURCES =
endif
ifeq ($(GNUSTEP_MAKE_PARALLEL_BUILDING), no)
# Standard building
internal-all:: $(GNUSTEP_OBJ_DIR) $(TOOL_NAME:=.all.tool.variables)
internal-all:: $(GNUSTEP_OBJ_DIR) $(MAYBE_GNUSTEP_BUILD_DIR_RESOURCES) $(TOOL_NAME:=.all.tool.variables)
else
@ -39,13 +60,14 @@ else
# parallel. This is great as the entire building (including the
# linking) of the tools is then parallelized.
# Please note that we need to create the ./obj directory before we
# fire off all the parallel sub-makes, else they'll be a race
# condition to create it. (typically what happens is that two
# sub-makes detect that it needs creating, the first one creates it,
# and when the second one tries to create it, it will fail as it's
# Please note that we need to create the ./obj directory (and the
# GNUSTEP_BUILD_DIR/Resources directory if any tool has a resource
# bundle) before we fire off all the parallel sub-makes, else they'll
# be a race condition to create it. (typically what happens is that
# two sub-makes detect that it needs creating, the first one creates
# it, and when the second one tries to create it, it will fail as it's
# already been created).
internal-all:: $(GNUSTEP_OBJ_DIR)
internal-all:: $(GNUSTEP_OBJ_DIR) $(MAYBE_GNUSTEP_BUILD_DIR_RESOURCES)
$(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
internal-master-tool-all \
GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \
@ -80,16 +102,6 @@ internal-clean:: $(TOOLS_WITH_SUBPROJECTS:=.clean.tool.subprojects)
internal-distclean:: $(TOOLS_WITH_SUBPROJECTS:=.distclean.tool.subprojects)
endif
# On distclean, we also want to efficiently wipe out the Resources/
# directory if (and only if) there are tools for which
# xxx_HAS_RESOURCE_BUNDLE=yes
TOOLS_WITH_RESOURCE_BUNDLES = $(strip $(foreach tool,$(TOOL_NAME),$($(tool)_HAS_RESOURCE_BUNDLE:yes=$(tool))))
ifneq ($(TOOLS_WITH_RESOURCE_BUNDLES),)
internal-clean::
rm -rf $(GNUSTEP_BUILD_DIR)/Resources
endif
# TODO: It should be really safe to parallelize the 'strings' targets,
# but it's worth checking to make sure we're not breaking anything.
internal-strings:: $(TOOL_NAME:=.strings.tool.variables)