Attachment 78975 Details for Bug 202418 – files to tweak to add/remove OCL dependency

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] files to tweak to add/remove OCL dependency

ocl.not.required.patch (text/plain), 4.67 KB, created by Nick Boldt

on 2007-09-21 09:56:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Boldt

Created: 2007-09-21 09:56:50 EDT

Size: 4.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.cdo.releng
>Index: builder/sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo.releng/builder/sdk/customTargets.xml,v
>retrieving revision 1.12
>diff -u -r1.12 customTargets.xml
>--- builder/sdk/customTargets.xml	21 Sep 2007 00:13:21 -0000	1.12
>+++ builder/sdk/customTargets.xml	21 Sep 2007 13:55:11 -0000
>@@ -69,7 +69,7 @@
> 	
> 	<target name="postSetup">
> 		
>-		<echo message="Download, then unpack: Eclipse, EMF, Net4j, OCL ..." />
>+		<echo message="Download, then unpack: Eclipse, EMF, Net4j ..." />
> 		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
> 			<property name="url" value="${eclipseURL}" />
> 			<property name="file" value="${eclipseFile}" />
>@@ -85,11 +85,6 @@
> 			<property name="file" value="${net4jFile}" />
> 			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.net4j/plugin.xml" />
> 		</ant>
>-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
>-			<property name="url" value="${oclURL}" />
>-			<property name="file" value="${oclFile}" />
>-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ocl/plugin.xml" />
>-		</ant>
> 	</target>
> 
> 	
>Index: builder/tests/scripts/test.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo.releng/builder/tests/scripts/test.xml,v
>retrieving revision 1.13
>diff -u -r1.13 test.xml
>--- builder/tests/scripts/test.xml	20 Sep 2007 23:42:35 -0000	1.13
>+++ builder/tests/scripts/test.xml	21 Sep 2007 13:55:11 -0000
>@@ -33,7 +33,7 @@
> 		<delete dir="${install}" /><mkdir dir="${install}" />
> 		
> 		
>-		<echo message="Download, then unpack: Eclipse, EMF, Net4j, OCL ..."/>
>+		<echo message="Download, then unpack: Eclipse, EMF, Net4j ..."/>
> 		<property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/>
> 		<property name="getTestDependencies.xml" value="${common.releng.dir}/scripts/getTestDependencies.xml"/>
> 		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
>@@ -51,11 +51,6 @@
> 			<property name="file" value="${net4jFile}" />
> 			<property name="unpackDest" value="${install}"/>
> 		</ant>
>-		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
>-			<property name="url" value="${oclURL}" />
>-			<property name="file" value="${oclFile}" />
>-			<property name="unpackDest" value="${install}"/>
>-		</ant>
> 		
> 		<property name="dir" location="."/>
> 		<echo message="Unpack SDK + JUnit Tests (${dir}/emft-*.zip) ..."/>		
>Index: builder/tests/customTargets.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo.releng/builder/tests/customTargets.xml,v
>retrieving revision 1.7
>diff -u -r1.7 customTargets.xml
>--- builder/tests/customTargets.xml	20 Sep 2007 23:42:35 -0000	1.7
>+++ builder/tests/customTargets.xml	21 Sep 2007 13:55:11 -0000
>@@ -67,18 +67,13 @@
> 
> <target name="postSetup">
> 	<property name="getDeps.xml" location="${buildDirectory}/../org.eclipse.emft.common.releng/scripts/getDependencies.xml"/>
>-		<echo message="Download, then unpack: Net4j SDK, OCL SDK, EMF SDK + Eclipse SDK..."/>
>+		<echo message="Download, then unpack: Net4j SDK, EMF SDK + Eclipse SDK..."/>
> 	<ant target="getDependency" antfile="${getDeps.xml}">
> 		<property name="url" value="${net4jURL}"/>
> 		<property name="file" value="${net4jFile}"/>
> 		<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.net4j/plugin.xml" />
> 	</ant>
> 	<ant target="getDependency" antfile="${getDeps.xml}">
>-		<property name="url" value="${oclURL}"/>
>-		<property name="file" value="${oclFile}"/>
>-		<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ocl/plugin.xml"/>
>-	</ant>
>-	<ant target="getDependency" antfile="${getDeps.xml}">
> 		<property name="url" value="${emfURL}"/>
> 		<property name="file" value="${emfFile}"/>
> 		<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml"/>

Actions: View | Diff

Attachments on bug 202418: 78975