greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17830

Show
Ignore:
Timestamp:
2008-11-12 14:28:32 (2 months ago)
Author:
oranfry
Message:

in wirk2 source release, dont try to modify gsdlsite.cfg in install root as it doesnt exist. For lirk2 source release, do modify cgi-bin/gsdlsite.cfg as it does exist

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/lirk2/installer/build.xml

    r17812 r17830  
    5656 
    5757                <echo>Filling in concrete values in config files</echo> 
    58                 <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
    59                 <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
    60                 <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
     58                <rsr file="${installDir}/cgi-bin/gsdlsite.cfg"> 
     59                        <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
     60                        <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
     61                        <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
     62                </rsr> 
    6163                <echo/> 
    6264 
    …… 
    134136                <echo/> 
    135137 
     138                <echo>Filling in concrete values in config files</echo> 
     139                <rsr file="${installDir}/cgi-bin/gsdlsite.cfg"> 
     140                        <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
     141                        <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
     142                        <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
     143                </rsr> 
     144                <echo/> 
     145 
    136146                <echo>Set the installation locale in config files</echo> 
    137147                <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/> 

  • release-kits/wirk2/installer/build.xml

    r17815 r17830  
    215215                        <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
    216216                </rsr> 
    217                 <rsr file="${installDir}/gsdlsite.cfg" pattern="@gsdlhome@" replacement="${installDir}"/> 
    218217 
    219218                <echo>Create usage.txt</echo>