svn commit: r949853 - in /qpid/trunk/qpid/java: broker/build.xml common/build.xml

[ro...@apache.org]

Author: robbie
Date: Mon May 31 20:15:43 2010
New Revision: 949853

URL: http://svn.apache.org/viewvc?rev=949853&view=rev
Log:
QPID-2526: quote arguments to allow building with spaces in path

Applied patches from Emmanuel Bourg <eb...@apache.org>

Modified:
    qpid/trunk/qpid/java/broker/build.xml
    qpid/trunk/qpid/java/common/build.xml

Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=949853&r1=949852&r2=949853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Mon May 31 20:15:43 2010
@@ -74,7 +74,11 @@
   <target name="gen_logging" depends="compile_velocity,check_velocity_deps" unless="velocity.notRequired">
     <mkdir dir="${generated.dir}"/>
     <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.home}/src" failonerror="true">
-      <arg line="-j -o ${generated.dir} -t ${project.root}/broker/src/velocity/templates/org/apache/qpid/server/logging/messages"/>
+      <arg value="-j"/>
+      <arg value="-o"/>
+      <arg value="${generated.dir}"/>
+      <arg value="-t"/>
+      <arg value="${project.root}/broker/src/velocity/templates/org/apache/qpid/server/logging/messages"/>
       <classpath>
         <pathelement path="${project.root}/broker/src/main/java"/>
         <pathelement path="${velocity.compile.dir}" />

Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=949853&r1=949852&r2=949853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Mon May 31 20:15:43 2010
@@ -30,7 +30,7 @@
   <property name="qpidbuildversion.java" location="${module.precompiled}/org/apache/qpid/QpidBuildVersion.java" />
   <property name="xml.spec.dir" location="${project.root}/../specs" />
   <property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml amqp0-9-1.stripped.xml" />
-  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/amqp0-9-1.stripped.xml" />
+  <property name="xml.spec.list" value='"${xml.spec.dir}/amqp.0-8.xml" "${xml.spec.dir}/amqp.0-9.xml" "${xml.spec.dir}/amqp0-9-1.stripped.xml"' />
   <property name="gentools.timestamp" location="${generated.dir}/gentools.timestamp" />
   <property name="jython.timestamp" location="${generated.dir}/jython.timestamp" />
 
@@ -65,13 +65,13 @@
   <target name="gentools" depends="compile_gentools,check_gentool_deps" unless="gentools.notRequired">
     <mkdir dir="${generated.dir}"/>
     <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
-      <arg line="-j -o ${generated.dir} -t ${project.root}/common/templates ${xml.spec.list}"/>
+      <arg line='-j -o "${generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/>
       <classpath>
         <pathelement path="${gentools.home}/src" />
         <fileset dir="${gentools.home}/lib">
           <include name="**/*.jar"/>
         </fileset>
-	<pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+        <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
         <pathelement path="${gentools.home}/lib/velocity-dep-1.4.jar" />
       </classpath>
     </java>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org