Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-clojure
Commits: f1e53ff5 by Louis-Philippe Véronneau at 2020-12-07T12:20:41-05:00 d/rules: build using leiningen. - - - - - 5 changed files: - debian/changelog - debian/control - − debian/libtrapperkeeper-clojure.jlibs - debian/libtrapperkeeper-clojure.poms - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -6,7 +6,7 @@ trapperkeeper-clojure (3.1.0-1) UNRELEASED; urgency=medium * d/control: update formatting, use debhelper 13, bump standards-version. * d/control: Migrate to Clojure Team, update VCS links. * d/pom.xml: update for new release. - * d/rules: disable dh_auto_build; we don't want to run make. + * d/rules: build using leiningen. * d/patches: delete 0001, upstream fixed that. -- Louis-Philippe Véronneau <[email protected]> Fri, 13 Nov 2020 17:19:01 -0500 ===================================== debian/control ===================================== @@ -5,11 +5,11 @@ Maintainer: Debian Clojure Maintainers <[email protected] Uploaders: Louis-Philippe Véronneau <[email protected]> Build-Depends: debhelper-compat (= 13), + default-jdk-headless, javahelper, maven-repo-helper, - clojure, + libclojure-java, libtools-logging-clojure, - libnrepl-clojure, libtools-macro-clojure, libcore-async-clojure, libslf4j-java, @@ -23,7 +23,9 @@ Build-Depends: libbeckon-clojure, libtypesafe-config-clojure, libkitchensink-clojure, - default-jdk-headless + libpuppetlabs-i18n-clojure, + libnrepl-clojure, + leiningen, Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-clojure.git Vcs-Browser: https://salsa.debian.org/clojure-team/trapperkeeper-clojure @@ -33,7 +35,24 @@ Package: libtrapperkeeper-clojure Architecture: all Depends: ${java:Depends}, - ${misc:Depends} + ${misc:Depends}, + libclojure-java, + libtools-logging-clojure, + libtools-macro-clojure, + libcore-async-clojure, + libslf4j-java, + liblogback-java, + libjanino-java, + libclj-time-clojure, + libraynes-fs-clojure, + libclj-yaml-clojure, + libprismatic-plumbing-clojure, + libprismatic-schema-clojure, + libbeckon-clojure, + libtypesafe-config-clojure, + libkitchensink-clojure, + libpuppetlabs-i18n-clojure, + libnrepl-clojure, Recommends: ${java:Recommends} Description: framework for configuring, composing and running Clojure services Trapperkeeper is a Clojure framework for hosting long-running applications and ===================================== debian/libtrapperkeeper-clojure.jlibs deleted ===================================== @@ -1,2 +0,0 @@ -trapperkeeper.jar -trapperkeeper-test.jar ===================================== debian/libtrapperkeeper-clojure.poms ===================================== @@ -1 +1 @@ -debian/pom.xml --usj-name=trapperkeeper +debian/pom.xml --artifact=target/trapperkeeper.jar --artifact=target/tests/trackerkeeper-test.jar --usj-name=trapperkeeper ===================================== debian/rules ===================================== @@ -1,32 +1,32 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk include /usr/share/javahelper/java-vars.mk -PRODUCED_JAR=trapperkeeper.jar -TEST_JAR=trapperkeeper-test.jar -export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.logging.jar:/usr/share/java/nrepl.jar:/usr/share/java/tools.macro.jar:/usr/share/java/core.async.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/log4j-over-slf4j.jar:/usr/share/java/logback-classic.jar:/usr/share/java/logback-core.jar:/usr/share/java/logback-access.jar:/usr/share/java/janino.jar:/usr/share/java/clj-time.jar:/usr/share/java/raynes-fs.jar:/usr/share/java/clj-yaml.jar:/usr/share/java/prismatic-plumbing.jar:/usr/share/java/prismatic-schema.jar:/usr/share/java/beckon.jar:/usr/share/java/clj-typesafe-config.jar:/usr/share/java/kitchensink.jar -TEST_CLASSPATH=$(CURDIR)/test:/usr/share/java/kitchensink-test.jar +export LEIN_HOME=$(CURDIR)/.lein +export LEIN_OFFLINE=true +NAME=trapperkeeper %: - dh $@ --with javahelper --with jh_maven_repo_helper + dh $@ --with javahelper --with maven_repo_helper -# We don't want to run the upstream makefile -override_dh_auto_build: +override_dh_auto_configure: + cd debian && ln -sf /usr/share/maven-repo . -override_jh_build: - jar cf $(PRODUCED_JAR) -C src . - jar cf $(TEST_JAR) -C test . +override_dh_auto_build: + lein jar + # symlinks so we don't need a version in debian/*.poms + cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar + cd target/tests && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM)-test.jar $(NAME)-test.jar -override_jh_classpath: - jh_classpath $(PRODUCED_JAR) +override_dh_auto_test: + lein test -override_jh_clean: - jh_clean - rm -f $(CURDIR)/$(PRODUCED_JAR) +override_jh_installlibs: + jh_installlibs target/$(NAME).jar + jh_installlibs target/tests/$(NAME)-test.jar -override_dh_auto_test: - -mkdir test/target - (cd test && find . -name "*.clj" -not -path '*/testutils/*' | \ - LC_ALL=C sort | \ - xargs --verbose clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH)) - rm -rf test/target +override_dh_clean: + rm -f debian/maven-repo + rm -Rf target + dh_clean View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/commit/f1e53ff5d2ff3f22cada51e2ed6905161c917554 -- View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/commit/f1e53ff5d2ff3f22cada51e2ed6905161c917554 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
