Changeset 18854 for release-kits

Timestamp:

2009-04-01T10:46:02+13:00 (15 years ago)

Author:

oranfry

Message:

getting apache going for mac too

Location:

release-kits/mark2

Files:

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

release-kits/mark2/ant-scripts/compile.xml

@@ -15 +15 @@
         <antcall target="run-make"/>
         <antcall target="run-make-install"/>
+        <antcall target="run-make-apache-for-dist"/>
         <antcall target="copy-library-oai"/>
         <antcall target="strip-execs"/>
@@ -57 +58 @@
     </target>
 
+    <target name="run-make-apache-for-dist">
+        <exec dir="${basedir}/compiled" executable="make"><arg value="apache-for-dist"/></exec>
+    </target>
+
     <target name="copy-library-oai">
         <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec>

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

@@ -39 +39 @@
     <target name="drop-in-binaries">
         <echo level="info">Dropping compiled binaries into distribution</echo>
-        <delete dir="distributions/web/bin/linux" />
-        <delete dir="distributions/web/bin/darwin" />
+        <delete dir="distributions/web/bin/linux"/>
+        <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>

release-kits/mark2/installer/build.xml

@@ -36 +36 @@
 
         <echo message="Installing Servers"/>
-        <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/darwin/oaiserver"/>
-        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/darwin/library"/>
+        <copy tofile="${installDir}/cgi-bin/oaiserver.cgi" file="${installDir}/bin/darwin/oaiserver.cgi"/>
+        <copy tofile="${installDir}/cgi-bin/library.cgi" file="${installDir}/bin/darwin/library.cgi"/>
 
         <echo message="Setting Binaries to Executable"/>
@@ -47 +47 @@
         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
         <chmod dir="${installDir}/apache-httpd/darwin/bin" includes="*" perm="775"/>
+        <chmod dir="${installDir}/apache-httpd/darwin" includes="*.sh" perm="775"/>
         <echo/>
 
@@ -73 +74 @@
         <delete dir="${installDir}/resources/icons"/>
         <delete file="${installDir}/resources/*.png"/>
+
+        <echo>Setting up apache web server</echo>
+        <exec dir="${installDir}" executable="${installDir}/apache-httpd/darwin/install-bindist.sh">
+            <arg value="${installDir}/apache-httpd/darwin"/>
+        </exec>
 
         <echo>Creating installation properties file</echo>