[pkg-eucalyptus-commits] r172 - in eucalyptus/trunk/debian: . source
Rudy Godoy
rudy at alioth.debian.org
Fri Oct 28 15:03:16 UTC 2011
Author: rudy
Date: 2011-10-28 15:03:16 +0000 (Fri, 28 Oct 2011)
New Revision: 172
Added:
eucalyptus/trunk/debian/source/
eucalyptus/trunk/debian/source/format
Modified:
eucalyptus/trunk/debian/rules
Log:
Preliminary changes towards a DebSrc3.0 format.
Modified: eucalyptus/trunk/debian/rules
===================================================================
--- eucalyptus/trunk/debian/rules 2011-08-25 02:24:33 UTC (rev 171)
+++ eucalyptus/trunk/debian/rules 2011-10-28 15:03:16 UTC (rev 172)
@@ -1,45 +1,69 @@
#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+ dh $@
-DEB_DH_INSTALL_ARGS = --list-missing
-
-EUCALYPTUS=/
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-AXIS2_CLASSPATH=$(shell echo $(CURDIR)/clc/lib/*.jar | tr \ :)
-# Axis2 jar classpath for testing.
-#AXIS2_CLASSPATH="$HOME//eucalyptus-src-deps/axis2-1.4"
-
-export EUCALYPTUS
-export JAVA_HOME
-export AXIS2_CLASSPATH
-DEB_MAKE_CLEAN_TARGET := clean
-DEB_CONFIGURE_EXTRA_FLAGS := --with-axis2c=/usr/lib/axis2 --with-axis2c-services=/usr/lib/axis2/services --prefix=$(EUCALYPTUS)
-DEB_DH_SHLIBDEPS_ARGS_ALL = -l/usr/lib/axis2/lib
-
-makebuilddir/eucalyptus-common:: setup-lib
-
-setup-lib:
- @sed -i 's/EUCALYPTUS_HOME//g' tools/client-policy-template.xml
- @sed -i 's/AXIS2C_HOME\/lib/\/usr\/lib\/apache2\/modules/g' tools/httpd.conf
- @sed -i 's/rm -rf generated//g' cluster/Makefile node/Makefile gatherlog/Makefile
- @sed -i 's/patch -p1.*.patch; //g' cluster/Makefile node/Makefile gatherlog/Makefile
-# Makefile are not being patched to allow the build process to generate the stubs on built-time
-# @sed -i 's/.*WSDL2C.*//g' cluster/Makefile node/Makefile gatherlog/Makefile
-
-# Build process doesn't use debian/build-jars to make symlinks, because it triggers a JarIndex error
-# mkdir -p clc/lib && for i in `cat debian/build-jars`; do if [ -e $$i ]; then ln -fsv $$i $(CURDIR)/clc/lib; fi; done
- touch setup-lib
-
-install/eucalyptus-java-common::
- mkdir -p $(DEB_DESTDIR)/usr/share/eucalyptus
- cp -fvL /usr/share/java/antlr.jar $(DEB_DESTDIR)/usr/share/eucalyptus/antlr.jar
-
-install/eucalyptus-common::
- sed -i 's/^FILE=.*$$/FILE="\/etc\/eucalyptus\/eucalyptus.conf"/g' $(DEB_DESTDIR)/usr/sbin/euca_conf
- rm -f $(DEB_DESTDIR)/etc/init.d/eucalyptus
-
-clean::
- rm -rf setup-lib clc/modules/msgs/resources/msgs-binding.xml clc/modules/storage-controller/lib/liblvm2control.so clc/modules/storage-manager/lib/libfsstorage.so clc/modules/www/webapps/root.war node/test_nc node/test config.status clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_LVM2Manager.h clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_AOEManager.h clc/modules/storage-manager/include/edu_ucsb_eucalyptus_storage_fs_FileSystemStorageManager.h cluster/cc-client-policy.xml node/nc-client-policy.xml util/config.h config.log Makedefs
+# Use override_dh_* targets to customize this.
+# ---------------------------------------------------
+# Followings are the old debian/rules
+#
+# #!/usr/bin/make -f
+# # Uncomment this to turn on verbose mode.
+# #export DH_VERBOSE=1
+# #export DH_OPTIONS=-v
+#
+# %:
+# dh $@
+#
+# # Use override_dh_* targets to customize this.
+# # ---------------------------------------------------
+# # Followings are the old debian/rules
+# #
+# # #!/usr/bin/make -f
+# #
+# # include /usr/share/cdbs/1/rules/debhelper.mk
+# # include /usr/share/cdbs/1/class/autotools.mk
+# # #include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# #
+# # DEB_DH_INSTALL_ARGS = --list-missing
+# #
+# # EUCALYPTUS=/
+# # JAVA_HOME=/usr/lib/jvm/default-java
+# # AXIS2_CLASSPATH=$(shell echo $(CURDIR)/clc/lib/*.jar | tr \ :)
+# # # Axis2 jar classpath for testing.
+# # #AXIS2_CLASSPATH="$HOME//eucalyptus-src-deps/axis2-1.4"
+# #
+# # export EUCALYPTUS
+# # export JAVA_HOME
+# # export AXIS2_CLASSPATH
+# # DEB_MAKE_CLEAN_TARGET := clean
+# # DEB_CONFIGURE_EXTRA_FLAGS := --with-axis2c=/usr/lib/axis2 --with-axis2c-services=/usr/lib/axis2/services --prefix=$(EUCALYPTUS)
+# # DEB_DH_SHLIBDEPS_ARGS_ALL = -l/usr/lib/axis2/lib
+# #
+# # makebuilddir/eucalyptus-common:: setup-lib
+# #
+# # setup-lib:
+# # @sed -i 's/EUCALYPTUS_HOME//g' tools/client-policy-template.xml
+# # @sed -i 's/AXIS2C_HOME\/lib/\/usr\/lib\/apache2\/modules/g' tools/httpd.conf
+# # @sed -i 's/rm -rf generated//g' cluster/Makefile node/Makefile gatherlog/Makefile
+# # @sed -i 's/patch -p1.*.patch; //g' cluster/Makefile node/Makefile gatherlog/Makefile
+# # # Makefile are not being patched to allow the build process to generate the stubs on built-time
+# # # @sed -i 's/.*WSDL2C.*//g' cluster/Makefile node/Makefile gatherlog/Makefile
+# #
+# # # Build process doesn't use debian/build-jars to make symlinks, because it triggers a JarIndex error
+# # # mkdir -p clc/lib && for i in `cat debian/build-jars`; do if [ -e $$i ]; then ln -fsv $$i $(CURDIR)/clc/lib; fi; done
+# # touch setup-lib
+# #
+# # install/eucalyptus-java-common::
+# # mkdir -p $(DEB_DESTDIR)/usr/share/eucalyptus
+# # cp -fvL /usr/share/java/antlr.jar $(DEB_DESTDIR)/usr/share/eucalyptus/antlr.jar
+# #
+# # install/eucalyptus-common::
+# # sed -i 's/^FILE=.*$$/FILE="\/etc\/eucalyptus\/eucalyptus.conf"/g' $(DEB_DESTDIR)/usr/sbin/euca_conf
+# # rm -f $(DEB_DESTDIR)/etc/init.d/eucalyptus
+# #
+# # clean::
+# # rm -rf setup-lib clc/modules/msgs/resources/msgs-binding.xml clc/modules/storage-controller/lib/liblvm2control.so clc/modules/storage-manager/lib/libfsstorage.so clc/modules/www/webapps/root.war node/test_nc node/test config.status clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_LVM2Manager.h clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_AOEManager.h clc/modules/storage-manager/include/edu_ucsb_eucalyptus_storage_fs_FileSystemStorageManager.h cluster/cc-client-policy.xml node/nc-client-policy.xml util/config.h config.log Makedefs
Added: eucalyptus/trunk/debian/source/format
===================================================================
--- eucalyptus/trunk/debian/source/format (rev 0)
+++ eucalyptus/trunk/debian/source/format 2011-10-28 15:03:16 UTC (rev 172)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-eucalyptus-commits
mailing list