Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: widodh@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 25 Sep 2013 10:29:22 -0000
Message-Id: <be5ed458db204ad4afebe69e7d658e1b@git.apache.org>
In-Reply-To: <74771eb5b1e24edb9ecf13cb5701714f@git.apache.org>
References: <74771eb5b1e24edb9ecf13cb5701714f@git.apache.org>
Subject: [27/59] [abbrv] git commit: updated refs/heads/disk-cache to bbae6f8

Update the INSTALL.md file with the changed noredist flag.

And fix a few old entries


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

Branch: refs/heads/disk-cache
Commit: e209a2ce8a0e2645157932d6cd9073065c6a35ae
Parents: 4d461d5
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Wed Sep 18 19:35:05 2013 +0800
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Sep 21 12:32:09 2013 +0800

----------------------------------------------------------------------
 INSTALL.md | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e209a2ce/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index 37415dc..47fd2e6 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -96,23 +96,20 @@ Clean and build:
 
     $ mvn clean install -P systemvm,developer
 
-In case you want support for VMWare, SRX and other non-Apache (referred to as nonoss)
-compliant libs, you may download the following jar artifacts from respective vendors:
+CloudStack supports several plugins that depend on libraries with distribution restrictions. 
+Because of this they are not included in the default build. Enable these additional plugins 
+activate their respective profiles. For convenience adding -Dnoredist will enable all plugins
+that depend on libraries with distribution restrictions. The build procedure expects that the 
+required libraries are present in the maven repository. 
 
-     deps/cloud-iControl.jar
-     deps/cloud-manageontap.jar
-     deps/cloud-netscaler-sdx.jar
-     deps/cloud-netscaler.jar
-     deps/vmware-apputils.jar
-     deps/vmware-vim.jar
-     deps/vmware-vim25.jar
-
-Install them to ~/.m2 so maven can get them as dependencies:
+The following procedure can be used to add the libraries to the local maven repository. Details 
+on obtaining the required libraries can be found in this file. Note that this will vary between
+releases of cloudstack
 
     $ cd deps
     $ ./install-non-oss.sh
 
-To build with nonoss components, use the build command with the nonoss flag:
+To build all non redistributable components, add the noredist flag to the build command:
 
     $ mvn clean install -P systemvm,developer -Dnonoss
 
@@ -153,7 +150,7 @@ This section describes packaging and installation.
 
 To create debs:
 
-    $ mvn -P deps # -D nonoss, for nonoss as described in the "Building" section above
+    $ mvn -P deps # -D noredist, for noredist as described in the "Building" section above
     $ dpkg-buildpackage
 
 All the deb packages will be created in ../$PWD
@@ -183,15 +180,15 @@ Install needed packages, apt-get upgrade for upgrading:
 
 To create rpms:
 
-    $ mvn -P deps # -D nonoss, for nonoss as described in the "Building" section above
-    $ ./waf rpm
+    $ cd packaging/centos63
+    $ bash packaging.sh [ -p NOREDIST ]
 
-All the rpm packages will be create in artifacts/rpmbuild/RPMS/x86_64
+All the rpm packages will be create in dist/rpmbuild/RPMS/x86_64
 
 To create a yum repo: (assuming appropriate user privileges)
 
     $ path=/path/to/your/webserver/cloudstack
-    $ cd artifacts/rpmbuild/RPMS/x86_64
+    $ cd dist/rpmbuild/RPMS/x86_64
     $ mv *.rpm $path
     $ createrepo $path
 
@@ -208,10 +205,10 @@ Installation:
 Install needed packages:
 
     $ yum update
-    $ yum install cloud-client                       # management server
+    $ yum install cloudstack-management                       # management server
     $ yum install mysql-server                       # mysql server
-    $ yum install cloud-agent                        # agent (kvm)
-    $ yum install cloud-usage                        # usage server
+    $ yum install cloudstack-agent                        # agent (kvm)
+    $ yum install cloudstack-usage                        # usage server
 
 ## Installing CloudMonkey CLI