cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: updated refs/heads/4.1 to 3eeaff0
Date Thu, 25 Apr 2013 17:31:45 GMT
Updated Branches:
  refs/heads/4.1 41e6e9f30 -> 3eeaff03e


CLOUDSTACK-2190: Syncing AWSAPI packaging from master to 4.1

Signed-off-by: Chip Childers <chip.childers@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3eeaff03
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3eeaff03
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3eeaff03

Branch: refs/heads/4.1
Commit: 3eeaff03ec865b94f3fc161f5416da63cf59fc14
Parents: 41e6e9f
Author: Chip Childers <chip.childers@gmail.com>
Authored: Thu Apr 25 17:16:32 2013 +0100
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Thu Apr 25 17:16:32 2013 +0100

----------------------------------------------------------------------
 debian/rules |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3eeaff03/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index ad82cc5..d7222a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ build: build-indep
 build-indep: build-indep-stamp
 
 build-indep-stamp: configure
-	mvn package -DskipTests -Dsystemvm \
+	mvn package -Pawsapi -DskipTests -Dsystemvm \
         -Dcs.replace.properties=replace.properties.tmp \
 		${ACS_BUILD_OPTS}
 	touch $@
@@ -148,7 +148,25 @@ install:
 	install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
 
 	# cloudstack-awsapi
+	mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/awsapi
 	mkdir $(DESTDIR)/var/log/$(PACKAGE)/awsapi
+	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge
+	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
+	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
+	cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
+	install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge
+	install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register
+	cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
+	for i in applicationContext.xml cloud-bridge.properties commons-logging.properties crypto.properties
xes.keystore ec2-service.properties; do \
+	        mv $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/$$i $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/;
\
+	done
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/db.properties
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/services.xml
+	rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/META-INF
 
 	dh_installdirs
 	dh_install


Mime
View raw message