Attachment 122712 Details for Bug 261247 – patch

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

[patch] patch

rdttest_patch.txt (text/plain), 25.16 KB, created by Mike Kucera

on 2009-01-15 14:03:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Kucera

Created: 2009-01-15 14:03:22 EST

Size: 25.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ptp.rdt.ui.tests
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties,v
>retrieving revision 1.1
>diff -u -r1.1 build.properties
>--- build.properties	5 Dec 2008 22:04:15 -0000	1.1
>+++ build.properties	15 Jan 2009 16:13:35 -0000
>@@ -1,4 +1,5 @@
>-source.. = test/
>+source.. = test/,\
>+           suite/
> output.. = bin/
> bin.includes = META-INF/,\
>                .
>#P org.eclipse.ptp.rdt.core.tests
>Index: src/org/eclipse/ptp/rdt/core/tests/ConnectionSuite.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests/src/org/eclipse/ptp/rdt/core/tests/ConnectionSuite.java,v
>retrieving revision 1.1
>diff -u -r1.1 ConnectionSuite.java
>--- src/org/eclipse/ptp/rdt/core/tests/ConnectionSuite.java	5 Dec 2008 22:01:24 -0000	1.1
>+++ src/org/eclipse/ptp/rdt/core/tests/ConnectionSuite.java	15 Jan 2009 16:13:36 -0000
>@@ -10,27 +10,26 @@
>  *******************************************************************************/ 
> package org.eclipse.ptp.rdt.core.tests;
> 
>+import java.io.File;
> import junit.framework.TestResult;
> import junit.framework.TestSuite;
> 
>-
>-
> /**
>  * A test suite that will establish a connection before running the tests.
>  */
> 
> public class ConnectionSuite extends TestSuite {
> 
>-	private String propertyFile;
>-	private String serviceModelFile;
>+	private File propertyFile;
>+	private File serviceModelFile;
> 
> 	public ConnectionSuite() {
> 		
> 	}
> 	
>-	public ConnectionSuite(String propertyFile, String serviceModelFile) {
>-		this.propertyFile = propertyFile;
>-		this.serviceModelFile = serviceModelFile;
>+	public ConnectionSuite(File propertiesFile, File serviceModelFile2) {
>+		this.propertyFile = propertiesFile;
>+		this.serviceModelFile = serviceModelFile2;
> 	}
> 	
> 	public void connect() throws Exception {
>Index: src/org/eclipse/ptp/rdt/core/tests/ConnectionManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests/src/org/eclipse/ptp/rdt/core/tests/ConnectionManager.java,v
>retrieving revision 1.1
>diff -u -r1.1 ConnectionManager.java
>--- src/org/eclipse/ptp/rdt/core/tests/ConnectionManager.java	5 Dec 2008 22:01:24 -0000	1.1
>+++ src/org/eclipse/ptp/rdt/core/tests/ConnectionManager.java	15 Jan 2009 16:13:36 -0000
>@@ -10,6 +10,7 @@
>  *******************************************************************************/ 
> package org.eclipse.ptp.rdt.core.tests;
> 
>+import java.io.File;
> import java.io.FileInputStream;
> import java.io.FileReader;
> import java.io.IOException;
>@@ -32,9 +33,6 @@
> public class ConnectionManager {
> 
> 	public static final String PROPERTY_CONNECTION_CLASS = "connection.class";
>-	
>-	
>-	
> 	public static final String PROPERTY_WORKSPACE    = "project.workspace";
> 	public static final String PROPERTY_SERVICE_MODEL_CONFIG_FILE = "project.servicemodel";
> 	
>@@ -44,7 +42,7 @@
> 	
> 	private IRDTTestConnection connection;
> 	private Properties properties;
>-	private String serviceModelConfigFile;
>+	private File serviceModelConfigFile;
> 	
> 	
> 	private ConnectionManager() {}
>@@ -61,11 +59,11 @@
> 	 * configuration file.
> 	 * @throws IOException if there is a problem reading the properties file
> 	 */
>-	public void initialize(String propertiesFileName, String serviceModelConfigFileName) throws IOException {
>-		properties = new Properties();
>-		properties.load(new FileInputStream(propertiesFileName));
>+	public void initialize(File propertyFile, File serviceModelFile) throws IOException {
>+		properties = new Properties();		
>+		properties.load(new FileInputStream(propertyFile));
> 		
>-		this.serviceModelConfigFile = serviceModelConfigFileName;
>+		this.serviceModelConfigFile = serviceModelFile;
> 	}
> 	
> 	public boolean isConnected() {
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests/build.properties,v
>retrieving revision 1.1
>diff -u -r1.1 build.properties
>--- build.properties	9 Jul 2008 19:15:50 -0000	1.1
>+++ build.properties	15 Jan 2009 16:13:36 -0000
>@@ -1,14 +1,16 @@
>-###############################################################################
>-# Copyright (c) 2008 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-source.. = src/,\
>-           test/
>-bin.includes = META-INF/,\
>-               .
>+###############################################################################
>+# Copyright (c) 2008 IBM Corporation and others.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+#
>+# Contributors:
>+#     IBM Corporation - initial API and implementation
>+###############################################################################
>+source.. = src/,\
>+           test/,\
>+           suite/
>+bin.includes = META-INF/,\
>+               .
>+output.. = bin/
>Index: build.xml
>===================================================================
>RCS file: build.xml
>diff -N build.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ build.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,326 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<project name="org.eclipse.ptp.rdt.core.tests" default="build.jars" basedir=".">
>+
>+	<property name="basews" value="${ws}"/>
>+	<property name="baseos" value="${os}"/>
>+	<property name="basearch" value="${arch}"/>
>+	<property name="basenl" value="${nl}"/>
>+	<property name="bundleId" value="org.eclipse.ptp.rdt.core.tests"/>
>+	<property name="bundleVersion" value="1.0.0"/>
>+
>+	
>+	<property name="javacFailOnError" value="false"/>
>+	<property name="javacDebugInfo" value="on"/>
>+	<property name="javacVerbose" value="false"/>
>+	<property name="logExtension" value=".log"/>
>+	<property name="compilerArg" value=""/>
>+	<property name="javacSource" value="1.3"/>
>+	<property name="javacTarget" value="1.2"/>
>+	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
>+		<os family="mac"/>
>+	</condition>
>+	<property name="dir_bootclasspath" value="${java.home}/lib"/>
>+	<path id="path_bootclasspath">
>+		<fileset dir="${dir_bootclasspath}">
>+			<include name="*.jar"/>
>+		</fileset>
>+	</path>
>+	<property name="bootclasspath" refid="path_bootclasspath"/>
>+	<property name="bundleJavacSource" value="${javacSource}"/>
>+	<property name="bundleJavacTarget" value="${javacTarget}"/>
>+	<property name="bundleBootClasspath" value="${bootclasspath}"/>
>+
>+	<target name="init" depends="properties">
>+<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
>+			<isset property="buildTempFolder"/>
>+		</condition>
>+		<property name="pluginTemp" value="${basedir}"/>
>+<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ptp.rdt.core.tests_1.0.0"		>
>+			<isset property="buildTempFolder"/>
>+		</condition>
>+		<property name="build.result.folder" value="${basedir}"/>
>+		<property name="temp.folder" value="${basedir}/temp.folder"/>
>+		<property name="plugin.destination" value="${basedir}"/>
>+	</target>
>+
>+	<target name="properties" if="eclipse.running">
>+		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
>+
>+	</target>
>+
>+	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ptp.rdt.core.tests for an update site.">
>+		<delete dir="${temp.folder}"/>
>+		<mkdir dir="${temp.folder}"/>
>+		<antcall target="build.jars"/>
>+		<antcall target="gather.bin.parts">
>+			<param name="destination.temp.folder" value="${temp.folder}/"/>
>+		</antcall>
>+		<jar destfile="${plugin.destination}/org.eclipse.ptp.rdt.core.tests_1.0.0.jar" basedir="${temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0" filesetmanifest="merge"/>
>+		<delete dir="${temp.folder}"/>
>+	</target>
>+
>+	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.ptp.rdt.core.tests @dot.">
>+		<delete dir="${temp.folder}/@dot.bin"/>
>+		<mkdir dir="${temp.folder}/@dot.bin"/>
>+		<path id="@dot.classpath">
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.jface_3.4.0.I20080606-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.osgi_3.4.0.v20080605-1900.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.swt_3.4.0.v3448f.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.swt.win32.win32.x86_3.4.0.v3448f.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.commands_3.4.0.I20080509-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"/>
>+			<pathelement path="../org.eclipse.rse.connectorservice.dstore/bin/"/>
>+			<pathelement path="../org.eclipse.rse.connectorservice.dstore/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui_3.4.0.I20080610-1200.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.runtime_3.4.0.v20080512.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.jobs_3.4.0.v20080512.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.preferences_3.2.200.v20080421-2006.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.osgi.services_3.1.200.v20071203.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/javax.servlet_2.4.0.v200806031604.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.workbench_3.4.0.I20080606-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000/compatibility.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/com.ibm.icu_3.8.1.v20080530.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.help_3.3.100.v20080610.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.jface.databinding_1.2.0.I20080515-2000a.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.databinding_1.1.0.I20080527-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.resources_3.4.0.v20080604-1400.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.resources.compatibility_3.4.0.v20080604-1400.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.resources.win32.x86_3.4.0.v20071204.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ant.core_3.2.0.v20080529.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.variables_3.2.100.v20080529-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.filesystem_1.2.0.v20080604-1400.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.filesystem.win32.x86_1.1.0.v20080604-1400.jar"/>
>+			<pathelement path="../org.eclipse.rse.services/bin/"/>
>+			<pathelement path="../org.eclipse.rse.services/@dot"/>
>+			<pathelement path="../org.eclipse.rse.services.dstore/bin/"/>
>+			<pathelement path="../org.eclipse.rse.services.dstore/@dot"/>
>+			<pathelement path="../org.eclipse.dstore.core/bin/"/>
>+			<pathelement path="../org.eclipse.dstore.core/@dot"/>
>+			<pathelement path="../org.eclipse.dstore.extra/bin/"/>
>+			<pathelement path="../org.eclipse.dstore.extra/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.views_3.3.0.I20080509-2000.jar"/>
>+			<pathelement path="../org.eclipse.rse.ui/bin/"/>
>+			<pathelement path="../org.eclipse.rse.ui/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.jface.text_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.text_3.4.0.v20080605-1800.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.forms_3.3.100.v20080611.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.ide_3.4.0.I20080606-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.win32_3.2.100.v20080408-0800.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.update.configurator_3.2.200.v20080417.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.update.core_3.2.200.v20080515.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.update.core.win32_3.2.100.v20080107.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.net_1.1.0.I20080604.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.net.win32.x86_1.0.0.I20080521.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.security_1.0.0.v20080512-1800.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.equinox.security.win32.x86_1.0.0.v20080529-1600.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.update.ui_3.2.100.v20080318.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.workbench.texteditor_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../org.eclipse.rse.core/bin/"/>
>+			<pathelement path="../org.eclipse.rse.core/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux.ia64/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux.ppc/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.qnx/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.qnx/cdt_qnx.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.qnx/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux/cdt_linux.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.macosx/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.macosx/cdt_macosx.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.macosx/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.aix/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.aix/cdtaix.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.aix/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux.x86/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.linux.x86_64/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.solaris/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.solaris/cdt_solaris.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.solaris/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.core.win32/bin"/>
>+			<pathelement path="../org.eclipse.cdt.core.win32/cdt_win32.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.win32/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.core.filebuffers_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ltk.core.refactoring_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../org.eclipse.ptp.rdt.core/build/"/>
>+			<pathelement path="../org.eclipse.ptp.rdt.core/@dot"/>
>+			<pathelement path="../org.eclipse.ptp.rdt.services/bin/"/>
>+			<pathelement path="../org.eclipse.ptp.rdt.services/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.make.core/bin"/>
>+			<pathelement path="../org.eclipse.cdt.make.core/@dot"/>
>+			<pathelement path="../org.eclipse.cdt.managedbuilder.core/bin"/>
>+			<pathelement path="../org.eclipse.cdt.managedbuilder.core/@dot"/>
>+			<pathelement path="../org.eclipse.ptp.remote.core/bin/"/>
>+			<pathelement path="../org.eclipse.ptp.remote.core/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.junit4_4.3.1/junit.jar"/>
>+			<pathelement path="../org.eclipse.cdt.ui.tests/bin"/>
>+			<pathelement path="../org.eclipse.cdt.ui.tests/cdtuitests.jar"/>
>+			<pathelement path="../org.eclipse.cdt.ui/bin"/>
>+			<pathelement path="../org.eclipse.cdt.ui/@dot"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.editors_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.search_3.4.0.v20080603-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ltk.ui.refactoring_3.4.0.v20080605-1800.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.navigator_3.3.100.I20080606-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.compare_3.4.0.I20080604.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.team.core_3.4.0.I20080605.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.team.ui_3.4.0.I20080604.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.navigator.resources_3.3.100.I20080606-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.views.properties.tabbed_3.4.0.I20080527-2000.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.eclipse.ui.console_3.3.0.v20080529-1300.jar"/>
>+			<pathelement path="../../../eclipse/eclipse_3.4/plugins/org.junit_3.8.2.v20080602-1318/junit.jar"/>
>+			<pathelement path="../org.eclipse.cdt.core.tests/bin/"/>
>+			<pathelement path="../org.eclipse.cdt.core.tests/cdtcoretests.jar"/>
>+		</path>
>+		
>+		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
>+			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
>+			<classpath refid="@dot.classpath" />
>+			<src path="src/"			/>
>+			<src path="test/"			/>
>+			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
>+			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
>+		</javac>
>+		
>+		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
>+			<fileset dir="src/">
>+				<exclude name="**/*.java"/>
>+				<exclude name="**/package.htm*"/>
>+			</fileset>
>+			<fileset dir="test/">
>+				<exclude name="**/*.java"/>
>+				<exclude name="**/package.htm*"/>
>+			</fileset>
>+		</copy>
>+		<mkdir dir="${build.result.folder}"/>
>+		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
>+			<fileset dir="${temp.folder}/@dot.bin">
>+			</fileset>
>+		</copy>
>+		<delete dir="${temp.folder}/@dot.bin"/>
>+	</target>
>+
>+	<target name="src.zip" depends="init" unless="src.zip">
>+		<mkdir dir="${build.result.folder}"/>
>+		<antcall target="zip.src.zip"/>
>+	</target>
>+	<target name="zip.src.zip">
>+		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
>+			<fileset dir="src/">
>+				<include name="**/*.java"/>
>+			</fileset>
>+			<fileset dir="test/">
>+				<include name="**/*.java"/>
>+			</fileset>
>+		</zip>
>+	</target>
>+	<target name="copy.src.zip">
>+		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
>+			<fileset dir="src/">
>+				<include name="**/*.java"/>
>+			</fileset>
>+			<fileset dir="test/">
>+				<include name="**/*.java"/>
>+			</fileset>
>+		</copy>
>+	</target>
>+
>+	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ptp.rdt.core.tests.">
>+		<available property="@dot" file="${build.result.folder}/@dot"/>
>+		<antcall target="@dot"/>
>+	</target>
>+
>+	<target name="build.sources" depends="init">
>+		<available property="src.zip" file="${build.result.folder}/src.zip"/>
>+		<antcall target="src.zip"/>
>+	</target>
>+
>+	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
>+		<mkdir dir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0"/>
>+		<copy todir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0" failonerror="true" overwrite="false">
>+			<fileset dir="${build.result.folder}/@dot">
>+				<include name="**"/>
>+			</fileset>
>+		</copy>
>+		<copy todir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0" failonerror="true" overwrite="false">
>+			<fileset dir="${basedir}">
>+				<include name="META-INF/"/>
>+			</fileset>
>+		</copy>
>+	</target>
>+
>+	<target name="build.zips" depends="init">
>+	</target>
>+
>+	<target name="gather.sources" depends="init" if="destination.temp.folder">
>+		<mkdir dir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0"/>
>+		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0" failonerror="false" overwrite="false"/>
>+		<antcall target="copy.src.includes">
>+			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0"/>
>+		</antcall>
>+	</target>
>+
>+	<target name="gather.individual.sources" depends="init">
>+		<antcall target="copy.src.zip">
>+			<param name="source.destination.folder" value="${destination.temp.folder}"/>
>+		</antcall>
>+		<antcall target="copy.src.includes">
>+			<param name="source.destination.folder" value="${destination.temp.folder}"/>
>+		</antcall>
>+	</target>
>+
>+	<target name="copy.src.includes" depends="init">
>+	</target>
>+
>+	<target name="gather.logs" depends="init" if="destination.temp.folder">
>+		<mkdir dir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0"/>
>+		<copy todir="${destination.temp.folder}/org.eclipse.ptp.rdt.core.tests_1.0.0" failonerror="false" overwrite="false">
>+			<fileset dir="${temp.folder}">
>+				<include name="@dot.bin${logExtension}"/>
>+			</fileset>
>+		</copy>
>+	</target>
>+
>+	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ptp.rdt.core.tests of all the zips, jars and logs created.">
>+		<delete dir="${build.result.folder}/@dot"/>
>+		<delete file="${build.result.folder}/src.zip"/>
>+		<delete file="${plugin.destination}/org.eclipse.ptp.rdt.core.tests_1.0.0.jar"/>
>+		<delete file="${plugin.destination}/org.eclipse.ptp.rdt.core.tests_1.0.0.zip"/>
>+		<delete dir="${temp.folder}"/>
>+	</target>
>+
>+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
>+		<eclipse.convertPath fileSystemPath="D:/workspaces/cdt_5.0_branch/org.eclipse.ptp.rdt.core.tests" property="resourcePath"/>
>+		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
>+	</target>
>+
>+	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ptp.rdt.core.tests.">
>+		<delete dir="${temp.folder}"/>
>+		<mkdir dir="${temp.folder}"/>
>+		<antcall target="build.jars"/>
>+		<antcall target="build.sources"/>
>+		<antcall target="gather.bin.parts">
>+			<param name="destination.temp.folder" value="${temp.folder}/"/>
>+		</antcall>
>+		<antcall target="gather.sources">
>+			<param name="destination.temp.folder" value="${temp.folder}/"/>
>+		</antcall>
>+		<delete>
>+			<fileset dir="${temp.folder}">
>+				<include name="**/*.bin${logExtension}"/>
>+			</fileset>
>+		</delete>
>+		<zip destfile="${plugin.destination}/org.eclipse.ptp.rdt.core.tests_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
>+		<delete dir="${temp.folder}"/>
>+	</target>
>+
>+</project>

Actions: View | Diff

Attachments on bug 261247: 122712