Changeset 13403


Ignore:
Timestamp:
2006-12-01T14:56:55+13:00 (17 years ago)
Author:
kjdon
Message:

removed the cvsRoot attribute for cvs bits - get conflicts if using different cvs root at different times. build.xml doesn't use cvsroot

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/dist-resources/dist-build.xml

    r13400 r13403  
    2020  <target name="prepare-windows" depends="init">
    2121    <cvs command="checkout -P" package="mgpp"
    22       dest="${src.packages.home}"
    23       cvsRoot="${cvs.root}" />
    24     <cvs command="checkout -P" package="gs2build"
    25       cvsRoot="${cvs.root}" />
     22      dest="${src.packages.home}" />
     23    <cvs command="checkout -P" package="gs2build" />
    2624    <antcall target="unzip-windows-packages"/>
    2725    <antcall target="checkout-winbin"/>
    … …  
    3129  <target name="build-windows" depends="init">
    3230    <antcall target="cvsupdate-distribution"/>
    33     <cvs command="update -dP" package="winbin"
    34       cvsRoot="${cvs.root}" />
     31    <cvs command="update -dP" package="winbin" />
    3532    <antcall target="get-windows-binaries"/>
    3633    <antcall target="rename-gs2build-files-windows"/>
    … …  
    4239  <target name="prepare-unix" depends="init">
    4340    <cvs command="checkout -P" package="mgpp"
    44       dest="${src.packages.home}"
    45       cvsRoot="${cvs.root}" />
    46     <cvs command="checkout -P" package="gs2build"
    47       cvsRoot="${cvs.root}" />
     41      dest="${src.packages.home}"/>
     42    <cvs command="checkout -P" package="gs2build"/>
    4843  </target>
    4944
    … …  
    6661  <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
    6762    <cvs command="export -D '1 second ago'" package="mgpp"
    68       dest="${src.packages.home}"
    69       cvsRoot="${cvs.root}" />
    70     <cvs command="export -D '1 second ago'" package="gs2build"
    71       cvsRoot="${cvs.root}" />
    72     <cvs command="export -D '1 second ago'" package="gli"
    73       cvsRoot="${cvs.root}" />
     63      dest="${src.packages.home}"/>
     64    <cvs command="export -D '1 second ago'" package="gs2build"/>
     65    <cvs command="export -D '1 second ago'" package="gli"/>
    7466    <delete file="${gli.home}/gli.bat"/>
    7567    <delete file="${gli.home}/gli.sh"/>
    … …  
    178170  <target name="create-source-distribution" depends="init">
    179171    <cvs command="export -D '1 second ago'" package="mgpp"
    180       dest="${src.packages.home}"
    181       cvsRoot="${cvs.root}" />
    182     <cvs command="export -D '1 second ago'" package="gs2build"
    183       cvsRoot="${cvs.root}" />
    184     <cvs command="export -D '1 second ago'" package="gli"
    185       cvsRoot="${cvs.root}" />
     172      dest="${src.packages.home}"/>
     173    <cvs command="export -D '1 second ago'" package="gs2build"/>
     174    <cvs command="export -D '1 second ago'" package="gli"/>
    186175    <delete file="${gli.home}/gli.bat"/>
    187176    <delete file="${gli.home}/gli.sh"/>
Note: See TracChangeset for help on using the changeset viewer.