greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17348

Show
Ignore:
Timestamp:
2008-09-19 12:59:22 (4 months ago)
Author:
oranfry
Message:

using the shared targets for things

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/mark3/ant-scripts/compile.xml

    r17268 r17348  
    88 
    99                <!-- preparation --> 
    10                 <antcall target="set-version-number-property" /> 
     10                <antcall target="greenstone3-set-version-numbers"> 
     11                        <param name="greenstone3basedir" value="${basedir}/greenstone3"/> 
     12                </antcall> 
    1113                <antcall target="set-gdbm-installed-path" /> 
    1214                <ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 

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

    r17268 r17348  
    44        <target name="create-distribution"> 
    55                <!-- create distribution --> 
    6                 <antcall target="export-greenstone3" /> 
    7                 <antcall target="dist-set-version-number-property" /> 
    8                 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall> 
     6                <antcall target="export-greenstone3-gli" /> 
     7 
     8                <antcall target="greenstone3-set-version-numbers"> 
     9                        <param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/> 
     10                </antcall> 
     11 
     12                <antcall target="gli-set-version-numbers"> 
     13                        <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/> 
     14                </antcall> 
    915 
    1016                <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
    …… 
    2834                <antcall target="insert-uninstaller"/> <!-- from rk3-targets --> 
    2935                <antcall target="rename-build-xml-for-transit"/> 
     36                <antcall target="strip-svn-dirs"><param name="dir" value="distribution/greenstone3"/></antcall> <!-- from init --> 
    3037        </target> 
    3138 
    32         <target name="export-greenstone3"> 
     39        <target name="export-greenstone3-gli"> 
    3340                <mkdir dir="distribution"/> 
    3441                <delete dir="distribution/greenstone3"/> 

  • release-kits/mark3/ant-scripts/operations-on-gs3home.xml

    r16655 r17348  
    3939        </target> 
    4040     
    41  
    42  
    4341        <!-- creates the base distribution. Needs binaries copied in to it from other greenstones (prepare-os targets) --> 
    4442        <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up"> 
    …… 
    10098 
    10199                <!-- clean up --> 
    102                 <delete><fileset dir="${basedir}" includes="**/.svn"/></delete> 
    103  
    104100                <delete><fileset dir="${basedir}" includes="*.bat"/></delete> 
    105101                <delete><fileset dir="${basedir}/gli" includes="*.bat"/></delete>