greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16818

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

fixed installer sourcecode target, use shared code from rk2 targets and show compnent sizes in mark2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r16808 r16818  
    2222        <import file="shared-ant-scripts/init.xml"/> 
    2323        <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     24        <import file="../greenstone2/ant-scripts.xml"/> 
    2425        <import file="compile.xml"/> 
    2526        <import file="create-distribution.xml"/> 

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

    r16741 r16818  
    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                 <echo>Getting things ready to compile the installer</echo> 
     10        <target name="copy-installer-files"> 
     11                <echo>Copying installer files</echo> 
    1112                <mkdir dir="${basedir}/installer/classes"/> 
    1213                <copy todir="${basedir}/installer" file="${mark2.home}/installer/antinstall-config.xml" overwrite="true"/> 
    …… 
    1415                <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1516                        <fileset dir="${mark2.home}/greenstone2/installer-classes"/> 
    16                 <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
     17                       <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    1718                </copy> 
    18  
    19                 <!-- put the concrete values of things in the config --> 
    20                 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
    21                 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/> 
    22                 <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    23                 <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
    24  
    25                 <!-- put the concrete values of things in the text --> 
    26                 <!-- default --> 
    27                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
    28                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    29                 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/> 
    3019        </target> 
    3120 
    3221        <target name="compile-installer"> 
    33                 <!-- create the installer without java --> 
    3422                <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar" 
    3523                                compress="true" 

  • release-kits/mark2/installer/antinstall-config.xml

    r16742 r16818  
    3535                <comment name="choose-components"/> 
    3636 
    37                 <target target="install-core-components"        defaultValue="true" force="true" displayText="" /> 
    38                 <target target="install-source-code"            defaultValue="false" displayText="" /> 
     37                <target target="install-core-components"        diskRequirement="@component.size.core@" defaultValue="true" force="true" displayText="" /> 
     38                <target target="install-source-code"            diskRequirement="@component.size.sourcecode@" defaultValue="false" displayText="" /> 
    3939 
    4040        </page> 

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

    r16742 r16818  
    8484        <!-- Source --> 
    8585        <target name="install-source-code" depends=""> 
    86                 <echo message="Installing Source Code (src)"/> 
    87                 <mkdir dir="${installDir}/src"/> 
    88                 <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip> 
     86                <echo message="Installing Source Code"/> 
     87                <unzip src="${antinstaller.jar}" dest="${installDir}"> 
     88                        <patternset> 
     89                                <include name="common-src/**/*"/> 
     90                                <include name="runtime-src/**/*"/> 
     91                                <include name="build-src/**/*"/> 
     92                                <include name="packages/**/*"/> 
     93                        </patternset> 
     94                </unzip> 
    8995        </target> 
    9096