Changeset 16469

Timestamp:

2008-07-18T15:52:52+12:00 (15 years ago)

Author:

oranfry

Message:

binaries werent making it into release, fixed the problem. also, now fills in gsdlhome at install time in gsdlsite.cfg

Location:

release-kits/mark2

Files:

• ant-scripts/create-distribution.xml (modified) (1 diff)
• installer/build.xml (modified) (1 diff)

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

@@ -54 +54 @@
             <echo level="info">Dropping compiled binaries into distribution</echo>
             <delete dir="distributions/web/bin/linux" />
-            <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
+            <delete dir="distributions/web/bin/darwin" />
+            <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
             <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
             <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>

release-kits/mark2/installer/build.xml

@@ -96 +96 @@
         <echo message="Setting Binaries to Executable"/>
         <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/>
-        <chmod dir="${installDir}/bin/linux" includes="*" perm="775"/>
+        <chmod dir="${installDir}/bin/darwin" includes="*" perm="775"/>
         <chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/>
         <chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
+        <echo/>
+
+        <echo message="Filling in concrete values in config files"/>
+        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
         <echo/>