Changeset 13403 for trunk/gsdl3/dist-resources/dist-build.xml

Timestamp:

2006-12-01T14:56:55+13:00 (16 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:

• trunk/gsdl3/dist-resources/dist-build.xml (modified) (5 diffs)

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

@@ -20 +20 @@
   <target name="prepare-windows" depends="init">
     <cvs command="checkout -P" package="mgpp" 
-      dest="${src.packages.home}"
-      cvsRoot="${cvs.root}" />
-    <cvs command="checkout -P" package="gs2build"
-      cvsRoot="${cvs.root}" /> 
+      dest="${src.packages.home}" />
+    <cvs command="checkout -P" package="gs2build" /> 
     <antcall target="unzip-windows-packages"/>
     <antcall target="checkout-winbin"/>
@@ -31 +29 @@
   <target name="build-windows" depends="init">
     <antcall target="cvsupdate-distribution"/>
-    <cvs command="update -dP" package="winbin"
-      cvsRoot="${cvs.root}" />
+    <cvs command="update -dP" package="winbin" />
     <antcall target="get-windows-binaries"/>
     <antcall target="rename-gs2build-files-windows"/>
@@ -42 +39 @@
   <target name="prepare-unix" depends="init">
     <cvs command="checkout -P" package="mgpp" 
-      dest="${src.packages.home}"
-      cvsRoot="${cvs.root}" />
-    <cvs command="checkout -P" package="gs2build"
-      cvsRoot="${cvs.root}" />
+      dest="${src.packages.home}"/>
+    <cvs command="checkout -P" package="gs2build"/>
   </target>
 
@@ -66 +61 @@
   <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
     <cvs command="export -D '1 second ago'" package="mgpp" 
-      dest="${src.packages.home}"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gs2build"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gli"
-      cvsRoot="${cvs.root}" />
+      dest="${src.packages.home}"/>
+    <cvs command="export -D '1 second ago'" package="gs2build"/>
+    <cvs command="export -D '1 second ago'" package="gli"/>
     <delete file="${gli.home}/gli.bat"/>
     <delete file="${gli.home}/gli.sh"/>
@@ -178 +170 @@
   <target name="create-source-distribution" depends="init">
     <cvs command="export -D '1 second ago'" package="mgpp" 
-      dest="${src.packages.home}"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gs2build"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gli"
-      cvsRoot="${cvs.root}" />
+      dest="${src.packages.home}"/>
+    <cvs command="export -D '1 second ago'" package="gs2build"/>
+    <cvs command="export -D '1 second ago'" package="gli"/>
     <delete file="${gli.home}/gli.bat"/>
     <delete file="${gli.home}/gli.sh"/>