[pkg-eucalyptus-commits] r135 - eucalyptus/trunk/debian

[Rudy Godoy]

Author: rudy
Date: 2011-08-22 18:48:26 +0000 (Mon, 22 Aug 2011)
New Revision: 135

Modified:
   eucalyptus/trunk/debian/rules
Log:
- Build process is allowed to generate stubs on build-time. So it doesn't fail on the tools/add_marshaling.pl script.
- debian/build-jars is not used for symlink to system-wide Java libs. Doing so triggers and error for JarIndex 
  which is still hard to debug but apparently is related to groovy's version. Now the package builds correctly 
  from source.


Modified: eucalyptus/trunk/debian/rules
===================================================================
--- eucalyptus/trunk/debian/rules	2011-08-21 07:56:10 UTC (rev 134)
+++ eucalyptus/trunk/debian/rules	2011-08-22 18:48:26 UTC (rev 135)
@@ -9,6 +9,8 @@
 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
@@ -24,8 +26,11 @@
 	@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
-	@sed -i 's/.*WSDL2C.*//g' cluster/Makefile node/Makefile gatherlog/Makefile
-	mkdir -p clc/lib && for i in `cat debian/build-jars`; do if [ -e $$i ]; then ln -fsv $$i $(CURDIR)/clc/lib; fi; done
+# 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::