diff options
| author | Thanh Ha | 2012-12-10 10:02:55 +0000 |
|---|---|---|
| committer | Szymon Brandys | 2012-12-10 10:02:55 +0000 |
| commit | 790463089bdee22fe48cd03cbe07e7ff36859ce7 (patch) | |
| tree | 4c69473253dba55dc15c78e3903fee227780985f | |
| parent | ef2b5bd22f8e8c3707de014e69e5b695c6088de6 (diff) | |
| download | eclipse.platform.resources-790463089bdee22fe48cd03cbe07e7ff36859ce7.tar.gz eclipse.platform.resources-790463089bdee22fe48cd03cbe07e7ff36859ce7.tar.xz eclipse.platform.resources-790463089bdee22fe48cd03cbe07e7ff36859ce7.zip | |
bug 396102 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-100255I20121212-0800I20121211-2000I20121211-0800I20121210-2000I20121210-0800
eclipse.platform.resources
| -rw-r--r-- | bundles/org.eclipse.core.resources.win32.x86_64/pom.xml | 21 | ||||
| -rw-r--r-- | pom.xml | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/bundles/org.eclipse.core.resources.win32.x86_64/pom.xml b/bundles/org.eclipse.core.resources.win32.x86_64/pom.xml index 62a465ca7..72d32bb8b 100644 --- a/bundles/org.eclipse.core.resources.win32.x86_64/pom.xml +++ b/bundles/org.eclipse.core.resources.win32.x86_64/pom.xml @@ -20,4 +20,25 @@ <artifactId>org.eclipse.core.resources.win32.x86_64</artifactId> <version>3.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <!-- tycho is not able to automatically determine os/ws/arch of this bundle --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> @@ -33,7 +33,7 @@ <modules> <module>bundles/org.eclipse.core.filesystem</module> - <module>bundles/org.eclipse.core.filesystem.hpux.ia64_32</module> + <module>bundles/org.eclipse.core.filesystem.hpux.ia64</module> <module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module> <module>bundles/org.eclipse.core.filesystem.linux.ppc</module> <module>bundles/org.eclipse.core.filesystem.linux.x86</module> @@ -50,7 +50,6 @@ <module>bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9</module> <module>bundles/org.eclipse.core.resources</module> - <module>bundles/org.eclipse.core.resources.compatibility</module> <module>bundles/org.eclipse.core.resources.spysupport</module> <module>bundles/org.eclipse.core.resources.win32.x86</module> <module>bundles/org.eclipse.core.resources.win32.x86_64</module> |