Skip to content

Commit 01db2df

Browse files
widowido
committed
debian: Copy the 4.2 jar files to the destination directories.
This is FAR from perfect, but it works for now. the VERSION variable returns 4.1 from the debian/changelog file, but in the Maven configuration everything is already set to 4.2 So generated JAR files have 4.2.XX-SNAPSHOT in their name. We probably want to find a better way to match this, extracting the version somewhere out of Maven maybe?
1 parent ca6c1eb commit 01db2df

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎debian/rules‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ install:
6060
# cloudstack-agent
6161
mkdir debian/tmp/etc/cloud/agent
6262
mkdir debian/tmp/var/log/cloudstack/agent
63-
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.1.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-agent/lib/cloudstack-agent-kvm.jar
63+
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-agent/lib/cloudstack-agent-kvm.jar
6464
install -D packaging/debian/init/cloud-agent debian/tmp/etc/init.d/
6565
install -D agent/bindir/cloud-setup-agent.in debian/tmp/usr/bin/cloud-setup-agent
6666
install -D agent/bindir/cloud-ssh.in debian/tmp/usr/bin/cloud-ssh
@@ -80,14 +80,14 @@ install:
8080
mkdir debian/tmp/var/lib/cloud/management
8181
mkdir debian/tmp/var/lib/cloud/mnt
8282
cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/cloudstack-management/setup/
83-
cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* debian/tmp/usr/share/cloudstack-management/webapps/client/
83+
cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/cloudstack-management/webapps/client/
8484
cp server/target/conf/* debian/tmp/etc/cloud/server/
8585
cp client/target/conf/* debian/tmp/etc/cloud/management/
8686
ln -s tomcat6-nonssl.conf debian/tmp/etc/cloud/management/tomcat6.conf
8787
mkdir -p debian/tmp/etc/cloud/management/Catalina/localhost/client
8888
install -D packaging/debian/init/cloud-management debian/tmp/etc/init.d/cloud-management
8989
install -D client/bindir/cloud-update-xenserver-licenses.in debian/tmp/usr/bin/cloud-update-xenserver-licenses
90-
install -D server/target/cloud-server-4.1.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-management/lib/cloudstack-server.jar
90+
install -D server/target/cloud-server-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-management/lib/cloudstack-server.jar
9191
ln -s /usr/share/tomcat6/bin debian/tmp/usr/share/cloudstack-management/bin
9292
ln -s ../../../etc/cloud/management debian/tmp/usr/share/cloudstack-management/conf
9393
ln -s /usr/share/tomcat6/lib debian/tmp/usr/share/cloudstack-management/lib
@@ -109,9 +109,9 @@ install:
109109
install -D client/target/utilities/bin/cloud-set-guest-sshkey debian/tmp/usr/bin
110110
install -D client/target/utilities/bin/cloud-setup-databases debian/tmp/usr/bin
111111
install -D client/target/utilities/bin/cloud-setup-management debian/tmp/usr/bin
112-
install -D console-proxy/dist/systemvm.iso debian/tmp/usr/share/cloudstack-common/vms/systemvm.iso
113-
install -D core/target/cloud-core-4.1.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-core.jar
114-
install -D api/target/cloud-api-4.1.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-api.jar
112+
install -D services/console-proxy/server/dist/systemvm.iso debian/tmp/usr/share/cloudstack-common/vms/systemvm.iso
113+
install -D core/target/cloud-core-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-core.jar
114+
install -D api/target/cloud-api-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-api.jar
115115

116116
# cloudstack-python
117117
mkdir -p debian/tmp/usr/lib/python2.7/dist-packages
@@ -120,7 +120,7 @@ install:
120120
# cloudstack-usage
121121
mkdir debian/tmp/etc/cloud/usage
122122
mkdir debian/tmp/var/log/cloudstack/usage
123-
install -D usage/target/cloud-usage-4.1.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-usage/lib/cloudstack-usage.jar
123+
install -D usage/target/cloud-usage-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-usage/lib/cloudstack-usage.jar
124124
cp usage/target/transformed/* debian/tmp/etc/cloud/usage/
125125
ln -s ../management/db.properties debian/tmp/etc/cloud/usage/db.properties
126126
install -D packaging/debian/init/cloud-usage debian/tmp/etc/init.d

0 commit comments

Comments
 (0)