mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-30 00:41:14 +00:00
Simplified - use Instance/Shared/java.make for common java code
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12452 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
d068072ef5
commit
59aea71333
2 changed files with 26 additions and 127 deletions
|
|
@ -43,33 +43,27 @@ endif
|
|||
internal-java_tool-uninstall \
|
||||
before-$(GNUSTEP_INSTANCE)-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-install-java_tool-dirs \
|
||||
install-java_tool \
|
||||
_FORCE
|
||||
|
||||
# This is the directory where the tools get installed. If you don't specify a
|
||||
# directory they will get installed in $(GNUSTEP_LOCAL_ROOT)/Tools/Java/.
|
||||
# directory they will get installed in $(GNUSTEP_LOCAL_ROOT)/Tools/.
|
||||
ifeq ($(JAVA_TOOL_INSTALLATION_DIR),)
|
||||
JAVA_TOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/Java/
|
||||
JAVA_TOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)
|
||||
endif
|
||||
|
||||
GNUSTEP_SHARED_JAVA_INSTALLATION_DIR = $(JAVA_TOOL_INSTALLATION_DIR)/Java
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/java.make
|
||||
|
||||
internal-java_tool-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(JAVA_OBJ_FILES) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
shared-instance-java-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
|
||||
before-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
after-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
internal-java_tool-install:: install-java_tool
|
||||
|
||||
$(JAVA_TOOL_INSTALLATION_DIR):
|
||||
$(MKINSTALLDIRS) $(JAVA_TOOL_INSTALLATION_DIR)
|
||||
|
||||
internal-install-java_tool-dirs:: $(JAVA_TOOL_INSTALLATION_DIR)
|
||||
ifneq ($(JAVA_OBJ_FILES),)
|
||||
$(MKINSTALLDIRS) $(addprefix $(JAVA_TOOL_INSTALLATION_DIR)/,$(dir $(JAVA_OBJ_FILES)));
|
||||
endif
|
||||
internal-java_tool-install:: shared-instance-java-install \
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
ifeq ($(PRINCIPAL_CLASS),)
|
||||
$(warning You must specify PRINCIPAL_CLASS)
|
||||
|
|
@ -85,56 +79,23 @@ NORMALIZED_PRINCIPAL_CLASS = $(basename $(word 1 $(PRINCIPAL_CLASS)))
|
|||
ESCAPED_PRINCIPAL_CLASS = $(subst /,\/,$(PRINCIPAL_CLASS))
|
||||
|
||||
# Always rebuild this because if the PRINCIPAL_CLASS changes...
|
||||
$(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE): _FORCE
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE): _FORCE
|
||||
sed -e 's/JAVA_OBJ_FILE/$(ESCAPED_PRINCIPAL_CLASS)/g' \
|
||||
$(GNUSTEP_MAKEFILES)/java-executable.template \
|
||||
> $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE); \
|
||||
chmod a+x $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE);
|
||||
> $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE); \
|
||||
chmod a+x $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE);
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(CHOWN) $(CHOWN_TO) \
|
||||
$(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE)
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
endif
|
||||
|
||||
_FORCE::
|
||||
|
||||
# See java.make for comments on ADDITIONAL_JAVA_OBJ_FILES
|
||||
UNESCAPED_ADD_JAVA_OBJ_FILES = $(wildcard $(JAVA_OBJ_FILES:.class=[$$]*.class))
|
||||
ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES))
|
||||
|
||||
JAVA_PROPERTIES_FILES = $($(GNUSTEP_INSTANCE)_JAVA_PROPERTIES_FILES)
|
||||
internal-java_tool-uninstall:: shared-instance-java-uninstall
|
||||
rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
install-java_tool:: internal-install-java_tool-dirs \
|
||||
$(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE)
|
||||
ifneq ($(strip $(JAVA_OBJ_FILES)),)
|
||||
for file in $(JAVA_OBJ_FILES); do \
|
||||
$(INSTALL_DATA) $$file $(JAVA_TOOL_INSTALLATION_DIR)/$$file ; \
|
||||
done;
|
||||
endif
|
||||
ifneq ($(strip $(ADDITIONAL_JAVA_OBJ_FILES)),)
|
||||
for file in $(ADDITIONAL_JAVA_OBJ_FILES); do \
|
||||
$(INSTALL_DATA) $$file $(JAVA_TOOL_INSTALLATION_DIR)/$$file ; \
|
||||
done;
|
||||
endif
|
||||
ifneq ($(JAVA_PROPERTIES_FILES),)
|
||||
for file in $(JAVA_PROPERTIES_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
|
||||
# Warning - to uninstall nested classes you need to have a compiled
|
||||
# source available ...
|
||||
internal-java_tool-uninstall::
|
||||
rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(JAVA_OBJ_FILES)
|
||||
rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(ADDITIONAL_JAVA_OBJ_FILES)
|
||||
rm -f $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_INSTANCE)
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-java_tool-clean::
|
||||
rm -f $(JAVA_OBJ_FILES) $(ADDITIONAL_JAVA_OBJ_FILES)
|
||||
internal-java_tool-clean:: shared-instance-java-clean
|
||||
|
||||
internal-java_tool-distclean::
|
||||
|
||||
|
|
|
|||
|
|
@ -70,91 +70,29 @@ endif
|
|||
internal-java_package-install \
|
||||
internal-java_package-uninstall \
|
||||
before-$(GNUSTEP_INSTANCE)-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all \
|
||||
install-java_package \
|
||||
internal-install-java-dirs
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
|
||||
# This is the directory where the java classses get
|
||||
# installed. Normally this is /usr/GNUstep/Local/Libraries/Java/
|
||||
ifeq ($(JAVA_INSTALLATION_DIR),)
|
||||
JAVA_INSTALLATION_DIR = $(GNUSTEP_JAVA)
|
||||
JAVA_INSTALLATION_DIR = $(GNUSTEP_JAVA)
|
||||
endif
|
||||
|
||||
#
|
||||
# Targets
|
||||
#
|
||||
GNUSTEP_SHARED_JAVA_INSTALLATION_DIR = $(JAVA_INSTALLATION_DIR)
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/java.make
|
||||
|
||||
|
||||
internal-java_package-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(JAVA_OBJ_FILES) \
|
||||
$(JAVA_JNI_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
shared-instance-java-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
|
||||
before-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
after-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
internal-java_package-install:: install-java_package
|
||||
internal-java_package-install:: shared-instance-java-install
|
||||
|
||||
internal-install-java-dirs:: $(JAVA_INSTALLATION_DIR)
|
||||
ifneq ($(JAVA_OBJ_FILES),)
|
||||
$(MKINSTALLDIRS) \
|
||||
$(addprefix $(JAVA_INSTALLATION_DIR)/,$(dir $(JAVA_OBJ_FILES)))
|
||||
endif
|
||||
|
||||
$(JAVA_INSTALLATION_DIR):
|
||||
$(MKINSTALLDIRS) $(JAVA_INSTALLATION_DIR)
|
||||
|
||||
# Say that you have a Pisa.java source file. Here we install both
|
||||
# Pisa.class (the main class) and also, if they exist, all class files
|
||||
# with names beginning wih Pisa$ (such as Pisa$1$Nicola.class); these
|
||||
# files are generated for nested/inner classes, and must be installed
|
||||
# as well. The fact we need to install these files is the reason why
|
||||
# the following is more complicated than you would think at first
|
||||
# glance.
|
||||
|
||||
# Build efficiently the list of possible inner/nested classes
|
||||
|
||||
# We first build a list like in `Pisa[$]*.class Roma[$]*.class' by
|
||||
# taking the JAVA_OBJ_FILES and replacing .class with [$]*.class, then
|
||||
# we use wildcard to get the list of all files matching the pattern
|
||||
UNESCAPED_ADD_JAVA_OBJ_FILES = $(wildcard $(JAVA_OBJ_FILES:.class=[$$]*.class))
|
||||
|
||||
# Finally we need to escape the $s before passing the filenames to the
|
||||
# shell
|
||||
ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES))
|
||||
|
||||
JAVA_PROPERTIES_FILES = $($(GNUSTEP_INSTANCE)_JAVA_PROPERTIES_FILES)
|
||||
|
||||
install-java_package:: internal-install-java-dirs
|
||||
ifneq ($(JAVA_OBJ_FILES),)
|
||||
for file in $(JAVA_OBJ_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
ifneq ($(ADDITIONAL_JAVA_OBJ_FILES),)
|
||||
for file in $(ADDITIONAL_JAVA_OBJ_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
ifneq ($(JAVA_PROPERTIES_FILES),)
|
||||
for file in $(JAVA_PROPERTIES_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-java_package-clean::
|
||||
rm -f $(JAVA_OBJ_FILES) \
|
||||
$(ADDITIONAL_JAVA_OBJ_FILES) \
|
||||
$(JAVA_JNI_OBJ_FILES)
|
||||
internal-java_package-clean:: shared-instance-java-clean
|
||||
|
||||
internal-java_package-distclean::
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue