Changeset 18840 for release-kits/lirk2

Timestamp:

2009-03-30T15:08:32+13:00 (15 years ago)

Author:

oranfry

Message:

changes to get apache into the release and working

Location:

release-kits/lirk2

Files:

• ant-scripts/compile.xml (modified) (2 diffs)
• installer/build.xml (modified) (2 diffs)

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

@@ -17 +17 @@
         <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"/>
@@ -89 +90 @@
     </target>
 
+    <target name="run-make-apache-for-dist">
+        <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>
+    </target>
+
+
     <target name="copy-library-oai">
         <exec executable="mv" failonerror="true"><arg line="${basedir}/compiled/cgi-bin/library.cgi ${basedir}/compiled/bin/linux/library.cgi"/></exec>

release-kits/lirk2/installer/build.xml

@@ -42 +42 @@
         <delete file="core.comp"/>
 
-        <echo message="Installing Servers"/>
+        <echo>Installing Servers</echo>
         <copy tofile="${installDir}/cgi-bin/oaiserver.cgi" file="${installDir}/bin/linux/oaiserver.cgi"/>
         <copy tofile="${installDir}/cgi-bin/library.cgi" file="${installDir}/bin/linux/library.cgi"/>
@@ -94 +94 @@
 
         <rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/>
+
+        <echo>Setting up apache web server</echo>
+        <exec dir="${installDir}" executable="${installDir}/apache-httpd/linux/install-bindist.sh">
+            <arg value="${installDir}/apache-httpd/linux"/>
+        </exec>
 
         <echo>Creating installation properties file</echo>