From eb28cbca63eaa6456c66fb1be4c213d6467485fd Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Wed, 11 Aug 2010 16:23:46 -0700
Subject: [PATCH] more crap to fix git

---
 build.xml              | 19 +++++++++----------
 build/build-common.xml |  1 +
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index d88e2adc9bf..17fa54c3cbc 100755
--- a/build.xml
+++ b/build.xml
@@ -18,11 +18,11 @@
     <property file="${build-cloud.properties.file}"/>
 	
 	<property name="premium.name" value="cloudstack-proprietary"/>
-	<property name="premium.dir" location="${base.dir}/${premium.name}"/> 
+	<property name="premium.base.dir" location="${base.dir}/${premium.name}"/> 
 	
-    <condition property="build.dir" value="${base.dir}/build" else="${premium.dir}/build"> <!-- silly no-op -->
+    <condition property="my.build.dir" value="${premium.base.dir}/build" else="${base.dir}/build"> 
       <and>
-        <available file="${premium.dir}/build"/>
+        <available file="${premium.base.dir}/build"/>
         <not>
           <isset property="OSS"/>
         </not>
@@ -33,10 +33,9 @@
     <property name="dist.dir" location="${base.dir}/dist"/>
     <property name="target.dir" location="${base.dir}/target"/>
 
-    <import file="${build.dir}/build-cloud.xml" optional="false"/>
-    <import file="${build.dir}/build-docs.xml" optional="true"/>
-    <import file="${build.dir}/build-test.xml" optional="true"/>
-    <import file="${build.dir}/package.xml" optional="true"/>
-    <import file="${build.dir}/developer.xml" optional="true"/>
-  
-</project>
\ No newline at end of file
+    <import file="${my.build.dir}/build-cloud.xml" optional="false"/>
+    <import file="${my.build.dir}/build-docs.xml" optional="true"/>
+    <import file="${my.build.dir}/build-test.xml" optional="true"/>
+    <import file="${my.build.dir}/package.xml" optional="true"/> 
+    <import file="${my.build.dir}/developer.xml" optional="true"/>
+</project>
diff --git a/build/build-common.xml b/build/build-common.xml
index ae2f814f1bd..2131093314e 100755
--- a/build/build-common.xml
+++ b/build/build-common.xml
@@ -44,6 +44,7 @@
         
       <depend srcdir="@{top.dir}/src" destdir="${classes.dir}/@{jar.name}" cache="${dep.cache.dir}" />
         
+   	  <echo message="Compiling @{top.dir}/src"/>
       <javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6">
         <!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ -->
         <!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ -->