greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16815

Show
Ignore:
Timestamp:
2008-08-15 15:17:47 (5 months ago)
Author:
oranfry
Message:

used shared code instaed of duplicating

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/lirk2/ant-scripts/build.xml

    r16739 r16815  
    1818        <import file="shared-ant-scripts/init.xml"/> 
    1919        <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     20        <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
    2021        <import file="compile.xml"/> 
    2122        <import file="create-distribution.xml"/> 

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

    r16739 r16815  
    33 
    44        <target name="create-installer"> 
    5                 <antcall target="setup-for-installer-creation"/> 
     5                <antcall target="copy-installer-files"/> 
     6                <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets --> 
    67                <antcall target="compile-installer"/> 
    78        </target> 
    89 
    9         <target name="setup-for-installer-creation"> 
    10  
    11                 <echo>Getting things ready to compile the installer</echo> 
     10        <target name="copy-installer-files"> 
     11                <echo>Copying installer files</echo> 
    1212                <mkdir dir="${basedir}/installer/classes"/> 
    1313                <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/> 
    …… 
    1717                        <fileset dir="${lirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    1818                </copy> 
    19  
    20                 <!-- put the concrete values of things in the config --> 
    21                 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
    22                 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/> 
    23                 <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    24                 <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
    25  
    26                 <!-- put the concrete values of things in the text --> 
    27                 <!-- default --> 
    28                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
    29                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    30                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/> 
    31  
    3219        </target> 
    3320 
    3421        <target name="compile-installer"> 
    35  
    3622                <!-- create the installer with java --> 
    3723                <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"