mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Use ECHO_CREATING when automatically generating files
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16816 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
6966fceff0
commit
a8f68dcfff
7 changed files with 50 additions and 36 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
Tue May 27 11:36:06 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Instance/application.make: Use ECHO_CREATING when building the
|
||||
.plist files.
|
||||
* Instance/bundle.make: Same
|
||||
* Instance/framework.make: Same.
|
||||
* Instance/gswbundle.make: Same.
|
||||
* Instance/palette.make: Same.
|
||||
* Instance/service.make: Same.
|
||||
|
||||
* Instance/application.make: Use ECHO_CREATING when building the
|
||||
.desktop file.
|
||||
* Instance/framework.make ($(DUMMY_FRAMEWORK_FILE)): Use
|
||||
ECHO_CREATING when building the internal framework class file.
|
||||
|
||||
Tue May 27 11:22:44 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Instance/application.make: Use ECHO_CREATING when running MKDIRS
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ endif
|
|||
|
||||
ifeq ($(FOUNDATION_LIB), apple)
|
||||
$(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
if [ "$(APPLICATION_ICON)" != "" ]; then \
|
||||
|
|
@ -239,26 +239,26 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
|
|||
sed '1d' "$(GNUSTEP_INSTANCE)Info.plist"; \
|
||||
else \
|
||||
echo "}"; \
|
||||
fi) > $@
|
||||
fi) > $@$(END_ECHO)
|
||||
else
|
||||
|
||||
$(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
if [ "$(APPLICATION_ICON)" != "" ]; then \
|
||||
echo " NSIcon = \"$(APPLICATION_ICON)\";"; \
|
||||
fi; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
@if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
echo "}") >$@$(END_ECHO)
|
||||
$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
plmerge $@ "$(GNUSTEP_INSTANCE)Info.plist"; \
|
||||
fi
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
|
||||
$(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop: \
|
||||
$(APP_DIR_NAME)/Resources/Info-gnustep.plist
|
||||
@pl2link $^ $(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop
|
||||
$(ECHO_CREATING)pl2link $^ $(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop$(END_ECHO)
|
||||
|
||||
|
||||
internal-app-copy_into_dir:: shared-instance-bundle-copy_into_dir
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ $(BUNDLE_DIR_NAME)/Contents:
|
|||
ifneq ($(OBJ_FILES_TO_LINK),)
|
||||
$(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents \
|
||||
$(GNUSTEP_STAMP_DEPEND)
|
||||
@(echo "<?xml version='1.0' encoding='utf-8'?>";\
|
||||
$(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! -->";\
|
||||
echo "<plist version='0.9'>";\
|
||||
|
|
@ -218,11 +218,11 @@ $(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents \
|
|||
echo " <string>$(PRINCIPAL_CLASS)</string>";\
|
||||
echo " </dict>";\
|
||||
echo "</plist>";\
|
||||
) >$@
|
||||
) >$@$(END_ECHO)
|
||||
else
|
||||
$(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents \
|
||||
$(GNUSTEP_STAMP_DEPEND)
|
||||
@(echo "<?xml version='1.0' encoding='utf-8'?>";\
|
||||
$(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! -->";\
|
||||
echo "<plist version='0.9'>";\
|
||||
|
|
@ -233,7 +233,7 @@ $(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents \
|
|||
echo " <string>BNDL</string>";\
|
||||
echo " </dict>";\
|
||||
echo "</plist>";\
|
||||
) >$@
|
||||
) >$@$(END_ECHO)
|
||||
endif
|
||||
|
||||
else # following executed if FOUNDATION_LIB != apple
|
||||
|
|
@ -242,24 +242,24 @@ ifneq ($(OBJ_FILES_TO_LINK),)
|
|||
# GNUstep bundles
|
||||
$(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources \
|
||||
$(GNUSTEP_STAMP_DEPEND)
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)${BUNDLE_OBJ_EXT}\";"; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
@(if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
echo "}") >$@$(END_ECHO)
|
||||
$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
|
||||
fi)
|
||||
fi$(END_ECHO)
|
||||
else # following code for when no object file is built
|
||||
# GNUstep bundles
|
||||
$(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources \
|
||||
$(GNUSTEP_STAMP_DEPEND)
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
echo "}") >$@
|
||||
@(if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
echo "}") >$@$(END_ECHO)
|
||||
$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
|
||||
fi)
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
|
||||
endif # FOUNDATION_LIB != apple
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ OBJC_OBJ_FILES_TO_INSPECT = $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
|||
# for portability, so we are sure we only print what we want on all
|
||||
# platforms.
|
||||
$(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(OBJ_FILES_TO_LINK) GNUmakefile
|
||||
@ classes=""; \
|
||||
$(ECHO_CREATING) classes=""; \
|
||||
for f in $(OBJC_OBJ_FILES_TO_INSPECT) __dummy__; do \
|
||||
if [ "$$f" != "__dummy__" ]; then \
|
||||
sym=`nm -Pg $$f | sed -n -e '/^__objc_class_name_[A-Za-z_.]* [^U]/ {s/^__objc_class_name_\([A-Za-z_.]*\) [^U].*/\1/p;}'`; \
|
||||
|
|
@ -301,7 +301,6 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(OBJ_FILES_TO_LINK) GNUmakefile
|
|||
else \
|
||||
fw_path="@\"$$fw_path\""; \
|
||||
fi; \
|
||||
echo "Creating $(DUMMY_FRAMEWORK_FILE)"; \
|
||||
echo "#include <Foundation/NSString.h>" > $@; \
|
||||
echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
|
||||
echo "+ (NSString *)frameworkEnv;" >> $@; \
|
||||
|
|
@ -315,7 +314,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(OBJ_FILES_TO_LINK) GNUmakefile
|
|||
echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \
|
||||
echo "static NSString *allClasses[] = {$$classlist};" >> $@; \
|
||||
echo "+ (NSString **)frameworkClasses { return allClasses; }" >> $@;\
|
||||
echo "@end" >> $@
|
||||
echo "@end" >> $@$(END_ECHO)
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
$(DUMMY_FRAMEWORK_OBJ_FILE): $(DUMMY_FRAMEWORK_FILE)
|
||||
|
|
@ -375,22 +374,22 @@ MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUS
|
|||
|
||||
# MacOSX-S frameworks
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
echo "}") >$@$(END_ECHO)
|
||||
|
||||
# GNUstep frameworks
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
@if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
echo "}") >$@$(END_ECHO)
|
||||
$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
|
||||
fi
|
||||
fi$(END_ECHO)
|
||||
|
||||
ifneq ($(WITH_DLL),yes)
|
||||
|
||||
|
|
|
|||
|
|
@ -230,13 +230,13 @@ $(GSWBUNDLE_DIR_NAME)/bundle-info.plist: $(GSWBUNDLE_DIR_NAME)
|
|||
HAS_GSWCOMPONENTS = $($(GNUSTEP_INSTANCE)_HAS_GSWCOMPONENTS)
|
||||
|
||||
$(GSWBUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(GSWBUNDLE_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
if [ "$(HAS_GSWCOMPONENTS)" != "" ]; then \
|
||||
echo " HasGSWComponents = \"$(HAS_GSWCOMPONENTS)\";"; \
|
||||
fi; \
|
||||
echo "}") >$@
|
||||
echo "}") >$@$(END_ECHO)
|
||||
|
||||
$(GSWBUNDLE_DIR_NAME)/Resources:
|
||||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
|
|
|||
|
|
@ -97,24 +97,24 @@ endif
|
|||
|
||||
|
||||
$(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist: $(PALETTE_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
|
||||
cat $(GNUSTEP_INSTANCE)Info.plist; \
|
||||
fi; \
|
||||
echo "}") >$@
|
||||
echo "}") >$@$(END_ECHO)
|
||||
|
||||
MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE)))))
|
||||
|
||||
$(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources
|
||||
@(echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NibFile = \"$(MAIN_MODEL_FILE)\";"; \
|
||||
echo " Class = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo " Icon = \"$(PALETTE_ICON)\";"; \
|
||||
if [ -r "$(GNUSTEP_INSTANCE)palette.table" ]; then \
|
||||
cat $(GNUSTEP_INSTANCE)palette.table; \
|
||||
fi; \
|
||||
) >$@
|
||||
) >$@$(END_ECHO)
|
||||
|
||||
#
|
||||
# Install, clean targets
|
||||
|
|
|
|||
|
|
@ -88,12 +88,12 @@ endif
|
|||
|
||||
$(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist: \
|
||||
$(SERVICE_DIR_NAME)/Resources $(GNUSTEP_INSTANCE)Info.plist
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
cat $(GNUSTEP_INSTANCE)Info.plist; \
|
||||
echo "}") >$@ ;\
|
||||
if $(GNUSTEP_MAKE_SERVICES) --test $@; then : ; else rm -f $@; false; \
|
||||
fi
|
||||
fi$(END_ECHO)
|
||||
|
||||
#
|
||||
# Install targets
|
||||
|
|
|
|||
Loading…
Reference in a new issue