From 82671d3b63ed052c50fbaaea1c1475c62625b7b8 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Fri, 25 May 2018 08:26:41 +0200
Subject: Adds a Manifest to the Jar.

---
 Makefile         | 12 ++++--------
 src/Manifest.txt |  2 ++
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 src/Manifest.txt

diff --git a/Makefile b/Makefile
index db10a58..ccfb411 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ BIN_DIR ?= ${CURDIR}/bin/
 LIB_DIR ?= ${CURDIR}/lib/
 
 TARGET ?= ghdl2hastabel.jar
-RUN_SCRIPT ?= ghdl2hastabel.sh
 INSTALL_DIR ?= $(LIB_DIR)
 
 #### Where to get the missing Jar files.
@@ -36,16 +35,18 @@ endif
 CLASSPATH = "$(SRC_DIR):$(BIN_DIR)"
 
 ## Makefile Magic ##############################################################
+MANIFEST = $(SRC_DIR)/Manifest.txt
+
 JAVA_SOURCES = \
 	$(wildcard $(SRC_DIR)/ghdl2hastabel/*.java) \
 	$(wildcard $(SRC_DIR)/ghdl2hastabel/*/*.java)
 CLASSES = $(patsubst $(SRC_DIR)/%,$(BIN_DIR)/%, $(JAVA_SOURCES:.java=.class))
 
 ## Makefile Rules ##############################################################
-$(TARGET): $(RUN_SCRIPT) $(JAVA_SOURCES) $(CLASSES)
+$(TARGET): $(JAVA_SOURCES) $(CLASSES) $(MANIFEST)
 	$(MAKE) $(LIB_DIR)
 	rm -f $(TARGET) $(INSTALL_DIR)/$@
-	$(JAR) cf $@ -C $(BIN_DIR) .
+	$(JAR) cfm $@ $(MANIFEST) -C $(BIN_DIR) .
 	cp $@ $(INSTALL_DIR)/$@
 
 clean:
@@ -60,11 +61,6 @@ $(CLASSES): $(BIN_DIR)/%.class: $(SRC_DIR)/%.java $(BIN_DIR)
 	echo "Attempting to download missing jar '$@'..."
 	cd $(LIB_DIR); $(DOWNLOADER) "$(JAR_SOURCE)/$(notdir $@)"
 
-$(RUN_SCRIPT): Makefile
-	echo "#!/bin/sh" > $@
-	echo "$(JAVA) -cp \"$(CLASSPATH)\" ghdl2hastabel.Main \$$*" >> $@
-	chmod +x $@
-
 $(LIB_DIR):
 	mkdir -p $@
 
diff --git a/src/Manifest.txt b/src/Manifest.txt
new file mode 100644
index 0000000..647fc97
--- /dev/null
+++ b/src/Manifest.txt
@@ -0,0 +1,2 @@
+Main-Class: ghdl2hastabel.Main
+
-- 
cgit v1.2.3-70-g09d2