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

Fixed spurious rebuilds of Info-gnustep.plist and Info.plist (likely cause of troubles with plmerge during make install for many users)

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26565 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-05-24 14:47:33 +00:00
parent b18a3e4929
commit 6a77b9b41c
3 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,15 @@
2008-05-24 Nicola Pero <nicola.pero@meta-innovation.com>
Fixed occasional spurious rebuilds of Info-gnustep.plist and
Info.plist files.
* Instance/bundle.make (build-bundle): Swapped the order of the
shared-instance-bundle-all and $(BUNDLE_INFO_PLIST_FILE)
dependencies.
(Info.plist, Info-gnustep.plist): Do not depend on building the
directory containing the plist file first.
* Instance/framework.make (Info.plist, Info-gnustep.plist): Do not
depend on creating the directory containing the plist file first.
2008-05-24 Nicola Pero <nicola.pero@meta-innovation.com>
* messages.make (ECHO_UPDATING_VERSION_SYMLINK): Added definition
@ -10,7 +22,6 @@
Fixed occasional spurious rebuilds of framework headers; improved
display of messages when building framework headers.
* Instance/framework.make (internal-framework-build-headers):
Depend on $(FRAMEWORK_VERSION_DIR)/Headers.
($(FRAMEWORK_VERSION_DIR)/Headers/%.h): Do not depend on

27
Instance/bundle.make
View file

@ -146,17 +146,18 @@ ifneq ($(OBJ_FILES_TO_LINK),)
ifneq ($(FOUNDATION_LIB),apple)
build-bundle: $(BUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
shared-instance-bundle-all \
$(BUNDLE_INFO_PLIST_FILE)
else
build-bundle: $(BUNDLE_DIR)/Contents/MacOS \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
shared-instance-bundle-all \
$(BUNDLE_INFO_PLIST_FILE)
endif
# The rule to build $(BUNDLE_DIR)/Resources is already provided
# by Instance/Shared/bundle.make
# The rule to build $(BUNDLE_DIR)/Resources (ie,
# $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH) is already provided by
# Instance/Shared/bundle.make
$(BUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
@ -173,7 +174,7 @@ endif
else
# Following code for the case OBJ_FILES_TO_LINK is empty - bundle with
# no shared object in it.
build-bundle: $(BUNDLE_INFO_PLIST_FILE) shared-instance-bundle-all
build-bundle: shared-instance-bundle-all $(BUNDLE_INFO_PLIST_FILE)
endif # OBJ_FILES_TO_LINK
MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE)))))
@ -217,8 +218,7 @@ $(BUNDLE_DIR)/Contents/MacOS:
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
ifneq ($(OBJ_FILES_TO_LINK),)
$(BUNDLE_DIR)/Contents/Info.plist: $(BUNDLE_DIR)/Contents \
$(GNUSTEP_STAMP_DEPEND)
$(BUNDLE_DIR)/Contents/Info.plist: $(GNUSTEP_STAMP_DEPEND)
$(ECHO_CREATING)(echo "<?xml version='1.0' encoding='utf-8'?>";\
echo "<!DOCTYPE plist SYSTEM 'file://localhost/System/Library/DTDs/PropertyList.dtd'>";\
echo "<!-- Automatically generated, do not edit! -->";\
@ -236,8 +236,7 @@ $(BUNDLE_DIR)/Contents/Info.plist: $(BUNDLE_DIR)/Contents \
echo "</plist>";\
) >$@$(END_ECHO)
else
$(BUNDLE_DIR)/Contents/Info.plist: $(BUNDLE_DIR)/Contents \
$(GNUSTEP_STAMP_DEPEND)
$(BUNDLE_DIR)/Contents/Info.plist: $(GNUSTEP_STAMP_DEPEND)
$(ECHO_CREATING)(echo "<?xml version='1.0' encoding='utf-8'?>";\
echo "<!DOCTYPE plist SYSTEM 'file://localhost/System/Library/DTDs/PropertyList.dtd'>";\
echo "<!-- Automatically generated, do not edit! -->";\
@ -259,8 +258,7 @@ GNUSTEP_PLIST_DEPEND = $(wildcard $(GNUSTEP_INSTANCE)Info.plist)
ifneq ($(OBJ_FILES_TO_LINK),)
# GNUstep bundles
$(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_DIR)/Resources \
$(GNUSTEP_STAMP_DEPEND) \
$(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(GNUSTEP_STAMP_DEPEND) \
$(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)$(BUNDLE_OBJ_EXT)\";"; \
@ -272,8 +270,7 @@ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_DIR)/Resources \
fi$(END_ECHO)
else # following code for when no object file is built
# GNUstep bundles
$(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_DIR)/Resources \
$(GNUSTEP_STAMP_DEPEND) \
$(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(GNUSTEP_STAMP_DEPEND) \
$(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \

3
Instance/framework.make
View file

@ -569,7 +569,7 @@ MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUS
# FIXME: MacOSX frameworks should also merge xxxInfo.plist into them
# MacOSX-S frameworks
$(FRAMEWORK_VERSION_DIR)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR)/Resources
$(FRAMEWORK_VERSION_DIR)/Resources/Info.plist:
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
@ -581,7 +581,6 @@ GNUSTEP_PLIST_DEPEND = $(wildcard $(GNUSTEP_INSTANCE)Info.plist)
# GNUstep frameworks
$(FRAMEWORK_VERSION_DIR)/Resources/Info-gnustep.plist: \
$(FRAMEWORK_VERSION_DIR)/Resources \
$(DUMMY_FRAMEWORK_FILE) \
$(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \