Changeset 18840

Show
Ignore:
Timestamp:
30.03.2009 15:08:32 (10 years ago)
Author:
oranfry
Message:

changes to get apache into the release and working

Location:
release-kits/lirk2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/compile.xml

    r18765 r18840  
    1717        <antcall target="run-make"/> 
    1818        <antcall target="run-make-install"/> 
     19        <antcall target="run-make-apache-for-dist"/> 
    1920        <antcall target="copy-library-oai"/> 
    2021        <antcall target="strip-execs"/> 
     
    8990    </target> 
    9091 
     92    <target name="run-make-apache-for-dist"> 
     93        <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec> 
     94    </target> 
     95 
     96 
    9197    <target name="copy-library-oai"> 
    9298        <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

    r18703 r18840  
    4242        <delete file="core.comp"/> 
    4343 
    44         <echo message="Installing Servers"/> 
     44        <echo>Installing Servers</echo> 
    4545        <copy tofile="${installDir}/cgi-bin/oaiserver.cgi" file="${installDir}/bin/linux/oaiserver.cgi"/> 
    4646        <copy tofile="${installDir}/cgi-bin/library.cgi" file="${installDir}/bin/linux/library.cgi"/> 
     
    9494 
    9595        <rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/> 
     96 
     97        <echo>Setting up apache web server</echo> 
     98        <exec dir="${installDir}" executable="${installDir}/apache-httpd/linux/install-bindist.sh"> 
     99            <arg value="${installDir}/apache-httpd/linux"/> 
     100        </exec> 
    96101 
    97102        <echo>Creating installation properties file</echo>