Changeset 18854

Show
Ignore:
Timestamp:
01.04.2009 10:46:02 (10 years ago)
Author:
oranfry
Message:

getting apache going for mac too

Location:
release-kits/mark2
Files:
3 modified

Legend:

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

    r18666 r18854  
    1515        <antcall target="run-make"/> 
    1616        <antcall target="run-make-install"/> 
     17        <antcall target="run-make-apache-for-dist"/> 
    1718        <antcall target="copy-library-oai"/> 
    1819        <antcall target="strip-execs"/> 
     
    5758    </target> 
    5859 
     60    <target name="run-make-apache-for-dist"> 
     61        <exec dir="${basedir}/compiled" executable="make"><arg value="apache-for-dist"/></exec> 
     62    </target> 
     63 
    5964    <target name="copy-library-oai"> 
    6065        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec> 
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r18705 r18854  
    3939    <target name="drop-in-binaries"> 
    4040        <echo level="info">Dropping compiled binaries into distribution</echo> 
    41         <delete dir="distributions/web/bin/linux" /> 
    42         <delete dir="distributions/web/bin/darwin" /> 
     41        <delete dir="distributions/web/bin/linux"/> 
     42        <delete dir="distributions/web/bin/darwin"/> 
    4343        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec> 
    4444        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/apache-httpd distributions/web"/></exec> 
  • release-kits/mark2/installer/build.xml

    r18847 r18854  
    3636 
    3737        <echo message="Installing Servers"/> 
    38         <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/darwin/oaiserver"/> 
    39         <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/darwin/library"/> 
     38        <copy tofile="${installDir}/cgi-bin/oaiserver.cgi" file="${installDir}/bin/darwin/oaiserver.cgi"/> 
     39        <copy tofile="${installDir}/cgi-bin/library.cgi" file="${installDir}/bin/darwin/library.cgi"/> 
    4040 
    4141        <echo message="Setting Binaries to Executable"/> 
     
    4747        <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/> 
    4848        <chmod dir="${installDir}/apache-httpd/darwin/bin" includes="*" perm="775"/> 
     49        <chmod dir="${installDir}/apache-httpd/darwin" includes="*.sh" perm="775"/> 
    4950        <echo/> 
    5051 
     
    7374        <delete dir="${installDir}/resources/icons"/> 
    7475        <delete file="${installDir}/resources/*.png"/> 
     76 
     77        <echo>Setting up apache web server</echo> 
     78        <exec dir="${installDir}" executable="${installDir}/apache-httpd/darwin/install-bindist.sh"> 
     79            <arg value="${installDir}/apache-httpd/darwin"/> 
     80        </exec> 
    7581 
    7682        <echo>Creating installation properties file</echo>