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

Recognize and install xxx_JAVA_PROPERTIES_FILES for java projects

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12427 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-07 15:04:23 +00:00
parent 8daba69d46
commit 93685f787b
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Feb 7 12:58:52 2002 Nicola Pero <n.pero@mi.flashnet.it>
* java.make (install-java_package): Recognize and install
xxx_JAVA_PROPERTIES_FILES.
* java-tool.make (install-java_tool): Idem.
2002-02-04 Richard Frith-Macdonald <rfm@gnu.org> 2002-02-04 Richard Frith-Macdonald <rfm@gnu.org>
* opentool.in: Rewrite searching code so that it looks in the * opentool.in: Rewrite searching code so that it looks in the

9
java-tool.make
View file

@ -121,6 +121,8 @@ _FORCE::
UNESCAPED_ADD_JAVA_OBJ_FILES = $(wildcard $(JAVA_OBJ_FILES:.class=[$$]*.class)) UNESCAPED_ADD_JAVA_OBJ_FILES = $(wildcard $(JAVA_OBJ_FILES:.class=[$$]*.class))
ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES)) ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES))
JAVA_PROPERTIES_FILES = $($(INTERNAL_java_tool_NAME)_JAVA_PROPERTIES_FILES)
install-java_tool:: internal-install-java_tool-dirs \ install-java_tool:: internal-install-java_tool-dirs \
$(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_java_tool_NAME) $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_java_tool_NAME)
ifneq ($(strip $(JAVA_OBJ_FILES)),) ifneq ($(strip $(JAVA_OBJ_FILES)),)
@ -133,6 +135,13 @@ ifneq ($(strip $(ADDITIONAL_JAVA_OBJ_FILES)),)
$(INSTALL_DATA) $$file $(JAVA_TOOL_INSTALLATION_DIR)/$$file ; \ $(INSTALL_DATA) $$file $(JAVA_TOOL_INSTALLATION_DIR)/$$file ; \
done; done;
endif 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 # Warning - to uninstall nested classes you need to have a compiled
# source available ... # source available ...

11
java.make
View file

@ -53,6 +53,8 @@ JAVA_PACKAGE_MAKE_LOADED=yes
# gnu/gnustep/base/NSObject.java will be created as # gnu/gnustep/base/NSObject.java will be created as
# gnu/gnustep/base/NSObject.h) These headers are not installed. # gnu/gnustep/base/NSObject.h) These headers are not installed.
# #
# If you have properties file to install, put them in the
# xxx_JAVA_PROPERTIES_FILES
JAVA_PACKAGE_NAME:=$(strip $(JAVA_PACKAGE_NAME)) JAVA_PACKAGE_NAME:=$(strip $(JAVA_PACKAGE_NAME))
@ -141,6 +143,8 @@ UNESCAPED_ADD_JAVA_OBJ_FILES = $(wildcard $(JAVA_OBJ_FILES:.class=[$$]*.class))
# shell # shell
ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES)) ADDITIONAL_JAVA_OBJ_FILES = $(subst $$,\$$,$(UNESCAPED_ADD_JAVA_OBJ_FILES))
JAVA_PROPERTIES_FILES = $($(INTERNAL_java_package_NAME)_JAVA_PROPERTIES_FILES)
install-java_package:: internal-install-java-dirs install-java_package:: internal-install-java-dirs
ifneq ($(JAVA_OBJ_FILES),) ifneq ($(JAVA_OBJ_FILES),)
for file in $(JAVA_OBJ_FILES) __done; do \ for file in $(JAVA_OBJ_FILES) __done; do \
@ -156,6 +160,13 @@ ifneq ($(ADDITIONAL_JAVA_OBJ_FILES),)
fi; \ fi; \
done done
endif 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 # Cleaning targets