gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an as_jar option that can be passed to make install in order to install the jar

Browse source 
archive instead of the expanded class hierarchy.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@38255 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2014-12-21 12:03:32 +00:00
parent 0223c11597
commit e09f16de72
3 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,12 @@
2014-12-21: Niels Grewe <niels.grewe@halbordnung.de>
* rules.make
* Instance/Shared/java.make:
Add as_jar option to install the jar file instead of the expanded
class hierarchy.
2014-12-21: Niels Grewe <niels.grewe@halbordnung.de>
* Instance/Shared/java.make
* Instance/java.make
* Instance/rules.make

29
Instance/Shared/java.make
View file

@ -84,6 +84,20 @@ else
JAVA_JAR_FLAGS = cmf
endif
ifeq ($(strip $($(GNUSTEP_INSTANCE)_JAVA_INSTALL_AS_JAR)),yes)
JAVA_JAR_INSTALL_DEP = $(JAVA_JAR_FILE)
else
JAVA_JAR_INSTALL_DEP =
endif
ifeq ($(strip $(as_jar)),yes)
JAVA_JAR_INSTALL_DEP = $(JAVA_JAR_FILE)
else
ifeq ($(strip $(as_jar)),no)
JAVA_JAR_INSTALL_DEP =
endif
endif
# By default, we enable "batch compilation" of Java files. This means
# that whenever make determines that a Java files needs recompilation,
@ -148,11 +162,13 @@ $(JAVA_JAR_FILE): $(JAVA_MANIFEST_FILE) \
$(JAVA_JAR_FILE) $(filter-out $(JAVA_MANIFEST_FILE),$^);\
$(END_ECHO)
shared-instance-java-jar-manifest: $(JAVA_JAR_MANIFEST_FILE)
shared-instance-java-jar: $(JAVA_JAR_FILE)
shared-instance-java-install: shared-instance-java-install-dirs
shared-instance-java-install: shared-instance-java-install-dirs $(JAVA_JAR_INSTALL_DEP)
ifneq ($(strip $(JAVA_JAR_INSTALL_DEP)),)
$(ECHO_NOTHING) $(INSTALL_DATA) $(JAVA_JAR_INSTALL_DEP) $(JAVA_INSTALL_DIR)/$(JAVA_JAR_INSTALL_DEP) \
$(END_ECHO)
else
ifneq ($(JAVA_OBJ_FILES),)
$(ECHO_INSTALLING_CLASS_FILES)for file in $(JAVA_OBJ_FILES) __done; do \
if [ $$file != __done ]; then \
@ -177,7 +193,7 @@ ifneq ($(JAVA_PROPERTIES_FILES),)
fi; \
done$(END_ECHO)
endif
endif
shared-instance-java-install-dirs: $(GNUSTEP_SHARED_JAVA_INSTALLATION_DIR)
ifneq ($(JAVA_OBJ_FILES),)
$(ECHO_NOTHING)$(MKINSTALLDIRS) \
@ -194,6 +210,10 @@ shared-instance-java-clean:
$(JAVA_JNI_OBJ_FILES)$(END_ECHO)
shared-instance-java-uninstall:
ifneq ($(strip $(JAVA_JAR_INSTALL_DEP)),)
$(ECHO_NOTHING) rm -f $(JAVA_INSTALL_DIR)/$(JAVA_JAR_INSTALL_DEP) \
$(END_ECHO)
else
ifneq ($(JAVA_OBJ_FILES),)
$(ECHO_NOTHING)for file in $(JAVA_OBJ_FILES) __done; do \
if [ $$file != __done ]; then \
@ -215,3 +235,4 @@ ifneq ($(JAVA_PROPERTIES_FILES),)
fi; \
done$(END_ECHO)
endif
endif

11
rules.make
View file

@ -85,6 +85,17 @@ INSTALL_PROGRAM += -s
export strip
endif
#
# Manage jar installation
#
ifeq ($(as_jar),yes)
export as_jar
else
ifeq ($(as_jar),no)
export as_jar
endif
endif
#
# Prepare the arguments to install to set user/group of installed files
#