Changeset 17830

Timestamp:

2008-11-12T14:28:32+13:00 (15 years 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

Location:

release-kits

Files:

• lirk2/installer/build.xml (modified) (2 diffs)
• wirk2/installer/build.xml (modified) (1 diff)

release-kits/lirk2/installer/build.xml

@@ -56 +56 @@
 
         <echo>Filling in concrete values in config files</echo>
-        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
-        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
-        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
+        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg">
+            <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+            <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
+            <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
+        </rsr>
         <echo/>
 
@@ -134 +136 @@
         <echo/>
 
+        <echo>Filling in concrete values in config files</echo>
+        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg">
+            <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+            <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
+            <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
+        </rsr>
+        <echo/>
+
         <echo>Set the installation locale in config files</echo>
         <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>

release-kits/wirk2/installer/build.xml

@@ -215 +215 @@
             <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
         </rsr>
-        <rsr file="${installDir}/gsdlsite.cfg" pattern="@gsdlhome@" replacement="${installDir}"/>
 
         <echo>Create usage.txt</echo>