Added support for LOCALIZED_COMPONENTS

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13792 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-06-07 15:01:05 +00:00
parent 2484244723
commit cef09094e4
2 changed files with 31 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Fri Jun 7 13:39:37 2002 Nicola Pero <n.pero@mi.flashnet.it>
Patch by Manuel Guesdom <ml@sbuilders.com>:
* Instance/Shared/bundle.make (LOCALIZED_COMPONENTS): New
variable.
(shared-instance-bundle-all): Install LOCALIZED_COMPONENTS.
2002-06-06 Adam Fedor <fedor@gnu.org>
* Documentation/machines.texi: Update

View file

@ -61,7 +61,11 @@
#
# $(GNUSTEP_INSTANCE)_COMPONENTS : a list of directories which are
# recursively copied (/locally symlinked if symlinks are available)
# into the resource bundle. <FIXME - not sure this will be kept>
# into the resource bundle.
#
# $(GNUSTEP_INSTANCE)_LOCALIZED_COMPONENTS : a list of localized
# directories which are recursively copied (/locally symlinked if
# symlinks are available) into the resource bundle.
#
# $(GNUSTEP_INSTANCE)_SUBPROJECTS : the list of subprojects is used
# because the resources from each subproject are merged into the bundle
@ -99,6 +103,7 @@ RESOURCE_DIRS = $(strip $($(GNUSTEP_INSTANCE)_RESOURCE_DIRS))
LANGUAGES = $(strip $($(GNUSTEP_INSTANCE)_LANGUAGES))
LOCALIZED_RESOURCE_FILES = $(strip $($(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_FILES))
COMPONENTS = $(strip $($(GNUSTEP_INSTANCE)_COMPONENTS))
LOCALIZED_COMPONENTS = $(strip $($(GNUSTEP_INSTANCE)_LOCALIZED_COMPONENTS))
# NB: Use _SUBPROJECTS, not SUBPROJECTS here as that might conflict
# with what is used in aggregate.make.
@ -184,6 +189,24 @@ ifneq ($(COMPONENTS),)
fi; \
done)
endif
ifneq ($(LOCALIZED_COMPONENTS),)
@(echo "Copying localized components into the $(GNUSTEP_TYPE) wrapper..."; \
for l in $(LANGUAGES); do \
if [ -d $$l.lproj ]; then \
$(MKDIRS) $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
for component in $(LOCALIZED_COMPONENTS); do \
if [ -d $$l.lproj/$$component ]; then \
cp -r $$l.lproj/$$component \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
else \
echo "Warning: $$l.lproj/$$component not found - ignoring"; \
fi; \
done; \
else \
echo "Warning: $$l.lproj not found - ignoring"; \
fi; \
done)
endif
ifneq ($(_SUBPROJECTS),)
@(echo "Copying resources from subprojects into the $(GNUSTEP_TYPE) wrapper..."; \
for subproject in $(_SUBPROJECTS); do \