From d07ec18ec175839dcaab427d758f90cd9acd5ca7 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 31 May 2010 20:15:43 +0000
Subject: QPID-2526: quote arguments to allow building with spaces in path

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


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@949853 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/build.xml | 6 +++++-
 java/common/build.xml | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/broker/build.xml b/java/broker/build.xml
index 2401978381..8dd7b1597f 100644
--- a/java/broker/build.xml
+++ b/java/broker/build.xml
@@ -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}" />
diff --git a/java/common/build.xml b/java/common/build.xml
index 69b241b7e6..1ca5913899 100644
--- a/java/common/build.xml
+++ b/java/common/build.xml
@@ -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>
-- 
cgit v1.2.1