diff options
| author | Markus Keller | 2017-01-31 11:52:26 +0000 |
|---|---|---|
| committer | Markus Keller | 2017-01-31 11:52:43 +0000 |
| commit | f95ec511ae0580c5f76debff62bcd2f4ed270fc8 (patch) | |
| tree | 9cd718dc8be151eec093e692c22ba8b3136e6378 | |
| parent | 5d8fccf038f61862c5ecac247e0f3a454ff21e66 (diff) | |
| download | rt.equinox.p2-f95ec511ae0580c5f76debff62bcd2f4ed270fc8.tar.gz rt.equinox.p2-f95ec511ae0580c5f76debff62bcd2f4ed270fc8.tar.xz rt.equinox.p2-f95ec511ae0580c5f76debff62bcd2f4ed270fc8.zip | |
Bug 511367: Only run Ant builders when necessaryY20170202-1000I20170205-2000I20170204-2000I20170203-2000I20170202-2000I20170201-2000I20170131-2000
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/buildAntTasks.launch (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/New_Builder (1).launch) | 26 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.repository/.project | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders/Ant tasks.launch | 27 |
3 files changed, 30 insertions, 25 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/New_Builder (1).launch b/bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/buildAntTasks.launch index 78e9ab04e..eba19c68d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/New_Builder (1).launch +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders/buildAntTasks.launch @@ -1,12 +1,14 @@ -<?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.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.equinox.p2.metadata.repository"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.metadata.repository/buildAntTasks.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> -<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> -</launchConfiguration> +<?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"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.equinox.p2.metadata.repository/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.equinox.p2.metadata.repository"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.equinox.p2.metadata.repository/.externalToolBuilders" type="2"/> <item path="/org.eclipse.equinox.p2.metadata.repository/bin_ant" type="2"/> <item path="/org.eclipse.equinox.p2.metadata.repository/buildAntTasks.xml" type="1"/> <item path="/org.eclipse.equinox.p2.metadata.repository/src_ant" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.metadata.repository/buildAntTasks.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/.project b/bundles/org.eclipse.equinox.p2.metadata.repository/.project index 20cdc1bfa..38cd8563b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/.project +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/.project @@ -36,7 +36,7 @@ <arguments> <dictionary> <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/New_Builder (1).launch</value> + <value><project>/.externalToolBuilders/buildAntTasks.launch</value> </dictionary> </arguments> </buildCommand> diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders/Ant tasks.launch b/bundles/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders/Ant tasks.launch index e43662d06..f637c1ac6 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders/Ant tasks.launch +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders/Ant tasks.launch @@ -1,12 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?><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.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.equinox.p2.publisher.eclipse"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.publisher.eclipse/scripts/buildExtraJAR.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> -<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.equinox.p2.publisher.eclipse}"/> -</launchConfiguration>
\ No newline at end of file +<?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"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.equinox.p2.publisher.eclipse/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.equinox.p2.publisher.eclipse"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.equinox.p2.publisher.eclipse/.externalToolBuilders" type="2"/> <item path="/org.eclipse.equinox.p2.publisher.eclipse/bin_ant" type="2"/> <item path="/org.eclipse.equinox.p2.publisher.eclipse/scripts" type="2"/> <item path="/org.eclipse.equinox.p2.publisher.eclipse/src_ant" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.publisher.eclipse/scripts/buildExtraJAR.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.equinox.p2.publisher.eclipse}"/>
+</launchConfiguration>
|