gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-06-02 02:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shortened names of variables used to pass parameters to Shared/bundle.make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14565 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-09-25 23:52:09 +00:00
parent 2698dcdf37
commit a70f1a8f93
7 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Instance/Shared/bundle.make
View file

@ -25,7 +25,7 @@
# #
# #
# GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH : the path to the # GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH : the path to the
# local resource bundle (this might be a subdirectory of the actual # local resource bundle (this might be a subdirectory of the actual
# bundle directory). Resource files will be copied into this path. # bundle directory). Resource files will be copied into this path.
# For example, for a normal bundle it would be # For example, for a normal bundle it would be
@ -34,12 +34,12 @@
# Resources/$(GNUSTEP_INSTANCE). This variable is used during build, # Resources/$(GNUSTEP_INSTANCE). This variable is used during build,
# to copy the resources in place. # to copy the resources in place.
# #
# GNUSTEP_SHARED_INSTANCE_BUNDLE_MAIN_PATH : the path to the top # GNUSTEP_SHARED_BUNDLE_MAIN_PATH : the path to the top
# level bundle directory to install. For example, for a normal # level bundle directory to install. For example, for a normal
# bundle it would be $(BUNDLE_DIR); for an application it would be # bundle it would be $(BUNDLE_DIR); for an application it would be
# $(APP_DIR); for a library or a tool, Resources/$(GNUSTEP_INSTANCE). # $(APP_DIR); for a library or a tool, Resources/$(GNUSTEP_INSTANCE).
# #
# GNUSTEP_SHARED_INSTANCE_BUNDLE_PRESERVE_LINK_PATH : the path # GNUSTEP_SHARED_BUNDLE_PRESERVE_LINK_PATH : the path
# to a symlink to preserve when installing. Normally symlinks are # to a symlink to preserve when installing. Normally symlinks are
# dereferenced, but we have support to preserve a single symlink. # dereferenced, but we have support to preserve a single symlink.
# This is used when building bundles on MacOSX. If not set, it's # This is used when building bundles on MacOSX. If not set, it's
@ -73,7 +73,7 @@
# $(GNUSTEP_INSTANCE)_SUBPROJECTS : the list of subprojects is used # $(GNUSTEP_INSTANCE)_SUBPROJECTS : the list of subprojects is used
# because the resources from each subproject are merged into the bundle # because the resources from each subproject are merged into the bundle
# resources (by recursively copying from LLL/Resources/Subproject into # resources (by recursively copying from LLL/Resources/Subproject into
# the GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH, where $(LLL) is the # the GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH, where $(LLL) is the
# subproject name. # subproject name.
# #
# GNUSTEP_TYPE : used when printing the message 'Copying resources into # GNUSTEP_TYPE : used when printing the message 'Copying resources into
@ -102,7 +102,7 @@
# #
# shared-instance-bundle-all # shared-instance-bundle-all
# #
# $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH): Creates the bundle # $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH): Creates the bundle
# resource path (invoked automatically) # resource path (invoked automatically)
# #
@ -128,7 +128,7 @@ shared-instance-bundle-all-gsweb
ifneq ($(RESOURCE_DIRS),) ifneq ($(RESOURCE_DIRS),)
FULL_RESOURCE_DIRS = \ FULL_RESOURCE_DIRS = \
$(foreach d, $(RESOURCE_DIRS), $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$(d)) $(foreach d, $(RESOURCE_DIRS), $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$(d))
endif endif
@ -136,7 +136,7 @@ ifeq ($(LANGUAGES),)
LANGUAGES = English LANGUAGES = English
endif endif
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH): $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH):
$(MKDIRS) $@ $(MKDIRS) $@
$(FULL_RESOURCE_DIRS): $(FULL_RESOURCE_DIRS):
@ -165,13 +165,13 @@ $(FULL_RESOURCE_DIRS):
# $$subproject/Resources/Subproject/* the * expands to itself. So we # $$subproject/Resources/Subproject/* the * expands to itself. So we
# check if that is true before trying to copy. # check if that is true before trying to copy.
shared-instance-bundle-all: $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH) \ shared-instance-bundle-all: $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH) \
$(FULL_RESOURCE_DIRS) \ $(FULL_RESOURCE_DIRS) \
shared-instance-bundle-all-gsweb shared-instance-bundle-all-gsweb
ifneq ($(RESOURCE_FILES),) ifneq ($(RESOURCE_FILES),)
$(ECHO_COPYING_RESOURCES)for f in $(RESOURCE_FILES); do \ $(ECHO_COPYING_RESOURCES)for f in $(RESOURCE_FILES); do \
if [ -f $$f -o -d $$f ]; then \ if [ -f $$f -o -d $$f ]; then \
cp -r $$f $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH); \ cp -r $$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH); \
else \ else \
echo "Warning: $$f not found - ignoring"; \ echo "Warning: $$f not found - ignoring"; \
fi; \ fi; \
@ -180,9 +180,9 @@ endif
ifneq ($(LOCALIZED_RESOURCE_DIRS),) ifneq ($(LOCALIZED_RESOURCE_DIRS),)
$(ECHO_CREATING_LOC_RESOURCE_DIRS)for l in $(LANGUAGES); do \ $(ECHO_CREATING_LOC_RESOURCE_DIRS)for l in $(LANGUAGES); do \
if [ -d $$l.lproj ]; then \ if [ -d $$l.lproj ]; then \
$(MKDIRS) $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj; \ $(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
for f in $(LOCALIZED_RESOURCE_DIRS); do \ for f in $(LOCALIZED_RESOURCE_DIRS); do \
$(MKDIRS) $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj/$$f; \ $(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj/$$f; \
done; \ done; \
else \ else \
echo "Warning: $$l.lproj not found - ignoring"; \ echo "Warning: $$l.lproj not found - ignoring"; \
@ -192,11 +192,11 @@ endif
ifneq ($(LOCALIZED_RESOURCE_FILES),) ifneq ($(LOCALIZED_RESOURCE_FILES),)
$(ECHO_COPYING_LOC_RESOURCES)for l in $(LANGUAGES); do \ $(ECHO_COPYING_LOC_RESOURCES)for l in $(LANGUAGES); do \
if [ -d $$l.lproj ]; then \ if [ -d $$l.lproj ]; then \
$(MKDIRS) $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj; \ $(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
for f in $(LOCALIZED_RESOURCE_FILES); do \ for f in $(LOCALIZED_RESOURCE_FILES); do \
if [ -f $$l.lproj/$$f -o -d $$l.lproj/$$f ]; then \ if [ -f $$l.lproj/$$f -o -d $$l.lproj/$$f ]; then \
cp -r $$l.lproj/$$f \ cp -r $$l.lproj/$$f \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/$$l.lproj; \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
else \ else \
echo "Warning: $$l.lproj/$$f not found - ignoring"; \ echo "Warning: $$l.lproj/$$f not found - ignoring"; \
fi; \ fi; \
@ -211,7 +211,7 @@ ifneq ($(_SUBPROJECTS),)
if [ -d $$subproject/Resources/Subproject ]; then \ if [ -d $$subproject/Resources/Subproject ]; then \
for f in $$subproject/Resources/Subproject/*; do \ for f in $$subproject/Resources/Subproject/*; do \
if [ $$f != $$subproject'/Resources/Subproject/*' ]; then \ if [ $$f != $$subproject'/Resources/Subproject/*' ]; then \
cp -r $$f $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/; \ cp -r $$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/; \
fi; \ fi; \
done; \ done; \
fi; \ fi; \
@ -244,7 +244,7 @@ WEBSERVER_LOCALIZED_RESOURCE_DIRS = \
ifneq ($(WEBSERVER_RESOURCE_DIRS),) ifneq ($(WEBSERVER_RESOURCE_DIRS),)
WEBSERVER_FULL_RESOURCE_DIRS = \ WEBSERVER_FULL_RESOURCE_DIRS = \
$(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$(d)) $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$(d))
$(WEBSERVER_FULL_RESOURCE_DIRS): $(WEBSERVER_FULL_RESOURCE_DIRS):
$(MKDIRS) $@ $(MKDIRS) $@
@ -260,17 +260,17 @@ shared-instance-bundle-all-gsweb: shared-instance-bundle-all-webresources \
ifneq ($(WEBSERVER_RESOURCE_FILES),) ifneq ($(WEBSERVER_RESOURCE_FILES),)
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer: $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer:
$(MKDIRS) $@ $(MKDIRS) $@
shared-instance-bundle-all-webresources: \ shared-instance-bundle-all-webresources: \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer \
$(WEBSERVER_FULL_RESOURCE_DIRS) $(WEBSERVER_FULL_RESOURCE_DIRS)
$(ECHO_COPYING_WEBSERVER_RESOURCES)for f in $(WEBSERVER_RESOURCE_FILES); do \ $(ECHO_COPYING_WEBSERVER_RESOURCES)for f in $(WEBSERVER_RESOURCE_FILES); do \
if [ -f ./WebServerResources/$$f \ if [ -f ./WebServerResources/$$f \
-o -d ./WebServerResources/$$f ]; then \ -o -d ./WebServerResources/$$f ]; then \
cp -r ./WebServerResources/$$f \ cp -r ./WebServerResources/$$f \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$$f; \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$$f; \
else \ else \
echo "Warning: WebServerResources/$$f not found - ignoring"; \ echo "Warning: WebServerResources/$$f not found - ignoring"; \
fi; \ fi; \
@ -288,10 +288,10 @@ ifneq ($(WEBSERVER_LOCALIZED_RESOURCE_DIRS),)
$(ECHO_CREATING_WEBSERVER_LOC_RESOURCE_DIRS)for l in $(LANGUAGES); do \ $(ECHO_CREATING_WEBSERVER_LOC_RESOURCE_DIRS)for l in $(LANGUAGES); do \
if [ -d ./WebServerResources/$$l.lproj ]; then \ if [ -d ./WebServerResources/$$l.lproj ]; then \
$(MKDIRS) \ $(MKDIRS) \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj; \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj; \
for f in $(WEBSERVER_LOCALIZED_RESOURCE_DIRS); do \ for f in $(WEBSERVER_LOCALIZED_RESOURCE_DIRS); do \
$(MKDIRS) \ $(MKDIRS) \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj/$$f; \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj/$$f; \
done; \ done; \
else \ else \
echo "Warning: WebServer/$$l.lproj not found - ignoring"; \ echo "Warning: WebServer/$$l.lproj not found - ignoring"; \
@ -302,12 +302,12 @@ ifneq ($(WEBSERVER_LOCALIZED_RESOURCE_FILES)
$(ECHO_COPYING_WEBSERVER_LOC_RESOURCES)for l in $(LANGUAGES); do \ $(ECHO_COPYING_WEBSERVER_LOC_RESOURCES)for l in $(LANGUAGES); do \
if [ -d ./WebServerResources/$$l.lproj ]; then \ if [ -d ./WebServerResources/$$l.lproj ]; then \
$(MKDIRS) \ $(MKDIRS) \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj;\ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj;\
for f in $(WEBSERVER_LOCALIZED_RESOURCE_FILES); do \ for f in $(WEBSERVER_LOCALIZED_RESOURCE_FILES); do \
if [ -f ./WebServerResources/$$l.lproj/$$f \ if [ -f ./WebServerResources/$$l.lproj/$$f \
-o -d ./WebServerResources/$$l.lproj/$$f ]; then \ -o -d ./WebServerResources/$$l.lproj/$$f ]; then \
cp -r ./WebServerResources/$$l.lproj/$$f \ cp -r ./WebServerResources/$$l.lproj/$$f \
$(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj/$$f; \ $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/WebServer/$$l.lproj/$$f; \
else \ else \
echo "Warning: WebServerResources/$$l.lproj/$$f not found - ignoring"; \ echo "Warning: WebServerResources/$$l.lproj/$$f not found - ignoring"; \
fi; \ fi; \

2
Instance/application.make
View file

@ -59,7 +59,7 @@ ALL_GUI_LIBS = \
APP_DIR_NAME = $(GNUSTEP_INSTANCE:=.$(APP_EXTENSION)) APP_DIR_NAME = $(GNUSTEP_INSTANCE:=.$(APP_EXTENSION))
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(APP_DIR_NAME)/Resources GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(APP_DIR_NAME)/Resources
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
# Support building NeXT applications # Support building NeXT applications

2
Instance/bundle.make
View file

@ -89,7 +89,7 @@ internal-bundle-all_:: $(GNUSTEP_OBJ_DIR) \
BUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(BUNDLE_EXTENSION)) BUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(BUNDLE_EXTENSION))
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(BUNDLE_DIR_NAME)/Resources GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(BUNDLE_DIR_NAME)/Resources
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
ifneq ($(OBJ_FILES_TO_LINK),) ifneq ($(OBJ_FILES_TO_LINK),)

2
Instance/framework.make
View file

@ -109,7 +109,7 @@ ifeq ($(WITH_DLL),yes)
FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT) FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT)
endif # WITH_DLL endif # WITH_DLL
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(FRAMEWORK_VERSION_DIR_NAME)/Resources GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(FRAMEWORK_VERSION_DIR_NAME)/Resources
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \ internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \

2
Instance/palette.make
View file

@ -59,7 +59,7 @@ PALETTE_DIR_NAME = $(GNUSTEP_INSTANCE).palette
PALETTE_FILE = $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME) PALETTE_FILE = $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME)
# Copy any resources into $(PALETTE_DIR_NAME)/Resources # Copy any resources into $(PALETTE_DIR_NAME)/Resources
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(PALETTE_DIR_NAME)/Resources GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(PALETTE_DIR_NAME)/Resources
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
internal-palette-all_:: $(GNUSTEP_OBJ_DIR) \ internal-palette-all_:: $(GNUSTEP_OBJ_DIR) \

2
Instance/service.make
View file

@ -61,7 +61,7 @@ SERVICE_DIR_NAME = $(GNUSTEP_INSTANCE:=.service)
SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)
# Copy any resources into $(SERVICE_DIR_NAME)/Resources # Copy any resources into $(SERVICE_DIR_NAME)/Resources
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(SERVICE_DIR_NAME)/Resources GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(SERVICE_DIR_NAME)/Resources
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
# #

2
Instance/subproject.make
View file

@ -35,7 +35,7 @@ endif
# (that is done automatically if the project uses # (that is done automatically if the project uses
# Instance/Shared/bundle.make to manage its own resource bundle) # Instance/Shared/bundle.make to manage its own resource bundle)
# #
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = Resources/Subproject GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = Resources/Subproject
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make