diff options
| author | Christian W. Damus | 2014-01-09 20:33:10 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2014-01-09 21:05:10 +0000 |
| commit | 1858d8ad3947ede5225eb1de81a06763d7970b68 (patch) | |
| tree | 1825a666ba7ecaa06550b54fbec6e1b11d2ae736 | |
| parent | bb6e69c55b52267c081a33495d70a0e2b19aa430 (diff) | |
| download | org.eclipse.uml2-1858d8ad3947ede5225eb1de81a06763d7970b68.tar.gz org.eclipse.uml2-1858d8ad3947ede5225eb1de81a06763d7970b68.tar.xz org.eclipse.uml2-1858d8ad3947ede5225eb1de81a06763d7970b68.zip | |
[286404] Ant Task for Profile Definition
https://bugs.eclipse.org/bugs/show_bug.cgi?id=286404
Fix JUnit test execution by converting the UI-dependent (and thus unavailable to headless Bucky build) Ant-based custom project builder with a Bucky-compatible builder definition.
3 files changed, 26 insertions, 25 deletions
diff --git a/plugins/org.eclipse.uml2.ant/.externalToolBuilders/Build Ant Tasks JARs.launch b/plugins/org.eclipse.uml2.ant/.externalToolBuilders/Build Ant Tasks JARs.launch deleted file mode 100644 index f1d5734c0..000000000 --- a/plugins/org.eclipse.uml2.ant/.externalToolBuilders/Build Ant Tasks JARs.launch +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> -<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean.ant.tasks,"/> -<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" 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.uml2.ant/ant_tasks" type="2"/> </resources>}"/> -<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.uml2.ant"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.uml2.ant/tasks" type="2"/> </resources>}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.uml2.ant/build_ant_tasks.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/> -<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.uml2.ant/.project b/plugins/org.eclipse.uml2.ant/.project index a197a097a..bb89ababe 100644 --- a/plugins/org.eclipse.uml2.ant/.project +++ b/plugins/org.eclipse.uml2.ant/.project @@ -20,15 +20,31 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/Build Ant Tasks JARs.launch</value> - </dictionary> - </arguments> - </buildCommand> + <buildCommand> + <name>org.eclipse.buckminster.ant.AntBuilder</name> + <arguments> + <dictionary> + <key>given.name</key> + <value>Create Ant tasks JAR</value> + </dictionary> + <dictionary> + <key>script.file</key> + <value>build_ant_tasks.xml</value> + </dictionary> + <dictionary> + <key>derived.resource</key> + <value>ant_tasks</value> + </dictionary> + <dictionary> + <key>refresh.resource</key> + <value>ant_tasks</value> + </dictionary> + <dictionary> + <key>delta.resource</key> + <value>tasks</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.eclipse.uml2.ant/build_ant_tasks.xml b/plugins/org.eclipse.uml2.ant/build_ant_tasks.xml index 68f1688df..bc3ac16b4 100644 --- a/plugins/org.eclipse.uml2.ant/build_ant_tasks.xml +++ b/plugins/org.eclipse.uml2.ant/build_ant_tasks.xml @@ -8,7 +8,7 @@ </fileset> </jar> </target> - <target name="clean.ant.tasks"> + <target name="clean"> <delete file="ant_tasks/${jar.name}.jar" failonerror="false"/> </target> </project> |