Changeset 17608

Show
Ignore:
Timestamp:
24.10.2008 16:17:14 (11 years ago)
Author:
oranfry
Message:

fixes to make mark in sync with lirk

Location:
release-kits/mark2
Files:
2 modified

Legend:

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

    r17597 r17608  
    1616        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1717            <fileset dir="${mark2.home}/greenstone2/installer-classes"/> 
    18             <fileset file="${basedir}/distributions/web/LICENCE.txt" />  
     18            <fileset file="${basedir}/distributions/web/LICENSE.txt" />  
    1919        </copy> 
    2020 
     
    2525        <delete dir="${basedir}/installer/classes/META-INF"/> 
    2626 
     27        <unjar src="${mark2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/> 
     28        <delete dir="${basedir}/installer/classes/META-INF"/> 
     29 
    2730    </target> 
    2831 
  • release-kits/mark2/installer/build.xml

    r17597 r17608  
    3333        <mkdir dir="${installDir}"/> 
    3434 
    35         <!-- install files --> 
    36         <echo message="Installing Core System"/> 
    37         <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    38             <patternset> 
    3935 
    40                 <include name="gli/**/*"/> 
    41                 <include name="bin/**/*"/> 
    42                 <include name="cgi-bin/**/*"/> 
    43                 <include name="etc/**/*"/> 
    44                 <include name="mappings/**/*"/> 
    45                 <include name="images/**/*"/> 
    46                 <include name="perllib/**/*"/> 
    47                 <include name="indexers/**/*"/> 
    48                 <include name="macros/**/*"/> 
    49                 <include name="collect/**/*"/> 
    50  
    51                 <include name="Install.sh"/> 
    52                 <include name="setup.bash"/> 
    53                 <include name="setup.csh"/> 
    54                 <include name="LICENSE.txt"/> 
    55                 <include name="READMEar.txt"/> 
    56                 <include name="READMEen.txt"/> 
    57                 <include name="READMEes.txt"/> 
    58                 <include name="READMEfr.txt"/> 
    59                 <include name="READMEes.txt"/> 
    60                 <include name="Support.htm"/> 
    61                 <include name="Uninstall.jar"/> 
    62             </patternset> 
    63         </unzip> 
    64         <echo/> 
     36        <echo>Installing Core Files</echo> 
     37        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip> 
     38        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/> 
     39        <delete file="core.lzma"/> 
     40        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
     41        <delete file="core.comp"/> 
    6542 
    6643        <echo message="Installing Servers"/> 
     
    11390    <target name="Installing Source Code" depends=""> 
    11491        <echo message="Installing Source Code"/> 
    115         <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    116             <patternset> 
    117                 <include name="common-src/**/*"/> 
    118                 <include name="runtime-src/**/*"/> 
    119                 <include name="build-src/**/*"/> 
    120                 <include name="packages/**/*"/> 
    121             </patternset> 
    122         </unzip> 
     92        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip> 
     93        <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/> 
     94        <delete file="sourcecode.lzma"/> 
     95        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/> 
     96        <delete file="sourcecode.comp"/> 
     97 
    12398    </target> 
    12499