Permalink
Browse files

merge parent

  • Loading branch information...
2 parents 0440dc0 + c404000 commit 1409eaf4f13c2a68f4848a35761b6b8c4bc881e4 @grze grze committed Apr 20, 2011
Showing with 600 additions and 2,605 deletions.
  1. +1 −0 Makedefs.in
  2. +9 −0 clc/Makefile
  3. +2 −1 clc/build.xml
  4. +41 −0 clc/eucadmin/Makefile
  5. +164 −48 clc/eucadmin/bin/{euca_conf → euca_conf.in}
  6. +0 −82 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/__init__.py
  7. +0 −206 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/clusters.py
  8. +0 −82 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/command.py
  9. +0 −246 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/components.py
  10. +0 −72 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/generic.py
  11. +0 −121 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/groups.py
  12. +0 −74 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/heartbeat.py
  13. +0 −108 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/hypervregister.py
  14. +0 −177 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/properties.py
  15. +0 −198 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/storagecontrollers.py
  16. +0 −139 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/synckeys.py
  17. +0 −173 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/users.py
  18. +0 −190 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/walruses.py
  19. +0 −11 clc/eucadmin/build/scripts-2.6/euca-add-user
  20. +0 −11 clc/eucadmin/build/scripts-2.6/euca-add-user-group
  21. +0 −11 clc/eucadmin/build/scripts-2.6/euca-delete-user
  22. +0 −11 clc/eucadmin/build/scripts-2.6/euca-delete-user-group
  23. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-cluster
  24. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-storage-controller
  25. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-walrus
  26. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-clusters
  27. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-components
  28. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-properties
  29. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-services
  30. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-storage-controllers
  31. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-user-groups
  32. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-users
  33. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-walruses
  34. +0 −21 clc/eucadmin/build/scripts-2.6/euca-get-credentials
  35. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-cluster
  36. +0 −12 clc/eucadmin/build/scripts-2.6/euca-modify-property
  37. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-storage-controller
  38. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-walrus
  39. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-cluster
  40. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-storage-controller
  41. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-walrus
  42. +0 −160 clc/eucadmin/build/scripts-2.6/euca_conf
  43. +1 −1 clc/eucadmin/eucadmin/enable.py
  44. +2 −1 clc/eucadmin/eucadmin/eucasetup.py
  45. +21 −11 clc/eucadmin/eucadmin/getcredentials.py
  46. +26 −2 clc/eucadmin/eucadmin/modifypropertyvalue.py
  47. +8 −8 clc/eucadmin/eucadmin/registerstoragecontroller.py
  48. +8 −8 clc/eucadmin/eucadmin/registervmwarebroker.py
  49. +8 −8 clc/eucadmin/eucadmin/registerwalrus.py
  50. +3 −3 clc/eucadmin/eucadmin/synckeys.py
  51. +2 −0 clc/eucadmin/setup.cfg.in
  52. +2 −10 clc/eucadmin/setup.py
  53. +4 −4 clc/modules/bootstrap/src/main/native/arguments.ggo
  54. +242 −191 configure
  55. +13 −1 configure.ac
  56. +2 −2 tools/Makefile
  57. +41 −14 tools/lictool.pl
View
@@ -47,6 +47,7 @@ ANT = @ANT@ -e
WSDL2C = @WSDL2C@
JAVA_HOME = @JAVA_HOME@
RM = @RM@
+PYTHON_BIN = @PYTHON_BIN@
# compile time configurations
euca_theme = @INTERFACE_THEME@
View
@@ -56,6 +56,7 @@ build: deps extras
@make -C modules/storage-controller/native
@make -C modules/storage-san/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
build-test: deps extras
@# we need JAVA_HOME
@@ -71,6 +72,7 @@ build-test: deps extras
@make -C modules/storage-controller/native
@make -C modules/storage-san/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
build-test: deps extras
@# we need JAVA_HOME
@@ -85,35 +87,41 @@ build-test: deps extras
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) jar
@make -C modules/storage-controller/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
clean:
$(ANT) clean
make -C modules/bootstrap/src/main/native clean
make -C modules/storage-controller/native clean
make -C modules/storage-san/native clean
+ make -C eucadmin clean
distclean: clean
$(ANT) distclean
make -C modules/bootstrap/src/main/native distclean
make -C modules/storage-controller/native distclean
make -C modules/storage-san/native distclean
+ make -C eucadmin distclean
install-test: build-test
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
install: build
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/storage-san/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
install-test: build-test
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/storage-san/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
deploy: install
@@ -122,6 +130,7 @@ uninstall:
make -C modules/storage-controller/native uninstall
make -C modules/storage-san/native uninstall
make -C modules/bootstrap/src/main/native uninstall
+ make -C eucadmin uninstall
$(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
$(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
$(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps
View
@@ -286,13 +286,14 @@
<exclude name="**/gwt-user-*.jar" />
</fileset>
</copy>
- <!--copy admin tools -->
<mkdir dir="${DESTDIR}${euca.bin.dir}" />
+ <!--copy admin tools
<copy todir="${DESTDIR}${euca.bin.dir}" overwrite="true">
<fileset dir="${tools.dir}">
<include name="**/*" />
</fileset>
</copy>
+ -->
<chmod dir="${DESTDIR}${euca.bin.dir}" perm="0755">
<include name="**/euca-*" />
</chmod>
View
@@ -0,0 +1,41 @@
+###############################################################################
+# Copyright (c) 2009 Eucalyptus Systems, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, only version 3 of the License.
+#
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact Eucalyptus Systems, Inc., 130 Castilian
+# Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+# if you need additional information or have any questions.
+#
+###############################################################################
+# Author: Chris Grzegorczyk grze@eucalyptus.com
+###############################################################################
+include ../../Makedefs
+
+all: euca_admin
+build: euca_admin
+
+euca_admin:
+ $(PYTHON_BIN) setup.py build
+
+install: euca_admin
+ $(PYTHON_BIN) setup.py install
+
+clean:
+ @$(RM) -fr ./dist
+
+distclean: clean
+
+uninstall:
+ @echo uninstall
Oops, something went wrong.

0 comments on commit 1409eaf

Please sign in to comment.