Skip to content

Commit

Permalink
Trying to fix cp of war without git revision
Browse files Browse the repository at this point in the history
  • Loading branch information
vjrj committed Dec 11, 2020
1 parent cb3cb62 commit ae4816c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

M2_REPO = $(CURDIR)/debian/maven-repo-local
CURVERSION = $(shell grep -oPm2 "(?<=<version>)[^<]+" "pom.xml" | tail -1)
# Previously:
# CURVERSION = $(shell mvn -Dmaven.repo.local=$(M2_REPO) -q -Dexec.executable=echo -Dexec.args='$${project.version}' --non-recursive exec:exec)-r$(shell git rev-parse HEAD | cut -c1-7)
# but we don't have the git revision in a debian build from sources without .git directory

%:
dh $@
Expand All @@ -27,7 +30,7 @@ endif

override_dh_auto_install:
# install don't allow to rename files (like wars), so we copy here the file we want to install with the package
cp $(CURDIR)/target/ipt-$(CURVERSION).war $(CURDIR)/target/ipt.war
cp $(CURDIR)/target/ipt-$(CURVERSION)-rnull.war $(CURDIR)/target/ipt.war

override_dh_fixperms:
dh_fixperms
Expand Down

0 comments on commit ae4816c

Please sign in to comment.