mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
* framework.make (FRAMEWORK_WEBSERVER_RESOURCE_DIRS),
(framework-components), (framework-webresource-dir): (framework-webresource-files), (framework-localized-webresource-files): new specific gsweb targets. * subproject.make (framework-components), (framework-webresource-dir), (framework-webresource-files), (framework-localized-webresource-files): likewise. * rules.make (SUBPROJECT_ROOT_DIR): new variable. * gswapp.make ($(GSWAPP_FILE)): added ALL_FRAMEWORK_DIRS git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@7928 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani
parent
ecd526fbcc
commit
e7957e4a1f
5 changed files with 179 additions and 9 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2000-10-29 Mirko Viviani <mirko.viviani@rccr.cremona.it>
|
||||
|
||||
* framework.make (FRAMEWORK_WEBSERVER_RESOURCE_DIRS),
|
||||
(framework-components), (framework-webresource-dir):
|
||||
(framework-webresource-files), (framework-localized-webresource-files):
|
||||
new specific gsweb targets.
|
||||
* subproject.make (framework-components), (framework-webresource-dir),
|
||||
(framework-webresource-files), (framework-localized-webresource-files):
|
||||
likewise.
|
||||
* rules.make (SUBPROJECT_ROOT_DIR): new variable.
|
||||
* gswapp.make ($(GSWAPP_FILE)): added ALL_FRAMEWORK_DIRS
|
||||
|
||||
2000-10-28 Mirko Viviani <mirko.viviani@rccr.cremona.it>
|
||||
|
||||
* configure.in: added --with-libxml-include, --with-libxml-library
|
||||
|
|
|
|||
102
framework.make
102
framework.make
|
|
@ -29,13 +29,27 @@ FRAMEWORK_MAKE_LOADED=yes
|
|||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
# The name of the bundle is in the FRAMEWORK_NAME variable.
|
||||
# The list of framework resource file are in xxx_RESOURCE_FILES
|
||||
# The list of localized framework resource files is in xxx_LOCALIZED_RESOURCE_FILES
|
||||
# The list of framework resource files are in xxx_RESOURCE_FILES
|
||||
# The list of framework web server resource files are in
|
||||
# xxx_WEBSERVER_RESOURCE_FILES
|
||||
# The list of localized framework resource files is in
|
||||
# xxx_LOCALIZED_RESOURCE_FILES
|
||||
# The list of localized framework web server resource files is in
|
||||
# xxx_LOCALIZED_WEBSERVER_RESOURCE_FILES
|
||||
# The list of framework GSWeb components are in xxx_COMPONENTS
|
||||
# The list of languages the framework supports is in xxx_LANGUAGES
|
||||
# The list of framework resource directories are in xxx_RESOURCE_DIRS
|
||||
# The list of framework subprojects directories are in xxx_SUBPROJECTS
|
||||
# The name of the principal class is xxx_PRINCIPAL_CLASS
|
||||
# The header files are in xxx_HEADER_FILES
|
||||
# The list of framework web server resource directories are in
|
||||
# xxx_WEBSERVER_RESOURCE_DIRS
|
||||
# The list of localized framework web server GSWeb components are in
|
||||
# xxx_LOCALIZED_WEBSERVER_RESOURCE_DIRS
|
||||
# xxx_CURRENT_VERSION_NAME is the compiled version name (default "A")
|
||||
# xxx_DEPLOY_WITH_CURRENT_VERSION deploy with current version or not (default
|
||||
# "yes")
|
||||
#
|
||||
# where xxx is the framework name
|
||||
#
|
||||
|
||||
|
|
@ -84,7 +98,6 @@ FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/Current
|
|||
FRAMEWORK_LIBRARY_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
FRAMEWORK_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(FRAMEWORK_DIR_NAME)/Resources/$(d))
|
||||
|
||||
FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT)
|
||||
FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT)
|
||||
|
|
@ -137,12 +150,23 @@ before-$(TARGET)-all:: $(FRAMEWORK_HEADER_FILES)
|
|||
after-$(TARGET)-all::
|
||||
|
||||
FRAMEWORK_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$(d))
|
||||
FRAMEWORK_WEBSERVER_RESOURCE_DIRS = $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources/$(d))
|
||||
|
||||
ifeq ($(strip $(COMPONENTS)),)
|
||||
override COMPONENTS=""
|
||||
endif
|
||||
ifeq ($(strip $(RESOURCE_FILES)),)
|
||||
override RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(WEBSERVER_RESOURCE_FILES)),)
|
||||
override WEBSERVER_RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
|
||||
override LOCALIZED_RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(LOCALIZED_WEBSERVER_RESOURCE_FILES)),)
|
||||
override LOCALIZED_WEBSERVER_RESOURCE_FILES=""
|
||||
endif
|
||||
ifeq ($(strip $(LANGUAGES)),)
|
||||
override LANGUAGES="English"
|
||||
endif
|
||||
|
|
@ -254,7 +278,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(S
|
|||
$(DUMMY_FRAMEWORK_OBJ_FILE): $(DUMMY_FRAMEWORK_FILE)
|
||||
$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@
|
||||
|
||||
build-framework:: $(FRAMEWORK_FILE) framework-resource-files localized-framework-resource-files
|
||||
build-framework:: $(FRAMEWORK_FILE) framework-components framework-resource-files localized-framework-resource-files framework-localized-webresource-files framework-webresource-files
|
||||
|
||||
ifeq ($(WITH_DLL),yes)
|
||||
|
||||
|
|
@ -274,6 +298,30 @@ $(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
|
|||
|
||||
endif # WITH_DLL
|
||||
|
||||
framework-components::
|
||||
@(if [ "$(COMPONENTS)" != "" ]; then \
|
||||
echo "Copying components into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
|
||||
for component in $(COMPONENTS); do \
|
||||
if [ -d ../../../../$$component ]; then \
|
||||
cp -r ../../../../$$component ./; \
|
||||
fi; \
|
||||
done; \
|
||||
echo "Copying localized components into the framework wrapper..."; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $$l.lproj; \
|
||||
fi; \
|
||||
cd $$l.lproj; \
|
||||
for f in $(COMPONENTS); do \
|
||||
if [ -d ../../../../../$$l.lproj/$$f ]; then \
|
||||
cp -r ../../../../../$$l.lproj/$$f .;\
|
||||
fi; \
|
||||
done;\
|
||||
cd ..; \
|
||||
done;\
|
||||
fi;)
|
||||
|
||||
framework-resource-files:: $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist
|
||||
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying resources into the framework wrapper..."; \
|
||||
|
|
@ -297,11 +345,51 @@ localized-framework-resource-files:: $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Inf
|
|||
done; \
|
||||
fi)
|
||||
|
||||
framework-webresource-dir::
|
||||
@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ] || [ "$(FRAMEWORK_WEBSERVER_RESOURCE_DIRS)" != "" ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
$(MKDIRS) $(FRAMEWORK_WEBSERVER_RESOURCE_DIRS); \
|
||||
if test ! -L "$(FRAMEWORK_DIR_NAME)/WebServerResources"; then \
|
||||
$(LN_S) Versions/Current/WebServerResources $(FRAMEWORK_DIR_NAME);\
|
||||
fi; \
|
||||
fi;)
|
||||
|
||||
framework-webresource-files:: framework-webresource-dir
|
||||
@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying webserver resources into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
for ff in $(WEBSERVER_RESOURCE_FILES); do \
|
||||
if [ -f ../../../../WebServerResources/$$ff ]; then \
|
||||
cp -r ../../../../WebServerResources/$$ff .; \
|
||||
fi; \
|
||||
done; \
|
||||
fi;)
|
||||
|
||||
framework-localized-webresource-files:: framework-webresource-dir
|
||||
@(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying localized webserver resources into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $$l.lproj; \
|
||||
fi; \
|
||||
cd $$l.lproj; \
|
||||
for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES); do \
|
||||
if [ -f ../../../../../WebServerResources/$$l.lproj/$$f ]; then \
|
||||
if [ ! -r $$f ]; then \
|
||||
cp -r ../../../../../WebServerResources/$$l.lproj/$$f $$f;\
|
||||
fi;\
|
||||
fi;\
|
||||
done;\
|
||||
cd ..; \
|
||||
done;\
|
||||
fi;)
|
||||
|
||||
ifeq ($(PRINCIPAL_CLASS),)
|
||||
override PRINCIPAL_CLASS = $(INTERNAL_framework_NAME)
|
||||
endif
|
||||
|
||||
# MacOSX-S bundles
|
||||
# MacOSX-S frameworks
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(FRAMEWORK_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
|
|
@ -313,7 +401,7 @@ $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR_NAME
|
|||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo "}") >$@
|
||||
|
||||
# GNUstep bundles
|
||||
# GNUstep frameworks
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(INTERNAL_framework_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
|
||||
|
|
@ -326,7 +414,7 @@ $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_
|
|||
echo "}") >$@
|
||||
|
||||
internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) $(GNUSTEP_FRAMEWORKS_LIBRARIES) $(GNUSTEP_FRAMEWORKS_HEADERS)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)
|
||||
@(cd $(GNUSTEP_FRAMEWORKS_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ endif
|
|||
$(GSWAPP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_LIB_DIRS) $(ALL_GSW_LIBS)
|
||||
$(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_GSW_LIBS)
|
||||
|
||||
ifeq ($(OBJC_COMPILER), NeXT)
|
||||
@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
FRAMEWORK_NAME="$(FRAMEWORK_NAME)" \
|
||||
FRAMEWORK_VERSION_DIR_NAME="../$(FRAMEWORK_VERSION_DIR_NAME)" \
|
||||
DERIVED_SOURCES="../$(DERIVED_SOURCES)" \
|
||||
SUBPROJECT_ROOT_DIR="$(SUBPROJECT_ROOT_DIR)/$$f" \
|
||||
; then \
|
||||
:; \
|
||||
else exit $$?; \
|
||||
|
|
@ -420,7 +421,7 @@ endif
|
|||
FRAMEWORK_NAME := $(strip $(FRAMEWORK_NAME))
|
||||
FRAMEWORK_DIR_NAME := $(FRAMEWORK_NAME:=.framework)
|
||||
FRAMEWORK_VERSION_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/$(CURRENT_VERSION_NAME)
|
||||
|
||||
SUBPROJECT_ROOT_DIR := "."
|
||||
|
||||
ifeq ($(OBJ_DIR_RULE),)
|
||||
OBJ_DIR_RULE = defined
|
||||
|
|
|
|||
|
|
@ -63,7 +63,10 @@ FRAMEWORK_HEADER_FILES := $(patsubst %.h,$(FRAMEWORK_VERSION_DIR_NAME)/Headers/%
|
|||
#
|
||||
internal-subproj-all:: before-all before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
|
||||
framework-components \
|
||||
framework-resource-files localized-framework-resource-files \
|
||||
framework-webresource-files \
|
||||
framework-localized-webresource-files \
|
||||
after-$(TARGET)-all after-all
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES)
|
||||
|
|
@ -94,6 +97,32 @@ $(FRAMEWORK_HEADER_FILES):: $(HEADER_FILES)
|
|||
fi; \
|
||||
fi;
|
||||
|
||||
framework-components::
|
||||
@(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
|
||||
if [ "$(COMPONENTS)" != "" ]; then \
|
||||
echo "Copying components into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
|
||||
for component in $(COMPONENTS); do \
|
||||
if [ -d ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ]; then \
|
||||
cp -r ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ./; \
|
||||
fi; \
|
||||
done; \
|
||||
echo "Copying localized components into the framework wrapper..."; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $$l.lproj; \
|
||||
fi; \
|
||||
cd $$l.lproj; \
|
||||
for f in $(COMPONENTS); do \
|
||||
if [ -d ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f ]; then \
|
||||
cp -r ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f .;\
|
||||
fi; \
|
||||
done; \
|
||||
cd ..; \
|
||||
done;\
|
||||
fi; \
|
||||
fi;)
|
||||
|
||||
framework-resource-files::
|
||||
@(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
|
||||
if [ "$(RESOURCE_FILES)" != "" ]; then \
|
||||
|
|
@ -122,6 +151,46 @@ localized-framework-resource-files::
|
|||
fi; \
|
||||
fi;)
|
||||
|
||||
framework-webresource-dir::
|
||||
@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ] || [ "$(FRAMEWORK_WEBSERVER_RESOURCE_DIRS)" != "" ]; then \
|
||||
$(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
$(MKDIRS) $(FRAMEWORK_WEBSERVER_RESOURCE_DIRS); \
|
||||
if test ! -L "$(FRAMEWORK_DIR_NAME)/WebServerResources"; then \
|
||||
$(LN_S) Versions/Current/WebServerResources $(FRAMEWORK_DIR_NAME);\
|
||||
fi; \
|
||||
fi;)
|
||||
|
||||
framework-webresource-files:: framework-webresource-dir
|
||||
@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying webserver resources into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
for ff in $(WEBSERVER_RESOURCE_FILES); do \
|
||||
if [ -f ../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff ]; then \
|
||||
cp -r ../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff .; \
|
||||
fi; \
|
||||
done; \
|
||||
fi;)
|
||||
|
||||
framework-localized-webresource-files:: framework-webresource-dir
|
||||
@(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying localized webserver resources into the framework wrapper..."; \
|
||||
cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
|
||||
for l in $(LANGUAGES); do \
|
||||
if [ ! -f $$l.lproj ]; then \
|
||||
$(MKDIRS) $$l.lproj; \
|
||||
fi; \
|
||||
cd $$l.lproj; \
|
||||
for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES); do \
|
||||
if [ -f ../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f ]; then \
|
||||
if [ ! -r $$f ]; then \
|
||||
cp -r ../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f $$f; \
|
||||
fi; \
|
||||
fi;\
|
||||
done;\
|
||||
cd ..; \
|
||||
done;\
|
||||
fi;)
|
||||
|
||||
#
|
||||
# Installation targets
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in a new issue