Changeset 5733


Ignore:
Timestamp:
12/10/09 00:33:16 (10 years ago)
Author:
curtis
Message:

Fix a problem with source tree paths containing spaces.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/common.xml

    r5551 r5733  
    3939        <exec executable="svn" outputproperty="svn.log" 
    4040          failifexecutionfails="false"> 
    41           <arg line="info ${basedir}"/> 
     41          <arg line="info &quot;${basedir}&quot;"/> 
    4242        </exec> 
    4343        <if> 
     
    5858    <exec executable="svn" outputproperty="release.version" 
    5959      failifexecutionfails="false"> 
    60       <arg line="info ${basedir}"/> 
     60      <arg line="info &quot;${basedir}&quot;"/> 
    6161    </exec> 
    62     <propertyregex property="svn.root" input="${release.version}" select="\1"> 
    63       <regexp pattern="Repository Root: (.*)"/> 
    64     </propertyregex> 
    65     <propertyregex property="release.version" override="true" 
    66       input="${release.version}" select="\1"> 
    67       <regexp pattern="URL: ${svn.root}/(.*)/components/(.*)"/> 
    68     </propertyregex> 
    69     <propertyregex property="release.version" override="true" 
    70       input="${release.version}" regexp="branches/(.*)" replace="stable \1" 
    71       defaultValue="trunk"/> 
     62    <if> 
     63      <isset property="release.version"/> 
     64      <then> 
     65        <propertyregex property="svn.root" 
     66          input="${release.version}" select="\1"> 
     67          <regexp pattern="Repository Root: (.*)"/> 
     68        </propertyregex> 
     69        <propertyregex property="release.version" override="true" 
     70          input="${release.version}" select="\1"> 
     71          <regexp pattern="URL: ${svn.root}/(.*)/components/(.*)"/> 
     72        </propertyregex> 
     73        <propertyregex property="release.version" override="true" 
     74          input="${release.version}" regexp="branches/(.*)" replace="stable \1" 
     75          defaultValue="trunk"/> 
     76        <echo>Release version: ${release.version}</echo><!--TEMP--> 
     77        <!--<echo>Release version: ${release.version}</echo>--> 
     78      </then> 
     79    </if> 
    7280  </target> 
    7381 
Note: See TracChangeset for help on using the changeset viewer.