From 5e4dfe8f1025d1ae5656c0e5b391e10f0bf9c67f Mon Sep 17 00:00:00 2001
From: Jens Steidl <Jens.Steidl@slub-dresden.de>
Date: Fri, 15 Dec 2023 12:40:10 +0100
Subject: [PATCH] - remove lib/ for cli-only version
---
.gitlab-ci.yml | 2 ++
Makefile | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f93418d..7ce79c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ variables:
EXLIBRIS_SDK_DIR: "/exlibris"
ROSETTASDK: "${EXLIBRIS_SDK_DIR}/7.3/dps-sdk-projects/dps-sdk-deposit/lib/" # base: https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects
JAVARELEASE: "17"
+ MINIMAL_JAR: "1"
DOCKERFILE_DEB: "${CI_PROJECT_DIR}/gitlab-ci/Dockerfile_DEB"
IMAGE_TARGET_DEB: "${CI_REGISTRY_IMAGE}/debian12_${CI_PROJECT_NAME}"
IMAGE_BASE_DEB: "sdvharbor.slub-dresden.de/replication/debian:bookworm-slim"
@@ -26,6 +27,7 @@ default:
before_script: # These steps are run before EACH job.
- export ROSETTASDK="${ROSETTASDK}"
- export JAVARELEASE=${JAVARELEASE}
+ - export MINIMAL_JAR=${MINIMAL_JAR}
.build-env-job:
stage: build-env
diff --git a/Makefile b/Makefile
index dffed1b..63a3ab5 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ BUILD:=build/
TESTSOURCES:=$(shell find resources/ -name "*.java" -print | xargs echo )
TESTOBJS:=$(TESTSOURCES:.java=.class)
+MINIMAL_JAR:=0
+
all: $(BUILD) $(JAR)
help:
@@ -70,7 +72,7 @@ $(JAR): $(OBJS)
#@cp -r resources $(BUILD)
@cp -r PLUGIN-INF/ $(BUILD)
@cp -r META-INF/ $(BUILD)
- @cp -r lib/ $(BUILD)
+ @if [ ${MINIMAL_JAR} = 0 ]; then cp -r lib/ $(BUILD); fi
@cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/$(BUILD) \; ; cd ..
@cd $(BUILD); ${JAVAPATH}/jar cfvM ../$@ ./* ; cd ..
--
GitLab