Changeset 19666

Show
Ignore:
Timestamp:
29.05.2009 12:21:36 (10 years ago)
Author:
oranfry
Message:

fixed code to propagate server.default.servlet property

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r19662 r19666  
    2424        <echo level="info">Install Flax? (install.flax): ${install.flax}</echo> 
    2525 
    26         <property name="server.default.servlet" value="false"/> 
    27         <echo level="info">Greenstone3 default servlet? (server.default.servlet): ${server.default.servlet}</echo> 
     26        <if><bool><isset property="server.default.servlet"/></bool> 
     27            <echo level="info">default servlet: (server.default.servlet): ${server.default.servlet}</echo> 
     28        </if> 
    2829 
    2930        </target> 
     
    3435            <rsr file="${greenstone3.basedir}/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/> 
    3536        </if> 
    36         <if><bool><isset property="${server.default.servlet}"/></bool> 
    37             <rsr file="${greenstone3.basedir}/build.properties" pattern="^#server.default.servlet\s*[=:].*" replacement="server.default.servlet=${server.default.servlet}"/> 
     37        <if><bool><isset property="server.default.servlet"/></bool> 
     38            <rsr file="${greenstone3.basedir}/build.properties" pattern="^#?server.default.servlet\s*[=:].*" replacement="server.default.servlet=${server.default.servlet}"/> 
    3839        </if> 
    3940    </target>