From 4fc908f0f2649a0fc597375ab837d38184282e80 Mon Sep 17 00:00:00 2001
From: Jens Steidl <Jens.Steidl@slub-dresden.de>
Date: Wed, 13 Sep 2023 11:01:32 +0200
Subject: [PATCH] - refactor: updated & simplified for current SDKs
---
Makefile | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 79f4bd1..7ccbca5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,25 @@
# von ExLibris an Rosetta übergibt.
# Pfad zu Java
-JAVAPATH=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
-JAVARELEASE=17
+JAVAPATH:=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
+JAVARELEASE:=17
# Verwendete Rosetta-Version
-ROSETTAVERSION:=7.3.0
+ROSETTAVERSION:=8.0.0
# Pfad zum Rosetta-SDK
-ROSETTASDK:=$(shell find /exlibris/ -type d -regex ".*dps-sdk-${ROSETTAVERSION}/lib$$")
-# Pfad zum Rosetta-SDK, Deposit-Module
-ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
-ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
-ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
+ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/dps-sdk-projects/dps-sdk-deposit/lib/
# classpath
-JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g")
-CLASSPATH:=${ROSETTASDKDEPOSIT}/../src/:${ROSETTASDKDEPOSIT}/xmlbeans-2.3.0.jar:${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${ROSETTASDKDEPOSIT}/log4j-1.2.14.jar:${ROSETTASDKPLUGINS}/NFSStoragePlugin.jar
+JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar
+CLASSPATH:=$(shell find ${ROSETTASDK} -name "*.jar" -print | xargs echo | sed -e "s/ /:/g")
# sources
-SOURCES:=java/org/slub/rosetta/dps/repository/plugin/SLUBVirusCheckClamAVPlugin.java
+PLUGINCLASS:=SLUBVirusCheckClamAVPlugin
+PLUGINCLASSPATH:=org.slub.rosetta.dps.repository.plugin.${PLUGINCLASS}
+SOURCES:=java/org/slub/rosetta/dps/repository/plugin/${PLUGINCLASS}.java
OBJS:=$(SOURCES:.java=.class)
-JAR:=SLUBVirusCheckClamAVPlugin.jar
+JAR:=${PLUGINCLASS}.jar
BUILD:=build/
SHELL=/bin/bash
@@ -44,8 +42,8 @@ clean: jarclean
@rm -Rf doc/
@find ./java/org/ -name "*.class" -exec rm -f \{\} \;
@rm -Rf $(JAR)
- @rm test_novirus
- @rm test_eicar
+ @rm -Rf test_novirus
+ @rm -Rf test_eicar
distclean: clean
find ./ -name "*~" -exec rm -f \{\} \;
@@ -74,12 +72,12 @@ check_prerequisites:
test_eicar: $(OBJS)
- @/usr/bin/java -cp $(CLASSPATH):$(JUNITCLASSPATH):java org.slub.rosetta.dps.repository.plugin.SLUBVirusCheckClamAVPlugin EICAR/eicar | grep -F 'SIGNATURE:' > $@
+ @/usr/bin/java -cp $(CLASSPATH):$(JUNITCLASSPATH):java ${PLUGINCLASSPATH} EICAR/eicar | grep -F 'SIGNATURE:' > $@
@echo -n "testing 'EICAR':"
@if [[ "$$(cat test_eicar)" = "RESULT: 2 SIGNATURE: Eicar-Signature" ]]; then echo pass; else echo failed; exit 2;fi
test_novirus: $(OBJS)
- @/usr/bin/java -cp $(CLASSPATH):$(JUNITCLASSPATH):java org.slub.rosetta.dps.repository.plugin.SLUBVirusCheckClamAVPlugin Makefile | grep -F 'SIGNATURE:' > $@
+ @/usr/bin/java -cp $(CLASSPATH):$(JUNITCLASSPATH):java ${PLUGINCLASSPATH} Makefile | grep -F 'SIGNATURE:' > $@
@echo -n "testing 'No virus': "
@if [[ "$$(cat test_novirus)" = "RESULT: 0 SIGNATURE: " ]]; then echo pass; else echo fail; exit 2; fi
--
GitLab