Changeset 17437

Show
Ignore:
Timestamp:
01.10.2008 16:49:25 (11 years ago)
Author:
oranfry
Message:

changes to the way binaries are stored in the cgi-bin and bin/(os) directories

Location:
release-kits
Files:
7 modified

Legend:

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

    r17422 r17437  
    9191 
    9292    <target name="copy-library-oai"> 
    93         <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec> 
    94         <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec> 
     93        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec> 
     94        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec> 
    9595    </target> 
    9696 
  • release-kits/lirk2/installer/build.xml

    r17396 r17437  
    3838        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
    3939        <delete file="core.comp"/> 
     40 
     41        <echo message="Installing Servers"/> 
     42        <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/linux/oaiserver"/> 
     43        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/linux/library"/> 
     44 
    4045 
    4146        <echo>Setting Binaries to Executable</echo> 
  • release-kits/mark2/ant-scripts/compile.xml

    r17422 r17437  
    5959 
    6060    <target name="copy-library-oai"> 
    61         <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec> 
    62         <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec> 
     61        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec> 
     62        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec> 
    6363    </target> 
    6464 
  • release-kits/mark2/installer/build.xml

    r17422 r17437  
    6363        <echo/> 
    6464 
     65        <echo message="Installing Servers"/> 
     66        <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/darwin/oaiserver"/> 
     67        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/darwin/library"/> 
     68 
    6569        <echo message="Setting Binaries to Executable"/> 
    6670        <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/> 
  • release-kits/wirk2/ant-scripts/compile.xml

    r17418 r17437  
    5151        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/> 
    5252        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" /> 
    53         <copy file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/> 
     53        <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/> 
    5454        <move todir="${basedir}/gsdl/bin/windows"> 
    5555            <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/> 
  • release-kits/wirk2/ant-scripts/create-components.xml

    r17428 r17437  
    4444                 
    4545                    <!-- exclude imagemagick --> 
    46                     <exclude name="bin/windows/imagemagick/**/*"/> 
     46                    <exclude name="bin/windows/imagemagick"/> 
    4747 
    4848                    <!-- exclude ghostscript --> 
    49                     <exclude name="bin/windows/ghostscript/**/*"/> 
     49                    <exclude name="bin/windows/ghostscript"/> 
    5050 
    5151                    <!-- exclude sourcecode --> 
    52                     <exclude name="common-src/**/*"/> 
    53                     <exclude name="runtime-src/**/*"/> 
    54                     <exclude name="build-src/**/*"/> 
     52                    <exclude name="common-src"/> 
     53                    <exclude name="runtime-src"/> 
     54                    <exclude name="build-src"/> 
    5555                     
    5656                </fileset> 
  • release-kits/wirk2/installer/build.xml

    r17436 r17437  
    7878            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/> 
    7979 
    80         <!-- delete unneeded files -->       
    81         <echo message="Deleting some unneeded files"/> 
    82         <delete dir="${installDir}/resources/icons"/> 
    83         <delete file="${installDir}/resources/*.png"/> 
     80        <echo message="Installing Servers"/> 
     81        <copy todir="${installDir}" file="${installDir}/bin/windows/server.exe"/> 
     82        <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/windows/oaiserver.exe"/> 
     83        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/windows/library.exe"/> 
    8484 
    8585        <echo message="Filling in concrete values in config files"/>