Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] another minor releng patch

When we do an RPM build in our build system, we don't want the build
to try to contact the eclipse.org cvs server.  In my RPM I just remove
the <cvs> calls, but I thought perhaps a patch to conditionalize this
might be accepted...

Tom

Index: platform/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.releng/platform/customTargets.xml,v
retrieving revision 1.4
diff -u -r1.4 customTargets.xml
--- platform/customTargets.xml 8 Jul 2004 20:57:34 -0000 1.4
+++ platform/customTargets.xml 14 Jul 2004 17:14:05 -0000
@@ -56,6 +56,12 @@
 <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
 <!-- ===================================================================== -->
 <target name="getMapFiles">
+	<available property="cdtPlatformFileExists"
+		   file="${buildDirectory}/maps/org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map" />
+	<antcall target="reallyGetMapFiles" />
+</target>
+
+<target name="reallyGetMapFiles" unless="cdtPlatformFileExists">
 	<cvs
 		cvsRoot=":pserver:anonymous@xxxxxxxxxxxxxxx:/home/tools"
 		package="org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map"
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.releng/sdk/customTargets.xml,v
retrieving revision 1.3
diff -u -r1.3 customTargets.xml
--- sdk/customTargets.xml 8 Jul 2004 20:57:34 -0000 1.3
+++ sdk/customTargets.xml 14 Jul 2004 17:14:05 -0000
@@ -56,6 +56,13 @@
 <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
 <!-- ===================================================================== -->
 <target name="getMapFiles">
+	<echo>BD = ${buildDirectory}</echo>
+	<available property="cdtSdkFileExists"
+		   file="${buildDirectory}/maps/org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map" />
+	<antcall target="reallyGetMapFiles" />
+</target>
+
+<target name="reallyGetMapFiles" unless="cdtSdkFileExists">
 	<cvs
 		cvsRoot=":pserver:anonymous@xxxxxxxxxxxxxxx:/home/tools"
 		package="org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map"


Back to the top