diff options
| author | Michael Keppler | 2018-04-06 08:14:18 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-09-19 10:25:06 +0000 |
| commit | acc8715ab7bef66b2963990d60964551c0a434fe (patch) | |
| tree | e9d5f103494c9c477955e124833712b70452583b | |
| parent | 02bcc0e6c258e239c35f4b61aec1b95c9348b4ef (diff) | |
| download | rt.equinox.p2-acc8715ab7bef66b2963990d60964551c0a434fe.tar.gz rt.equinox.p2-acc8715ab7bef66b2963990d60964551c0a434fe.tar.xz rt.equinox.p2-acc8715ab7bef66b2963990d60964551c0a434fe.zip | |
Bug 533297 - AntTaskBuilder modifies workspace
There are multiple Ant based build scripts in the equinox.p2 repository,
which modify version controlled files immediately after checkout and
import. Those modified files should be checked in once (therefore this
pull request) or the Ant builds should be configured differently by
someone with the necessary knowledge.
Change-Id: I1244c3c2710c756e52785a1acd1af93d3e5ffcb7
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
3 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/.externalToolBuilders/AntTaskBuilder.launch b/bundles/org.eclipse.equinox.p2.jarprocessor/.externalToolBuilders/AntTaskBuilder.launch index ae5694459..b3b40cf85 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/.externalToolBuilders/AntTaskBuilder.launch +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/.externalToolBuilders/AntTaskBuilder.launch @@ -2,6 +2,7 @@ <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.jarprocessor/lib" type="2"/> </resources>}"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> <listEntry value="/org.eclipse.equinox.p2.jarprocessor/localbuild.xml"/> </listAttribute> @@ -13,7 +14,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.jarprocessor"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.jarprocessor/localbuild.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> <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.jarprocessor}"/> </launchConfiguration> diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/.project b/bundles/org.eclipse.equinox.p2.jarprocessor/.project index cf69b3579..73a1a7393 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/.project +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/.project @@ -22,7 +22,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/.project b/bundles/org.eclipse.equinox.p2.repository.tools/.project index 798ed3fd7..aaa76a6e7 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/.project +++ b/bundles/org.eclipse.equinox.p2.repository.tools/.project @@ -22,7 +22,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> |