Changeset 18870


Ignore:
Timestamp:
04/02/09 10:51:49 (12 years ago)
Author:
oranfry
Message:

sorting out the mess of library and oaiserver being renamed and being needlessly copied around

Location:
release-kits
Files:
9 edited

Legend:

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

    r18840 r18870  
    1818        <antcall target="run-make-install"/>
    1919        <antcall target="run-make-apache-for-dist"/>
    20         <antcall target="copy-library-oai"/>
    2120        <antcall target="strip-execs"/>
    2221
     
    9493    </target>
    9594
    96 
    97     <target name="copy-library-oai">
    98         <exec executable="mv" failonerror="true"><arg line="${basedir}/compiled/cgi-bin/library.cgi ${basedir}/compiled/bin/linux/library.cgi"/></exec>
    99         <exec executable="mv" failonerror="true"><arg line="${basedir}/compiled/cgi-bin/oaiserver.cgi ${basedir}/compiled/bin/linux/oaiserver.cgi"/></exec>
    100     </target>
    101 
    10295    <target name="strip-execs">
    10396        <exec dir="${basedir}/compiled/bin/linux" executable="find" failonerror="true">
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r18849 r18870  
    2727        <delete dir="distributions/web/bin/linux" />
    2828        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/linux distributions/web/bin"/></exec>
     29        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library.cgi compiled/cgi-bin/oaiserver.cgi distributions/web/cgi-bin"/></exec>
    2930        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/apache-httpd distributions/web"/></exec>
    3031        <exec dir="${basedir}" executable="cp"><arg line="compiled/lib/java/build.properties distributions/web/lib/java"/></exec>
  • release-kits/lirk2/installer/build.xml

    r18848 r18870  
    4141        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    4242        <delete file="core.comp"/>
    43 
    44         <echo>Installing Servers</echo>
    45         <copy tofile="${installDir}/cgi-bin/oaiserver.cgi" file="${installDir}/bin/linux/oaiserver.cgi"/>
    46         <copy tofile="${installDir}/cgi-bin/library.cgi" file="${installDir}/bin/linux/library.cgi"/>
    4743
    4844        <echo>Setting Binaries to Executable</echo>
  • release-kits/mark2/ant-scripts/compile.xml

    r18854 r18870  
    1616        <antcall target="run-make-install"/>
    1717        <antcall target="run-make-apache-for-dist"/>
    18         <antcall target="copy-library-oai"/>
    1918        <antcall target="strip-execs"/>
    2019
     
    6261    </target>
    6362
    64     <target name="copy-library-oai">
    65         <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec>
    66         <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec>
    67     </target>
    68 
    6963    <target name="strip-execs">
    7064        <exec dir="${basedir}/compiled/bin/darwin" executable="find">
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r18854 r18870  
    4242        <delete dir="distributions/web/bin/darwin"/>
    4343        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec>
     44        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library.cgi compiled/cgi-bin/oaiserver.cgi distributions/web/cgi-bin"/></exec>
    4445        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/apache-httpd distributions/web"/></exec>
    45         <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
    46         <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
    4746        <exec dir="${basedir}" executable="cp"><arg line="compiled/apache-httpd distributions/web"/></exec>
    4847        <copy file="${basedir}/compiled/bin/java/LuceneWrapper.jar" todir="${basedir}/distributions/web/bin/java" />
  • release-kits/mark2/installer/build.xml

    r18854 r18870  
    3434        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    3535        <delete file="core.comp"/>
    36 
    37         <echo message="Installing Servers"/>
    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"/>
    4036
    4137        <echo message="Setting Binaries to Executable"/>
  • release-kits/wirk2/ant-scripts/compile.xml

    r18531 r18870  
    3939        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" />
    4040        <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/>
    41         <move todir="${basedir}/compiled/bin/windows">
    42             <fileset dir="${basedir}/compiled/cgi-bin" includes="library.exe,oaiserver.exe"/>
    43         </move>
    4441    </target>
    4542   
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r18705 r18870  
    2828            <fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/>
    2929        </copy>
    30         <copy todir="${basedir}/distributions/web" file="${basedir}/compiled/bin/windows/server.exe"/>
     30        <copy todir="distributions/web" file="compiled/bin/windows/server.exe"/>
     31        <copy todir="distributions/web/cgi-bin/library" file="compiled/cgi-bin/library.cgi"/>
     32        <copy todir="distributions/web/cgi-bin/oaiserver" file="compiled/cgi-bin/oaiserver.cgi"/>
    3133       
    3234        <echo level="info">Dropping LuceneWrapper.jar in place</echo>
  • release-kits/wirk2/installer/build.xml

    r18705 r18870  
    8686            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
    8787
    88         <echo message="Installing Servers"/>
    89         <copy todir="${installDir}" file="${installDir}/bin/windows/server.exe"/>
    90         <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/windows/oaiserver.exe"/>
    91         <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/windows/library.exe"/>
    92 
    9388        <echo message="Creating installation properties file"/>
    9489        <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
Note: See TracChangeset for help on using the changeset viewer.