Changeset 18705 for release-kits

Timestamp:

2009-03-18T13:06:31+13:00 (15 years ago)

Author:

oranfry

Message:

gsdlsite.cfg renamed - updating release kit appropriately, also added missing -r tags in httpd copy

Location:

release-kits

Files:

• mark2/ant-scripts/create-distribution.xml (modified) (1 diff)
• wirk2/ant-scripts/create-distribution.xml (modified) (1 diff)
• wirk2/installer/build.xml (modified) (1 diff)
• wirk2/resources/llssite.cfg (moved) (moved from release-kits/wirk2/resources/gsdlsite.cfg )

release-kits/mark2/ant-scripts/create-distribution.xml

@@ -42 +42 @@
         <delete dir="distributions/web/bin/darwin" />
         <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/apache-httpd distributions/web"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>

release-kits/wirk2/ant-scripts/create-distribution.xml

@@ -43 +43 @@
 
     <target name="drop-in-misc">
-        <echo level="info">Putting the default gsdlsite.cfg at the root of the distribution</echo>
-        <copy todir="${basedir}/distributions/web" file="${wirk2.home}/resources/gsdlsite.cfg" overwrite="true"/>
+        <echo level="info">Putting the default llssite.cfg at the root of the distribution</echo>
+        <copy todir="${basedir}/distributions/web" file="${wirk2.home}/resources/llssite.cfg" overwrite="true"/>
     </target>
     

release-kits/wirk2/installer/build.xml

@@ -91 +91 @@
         <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/windows/library.exe"/>
 
-        <!--Don't need to change these values anymore-->
-<!--        <echo message="Filling in concrete values in config files"/>
-        <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
-        <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>
-        <rsr file="${installDir}/gsdlsite.cfg" pattern="@gsdlhome@" replacement="${installDir}"/>-->
-
         <echo message="Creating installation properties file"/>
         <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>