mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Try to warn users when they create Info-gnustep.plist as it will be overwritten
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28790 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
c4f086d4b6
commit
991c74d2ea
7 changed files with 94 additions and 3 deletions
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
2009-10-10 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Try to warn users if they create their own Info-gnustep.plist file
|
||||
instead of providing an xxxInfo.plist file.
|
||||
* Instance/application.make (internal-app-all_): If
|
||||
Info-gnustep.plist is specified in xxx_RESOURCE_FILES, print a
|
||||
warning recommending to use xxxInfo.plist instead.
|
||||
* Instance/bundle.make (internal-bundle-all_): Same change.
|
||||
* Instance/framework.make (internal-framework-all_): Same change.
|
||||
* Instance/palette.make (internal-palette-all_): Same change.
|
||||
* Instance/service.make (internal-service-all_): Same change.
|
||||
* messages.make: Added new warning messages.
|
||||
|
||||
* Instance/application.make ($(GNUSTEP_INSTANCE).desktop): Do not
|
||||
attempt to create this file on Apple.
|
||||
|
||||
2009-10-09 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Implemented batch-compilation of Java files (ie, all files built
|
||||
|
|
|
|||
|
|
@ -159,6 +159,13 @@ internal-app-all_:: $(GNUSTEP_OBJ_DIR) \
|
|||
internal-app-run-compile-submake \
|
||||
shared-instance-bundle-all \
|
||||
$(APP_INFO_PLIST_FILE)
|
||||
# If they specified Info.plist in the xxx_RESOURCE_FILES, print a
|
||||
# warning. They are supposed to provide a xxxInfo.plist which gets
|
||||
# merged with the automatically generated entries to generate
|
||||
# Info.plist.
|
||||
ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_PLIST)
|
||||
endif
|
||||
|
||||
$(APP_DIR)/Contents/MacOS:
|
||||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
|
@ -173,6 +180,13 @@ internal-app-all_:: $(GNUSTEP_OBJ_DIR) \
|
|||
$(APP_INFO_PLIST_FILE) \
|
||||
$(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop \
|
||||
shared-instance-bundle-all
|
||||
# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES,
|
||||
# print a warning. They are supposed to provide a xxxInfo.plist which
|
||||
# gets merged with the automatically generated entries to generate
|
||||
# Info-gnustep.plist.
|
||||
ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_GNUSTEP_PLIST)
|
||||
endif
|
||||
|
||||
$(APP_DIR)/$(GNUSTEP_TARGET_LDIR):
|
||||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
|
@ -303,12 +317,11 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
|
|||
-$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
plmerge $@ "$(GNUSTEP_INSTANCE)Info.plist"; \
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
|
||||
$(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop: \
|
||||
$(APP_DIR)/Resources/Info-gnustep.plist
|
||||
$(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop: $(APP_INFO_PLIST_FILE)
|
||||
$(ECHO_CREATING)pl2link $^ $(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop$(END_ECHO)
|
||||
|
||||
endif
|
||||
|
||||
internal-app-copy_into_dir:: shared-instance-bundle-copy_into_dir
|
||||
|
||||
|
|
|
|||
|
|
@ -108,6 +108,19 @@ endif # OBJ_FILES_TO_LINK
|
|||
#
|
||||
|
||||
internal-bundle-all_:: $(GNUSTEP_OBJ_DIR) build-bundle
|
||||
# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES,
|
||||
# print a warning. They are supposed to provide a xxxInfo.plist which
|
||||
# gets merged with the automatically generated entries to generate
|
||||
# Info-gnustep.plist.
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_GNUSTEP_PLIST)
|
||||
endif
|
||||
else
|
||||
ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_PLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
BUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(BUNDLE_EXTENSION))
|
||||
BUNDLE_DIR = $(GNUSTEP_BUILD_DIR)/$(BUNDLE_DIR_NAME)
|
||||
|
|
|
|||
|
|
@ -332,6 +332,19 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
|||
|
||||
internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
build-framework
|
||||
# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES,
|
||||
# print a warning. They are supposed to provide a xxxInfo.plist which
|
||||
# gets merged with the automatically generated entries to generate
|
||||
# Info-gnustep.plist.
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_GNUSTEP_PLIST)
|
||||
endif
|
||||
else
|
||||
ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_PLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
internal-framework-build-headers:: $(FRAMEWORK_VERSION_DIR)/Headers \
|
||||
$(FRAMEWORK_HEADER_FILES) \
|
||||
|
|
|
|||
|
|
@ -96,6 +96,19 @@ internal-palette-all_:: $(GNUSTEP_OBJ_DIR) \
|
|||
$(PALETTE_DIR)/Resources/Info-gnustep.plist \
|
||||
$(PALETTE_DIR)/Resources/palette.table \
|
||||
shared-instance-bundle-all
|
||||
# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES,
|
||||
# print a warning. They are supposed to provide a xxxInfo.plist which
|
||||
# gets merged with the automatically generated entries to generate
|
||||
# Info-gnustep.plist.
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_GNUSTEP_PLIST)
|
||||
endif
|
||||
else
|
||||
ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_PLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(PALETTE_DIR)/$(GNUSTEP_TARGET_LDIR):
|
||||
$(ECHO_CREATING)$(MKDIRS) $(PALETTE_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
|
||||
|
|
|
|||
|
|
@ -80,6 +80,19 @@ internal-service-all_:: $(GNUSTEP_OBJ_DIR) \
|
|||
internal-service-run-compile-submake \
|
||||
$(SERVICE_DIR)/Resources/Info-gnustep.plist \
|
||||
shared-instance-bundle-all
|
||||
# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES,
|
||||
# print a warning. They are supposed to provide a xxxInfo.plist which
|
||||
# gets merged with the automatically generated entries to generate
|
||||
# Info-gnustep.plist.
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_GNUSTEP_PLIST)
|
||||
endif
|
||||
else
|
||||
ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),)
|
||||
$(WARNING_INFO_PLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKE_PARALLEL_BUILDING), no)
|
||||
# Standard building
|
||||
|
|
|
|||
|
|
@ -150,3 +150,13 @@ WARNING_EMPTY_LINKING = @(echo " Warning! No files to link. Please check your GN
|
|||
|
||||
# Instance/bundle.make
|
||||
NOTICE_EMPTY_LINKING = @(echo " Notice: No files to link - creating a bundle with no object file and only resources")
|
||||
|
||||
# Instance/application.make, Instance/bundle.make, Instance/framework.make
|
||||
WARNING_INFO_GNUSTEP_PLIST = @(echo "Warning! You have specified Info-gnustep.plist in $(GNUSTEP_INSTANCE)_RESOURCE_FILES"; \
|
||||
echo " Unfortunately, it will not work because Info-gnustep.plist is automatically generated."; \
|
||||
echo " To customize Info-gnustep.plist, please create a $(GNUSTEP_INSTANCE)Info.plist file with your custom entries."; \
|
||||
echo " $(GNUSTEP_INSTANCE)Info.plist will be automatically merged into Info-gnustep.plist.")
|
||||
WARNING_INFO_PLIST = @(echo "Warning! You have specified Info.plist in $(GNUSTEP_INSTANCE)_RESOURCE_FILES"; \
|
||||
echo " Unfortunately, it will not work because Info.plist is automatically generated."; \
|
||||
echo " To customize Info.plist, please create a $(GNUSTEP_INSTANCE)Info.plist file with your custom entries."; \
|
||||
echo " $(GNUSTEP_INSTANCE)Info.plist will be automatically merged into Info.plist.")
|
||||
|
|
|
|||
Loading…
Reference in a new issue