Author: thebeing
Date: Sun Dec 21 13:03:32 2014
New Revision: 38255
URL: http://svn.gna.org/viewcvs/gnustep?rev=38255&view=rev
Log:
Add an as_jar option that can be passed to make install in order to install the
jar
archive instead of the expanded class hierarchy.
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/Instance/Shared/java.make
tools/make/trunk/rules.make
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=38255&r1=38254&r2=38255&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Sun Dec 21 13:03:32 2014
@@ -1,4 +1,12 @@
2014-12-21: Niels Grewe <[email protected]>
+
+ * 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 <[email protected]>
+
* Instance/Shared/java.make
* Instance/java.make
* Instance/rules.make
Modified: tools/make/trunk/Instance/Shared/java.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Instance/Shared/java.make?rev=38255&r1=38254&r2=38255&view=diff
==============================================================================
--- tools/make/trunk/Instance/Shared/java.make (original)
+++ tools/make/trunk/Instance/Shared/java.make Sun Dec 21 13:03:32 2014
@@ -84,6 +84,20 @@
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) $(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 @@
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 @@
$(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 @@
fi; \
done$(END_ECHO)
endif
+endif
Modified: tools/make/trunk/rules.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/rules.make?rev=38255&r1=38254&r2=38255&view=diff
==============================================================================
--- tools/make/trunk/rules.make (original)
+++ tools/make/trunk/rules.make Sun Dec 21 13:03:32 2014
@@ -83,6 +83,17 @@
ifeq ($(strip),yes)
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
#
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
