Skip to content

Commit 2b47611

Browse files
spark404spark404
committed
Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging to use the -SNAPSHOT extension for maven targets
1 parent 2621602 commit 2b47611

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎debian/changelog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cloudstack (4.3.0) unstable; urgency=low
1+
cloudstack (4.3.0-snapshot) unstable; urgency=low
22

33
* Update the version to 4.3.0.snapshot
44

‎debian/rules‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
1414
VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
15+
MVNADD := $(shell if echo '$(DEBVERS)' | grep -q snapshot; then echo -SNAPSHOT; fi )
1516
PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
1617
SYSCONFDIR = "/etc"
1718
DESTDIR = "debian/tmp"
@@ -65,8 +66,8 @@ install:
6566
mkdir $(DESTDIR)/var/log/$(PACKAGE)/agent
6667
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent
6768
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins
68-
install -D agent/target/cloud-agent-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
69-
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
69+
install -D agent/target/cloud-agent-$(VERSION)$(MVNADD) $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
70+
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
7071
install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
7172
install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
7273
install -D agent/target/transformed/cloud-setup-agent $(DESTDIR)/usr/bin/cloudstack-setup-agent
@@ -92,7 +93,7 @@ install:
9293
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management
9394
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt
9495
cp -r client/target/utilities/scripts/db/* $(DESTDIR)/usr/share/$(PACKAGE)-management/setup/
95-
cp -r client/target/cloud-client-ui-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
96+
cp -r client/target/cloud-client-ui-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
9697
cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
9798
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
9899

@@ -145,7 +146,7 @@ install:
145146
mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage
146147
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage
147148
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins
148-
install -D usage/target/cloud-usage-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
149+
install -D usage/target/cloud-usage-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
149150
install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
150151
cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
151152
cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
@@ -158,7 +159,7 @@ install:
158159
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
159160
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
160161
ln -s /usr/share/$(PACKAGE)-bridge/webapps/awsapi $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080/awsapi
161-
cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
162+
cp -r awsapi/target/cloud-awsapi-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
162163
install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge
163164
install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register
164165
cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup

0 commit comments

Comments
 (0)