greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17336

Show
Ignore:
Timestamp:
2008-09-19 09:25:33 (4 months ago)
Author:
oranfry
Message:

made sure version numbers are changed before compiling in dist, and copy most up-to-date icon into release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17257 r17336  
    44        <target name="create-distribution"> 
    55                <!-- create distribution --> 
    6                 <antcall target="export-greenstone3" /> 
     6                <antcall target="export-greenstone3-gli" /> 
     7                <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall> 
     8                <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall> 
    79                <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
    810                        <property name="app.version" value="${version}"/> 
     
    2022                        <property name="branch.revision" value="${branch.revision}"/> 
    2123                </ant> 
    22                 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall> 
    2324                <antcall target="copy-over-build-xml" /> 
    2425                <antcall target="insert-user-manual"/> 
    2526                <antcall target="insert-compiled-binaries"/> 
     27                <antcall target="insert-icon"/> 
    2628                <antcall target="insert-uninstaller"/> <!-- from rk3-targets --> 
    2729                <antcall target="rename-build-xml-for-transit"/> 
    2830        </target> 
    2931 
    30         <target name="export-greenstone3"> 
     32        <target name="export-greenstone3-gli"> 
    3133                <mkdir dir="distribution"/> 
    3234                <delete dir="distribution/greenstone3"/> 
    3335                <svn> 
    3436                        <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/> 
     37                        <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli" revision="${branch.revision}"/> 
    3538                </svn> 
    36         </target> 
    37  
    38         <target name="dist-set-version-number-property"> 
    39                 <rsr 
    40                         file="distribution/greenstone3/resources/java/global.properties.in" 
    41                         pattern="(.*)@gsdl3version@(.*)" 
    42                         replacement="$1${version}$2" /> 
    4339        </target> 
    4440 
     
    6359                <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
    6460        </target> 
     61         
     62        <target name="insert-icon"> 
     63                <copy 
     64                        file="${wirk3.home}/greenstone3/icon/icon.ico" 
     65                        tofile="distribution/greenstone3/resources/images/gs3.ico"/> 
     66        </target> 
    6567 
    6668        <target name="rename-build-xml-for-transit">