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

Added support for xxx_MAIN_MARKUP_FILE

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17379 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2003-07-28 10:47:14 +00:00
parent 73b3070165
commit 9abaa2ed17
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Jul 28 11:49:18 2003 Pete French <pete@twisted.org.uk>
* Instance/application.make (MAIN_MARKUP_FILE): New variable.
* Instance/application.make (GNUSTEP_STAMP_STRING): Include
MAIN_MARKUP_FILE in the stamp string.
* Instance/application.make ($(APP_INFO_PLIST_FILE)): Set
GSMarkupMainFile to MAIN_MARKUP_FILE in the info dictionary.
Mon Jul 28 10:59:21 2003 Pete French <pete@twisted.org.uk>
* rules.make (%.plist): Filter the result through sed to drop #pragma

14
Instance/application.make
View file

@ -160,13 +160,15 @@ APPLICATION_ICON = $($(GNUSTEP_INSTANCE)_APPLICATION_ICON)
MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE)))))
MAIN_MARKUP_FILE = $(strip $(subst .gsmarkup,,$($(GNUSTEP_INSTANCE)_MAIN_MARKUP_FILE)))
# We must recreate Info.plist if PRINCIPAL_CLASS and/or
# APPLICATION_ICON and/or MAIN_MODEL_FILE has changed since last time
# we built Info.plist. We use stamp-string.make, which will store the
# variables in a stamp file inside GNUSTEP_STAMP_DIR, and rebuild
# Info.plist iff GNUSTEP_STAMP_STRING changes.
GNUSTEP_STAMP_STRING = $(PRINCIPAL_CLASS)-$(APPLICATION_ICON)-$(MAIN_MODEL_FILE)
# APPLICATION_ICON and/or MAIN_MODEL_FILE and/or MAIN_MARKUP_FILE has
# changed since last time we built Info.plist. We use
# stamp-string.make, which will store the variables in a stamp file
# inside GNUSTEP_STAMP_DIR, and rebuild Info.plist iff
# GNUSTEP_STAMP_STRING changes.
GNUSTEP_STAMP_STRING = $(PRINCIPAL_CLASS)-$(APPLICATION_ICON)-$(MAIN_MODEL_FILE)-$(MAIN_MARKUP_FILE)
GNUSTEP_STAMP_DIR = $(APP_DIR_NAME)
ifneq ($(FOUNDATION_LIB), apple)
@ -231,6 +233,7 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " GSMainMarkupFile = \"$(MAIN_MARKUP_FILE)\";"; \
if [ "$(APPLICATION_ICON)" != "" ]; then \
echo " CFBundleIconFile = \"$(APPLICATION_ICON)\";"; \
fi; \
@ -246,6 +249,7 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " GSMainMarkupFile = \"$(MAIN_MARKUP_FILE)\";"; \
if [ "$(APPLICATION_ICON)" != "" ]; then \
echo " NSIcon = \"$(APPLICATION_ICON)\";"; \
fi; \