[releng] Rework how ant examples are copied and used by the tools.test
diff --git a/doc/org.eclipse.xsd.doc-feature/feature.xml b/doc/org.eclipse.xsd.doc-feature/feature.xml
index 80ef8d1..0d1e61e 100644
--- a/doc/org.eclipse.xsd.doc-feature/feature.xml
+++ b/doc/org.eclipse.xsd.doc-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.xsd.doc"
label="%featureName"
- version="2.17.0.qualifier"
+ version="2.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.11.0">
diff --git a/doc/org.eclipse.xsd.doc-feature/pom.xml b/doc/org.eclipse.xsd.doc-feature/pom.xml
index 95d2789..681dfa8 100644
--- a/doc/org.eclipse.xsd.doc-feature/pom.xml
+++ b/doc/org.eclipse.xsd.doc-feature/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf.features</groupId>
<artifactId>org.eclipse.xsd.doc</artifactId>
- <version>2.17.0-SNAPSHOT</version>
+ <version>2.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
index c818aa9..b94737c 100644
--- a/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.xsd.doc; singleton:=true
-Bundle-Version: 2.15.0.qualifier
+Bundle-Version: 2.16.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.5.0,4.0.0)"
diff --git a/doc/org.eclipse.xsd.doc/pom.xml b/doc/org.eclipse.xsd.doc/pom.xml
index 22c883e..4922612 100644
--- a/doc/org.eclipse.xsd.doc/pom.xml
+++ b/doc/org.eclipse.xsd.doc/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.xsd.doc</artifactId>
- <version>2.15.0-SNAPSHOT</version>
+ <version>2.16.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index f2aa24e..884f2a0 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.xsd.sdk"
label="%featureName"
- version="2.21.0.qualifier"
+ version="2.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.11.0">
diff --git a/features/org.eclipse.xsd.sdk-feature/pom.xml b/features/org.eclipse.xsd.sdk-feature/pom.xml
index 82166e8..52a7fee 100644
--- a/features/org.eclipse.xsd.sdk-feature/pom.xml
+++ b/features/org.eclipse.xsd.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf.features</groupId>
<artifactId>org.eclipse.xsd.sdk</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>2.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/copyExample.ant
new file mode 100644
index 0000000..4dfc059
--- /dev/null
+++ b/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/copyExample.ant
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project name="copyExample" default="main" basedir="../..">
+
+ <property name="test" value="org.eclipse.emf.test.tools" />
+ <import file="../../../../org.eclipse.emf/tests/${test}/copyExampleLib.ant" optional="true" />
+ <basename file="${build.project}" property="project" />
+
+ <target name="main">
+ <copyExample project="${project}" />
+ </target>
+
+</project>
diff --git a/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/org.eclipse.xsd.ecore.importer.test.launch b/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/org.eclipse.xsd.ecore.importer.test.launch
new file mode 100644
index 0000000..6b07235
--- /dev/null
+++ b/plugins/org.eclipse.xsd.ecore.importer/.externalToolBuilders/org.eclipse.xsd.ecore.importer.test.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.test.tools/examples/org.eclipse.xsd.ecore.importer" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xsd.ecore.importer"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.test.tools/examples/org.eclipse.xsd.ecore.importer" type="2"/> <item path="/org.eclipse.xsd.ecore.importer/examples" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/org.eclipse.xsd.ecore.importer}/.externalToolBuilders/copyExample.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/org.eclipse.xsd.ecore.importer}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.xsd.ecore.importer/.project b/plugins/org.eclipse.xsd.ecore.importer/.project
index 32ca1a8..18e822d 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/.project
+++ b/plugins/org.eclipse.xsd.ecore.importer/.project
@@ -34,6 +34,20 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <triggers>auto,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/org.eclipse.xsd.ecore.importer.test.launch</value>
+ </dictionary>
+ <dictionary>
+ <key>incclean</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.oomph.version.VersionBuilder</name>
<arguments>
<dictionary>
