greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17609

Show
Ignore:
Timestamp:
2008-10-24 16:17:28 (3 months ago)
Author:
oranfry
Message:

fixes to make mark in sync with lirk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/mark3/ant-scripts/create-installer.xml

    r17597 r17609  
    1515                <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616                        <fileset dir="${mark3.home}/greenstone3/installer-classes"/> 
    17                         <fileset file="${basedir}/distribution/greenstone3/LICENCE.txt" />  
     17                        <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt" />  
    1818                </copy> 
    1919                <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
    2020                <delete dir="${basedir}/installer/classes/META-INF"/> 
     21 
     22                <unjar src="${mark3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/> 
     23                <delete dir="${basedir}/installer/classes/META-INF"/> 
     24 
    2125        </target> 
    2226 

  • release-kits/mark3/installer/build.xml

    r17597 r17609  
    2626                <mkdir dir="${installDir}"/> 
    2727 
    28                 <!-- rename greenstone3-build.xml back to build.xml --> 
    29                 <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
    30          
    3128                <!-- install files --> 
    3229                <echo message="Installing Files"/> 
    …… 
    3633                <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
    3734                <delete file="core.comp"/> 
     35 
     36                <!-- rename greenstone3-build.xml back to build.xml --> 
     37                <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
    3838 
    3939                <echo message="Setting Binaries to Executable"/>