You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/09/04 15:18:22 UTC
svn commit: r692001 - /directory/studio/trunk/studio/pom.xml
Author: pamarcelot
Date: Thu Sep 4 06:18:22 2008
New Revision: 692001
URL: http://svn.apache.org/viewvc?rev=692001&view=rev
Log:
Fix for DIRSTUDIO-376 (Move to the latest Eclipse 3.4 dependencies):
o Fixed the build failure on other distributions than Mac OS X
Modified:
directory/studio/trunk/studio/pom.xml
Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=692001&r1=692000&r2=692001&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Thu Sep 4 06:18:22 2008
@@ -76,8 +76,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>launcher-linux-x86 (unpack)</id>
- <!-- Unpack the launcher and equinox launcher -->
+ <id>unpack-studio-launcher-linux-x86</id>
+ <!-- Unpack the studio launcher -->
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
@@ -92,11 +92,6 @@
<type>tar.gz</type>
<outputDirectory>${studio-dir}-linux-x86</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <outputDirectory>${studio-dir}-linux-x86/plugins</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -107,8 +102,8 @@
<artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>swt-linux-x86 (copy)</id>
- <!-- Copy profile specific swt -->
+ <id>copy-plugins-linux-x86</id>
+ <!-- Copy specific plugins for Linux x86 -->
<phase>generate-resources</phase>
<goals>
<goal>copy-eclipse-artifact</goal>
@@ -117,16 +112,33 @@
<destinationDirectory>${studio-dir}-linux-x86/plugins</destinationDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <groupId>org.eclipse.core.filesystem.linux</groupId>
<artifactId>x86</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.core.filesystem.linux</groupId>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-plugins-linux-x86</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${studio-dir}-linux-x86/plugins</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+ <artifactId>x86</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -225,8 +237,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>launcher-linux-x86_64 (unpack)</id>
- <!-- Unpack the launcher and equinox launcher -->
+ <id>unpack-studio-launcher-linux-x86_64</id>
+ <!-- Unpack the studio launcher -->
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
@@ -241,11 +253,6 @@
<type>tar.gz</type>
<outputDirectory>${studio-dir}-linux-x86_64</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
- <artifactId>x86_64</artifactId>
- <outputDirectory>${studio-dir}-linux-x86_64/plugins</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -256,8 +263,8 @@
<artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>swt-linux-x86_64 (copy)</id>
- <!-- Copy profile specific swt -->
+ <id>copy-plugins-linux-x86_64</id>
+ <!-- Copy specific plugins for Linux x86_64 -->
<phase>generate-resources</phase>
<goals>
<goal>copy-eclipse-artifact</goal>
@@ -266,16 +273,33 @@
<destinationDirectory>${studio-dir}-linux-x86_64/plugins</destinationDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <groupId>org.eclipse.core.filesystem.linux</groupId>
<artifactId>x86_64</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.core.filesystem.linux</groupId>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86_64</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-plugins-linux-x86_64</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${studio-dir}-linux-x86_64/plugins</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -374,8 +398,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>launcher-linux-ppc (unpack)</id>
- <!-- Unpack the launcher and equinox launcher -->
+ <id>unpack-studio-launcher-linux-ppc</id>
+ <!-- Unpack the studio launcher -->
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
@@ -390,11 +414,6 @@
<type>tar.gz</type>
<outputDirectory>${studio-dir}-linux-ppc</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
- <artifactId>ppc</artifactId>
- <outputDirectory>${studio-dir}-linux-ppc/plugins</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -405,8 +424,8 @@
<artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>swt-linux-ppc (copy)</id>
- <!-- Copy profile specific swt -->
+ <id>copy-plugins-linux-ppc</id>
+ <!-- Copy specific plugins for Linux PPC -->
<phase>generate-resources</phase>
<goals>
<goal>copy-eclipse-artifact</goal>
@@ -415,16 +434,33 @@
<destinationDirectory>${studio-dir}-linux-ppc/plugins</destinationDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <groupId>org.eclipse.core.filesystem.linux</groupId>
<artifactId>ppc</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.core.filesystem.linux</groupId>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>ppc</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-plugins-linux-x86_64</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${studio-dir}-linux-ppc/plugins</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+ <artifactId>ppc</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -522,8 +558,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>launcher-win32 (unpack)</id>
- <!-- Unpack the launcher and equinox launcher -->
+ <id>unpack-studio-launcher-win32</id>
+ <!-- Unpack the studio launcher -->
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
@@ -538,11 +574,6 @@
<type>tar.gz</type>
<outputDirectory>${studio-dir}-win32</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
- <artifactId>x86</artifactId>
- <outputDirectory>${studio-dir}-win32/plugins</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -553,8 +584,8 @@
<artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>swt-win32 (copy)</id>
- <!-- Copy profile specific swt -->
+ <id>copy-plugins-win32</id>
+ <!-- Copy specific plugins for Windows -->
<phase>generate-resources</phase>
<goals>
<goal>copy-eclipse-artifact</goal>
@@ -563,16 +594,33 @@
<destinationDirectory>${studio-dir}-win32/plugins</destinationDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse.swt.win32.win32</groupId>
+ <groupId>org.eclipse.core.filesystem.win32</groupId>
<artifactId>x86</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.core.filesystem.win32</groupId>
+ <groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-plugins-win32</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${studio-dir}-linux-ppc/plugins</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
+ <artifactId>x86</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -670,8 +718,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>launcher-macosx (copy)</id>
- <!-- Copy the launcher and equinox launcher -->
+ <id>copy-studio-launcher-macosx</id>
+ <!-- Copy the studio launcher -->
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
@@ -694,8 +742,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>launcher-macosx (unpack)</id>
- <!-- Unpack the launcher and equinox launcher -->
+ <id>unpack-studio-launcher-macosx</id>
+ <!-- Unpack the studio launcher -->
<phase>generate-resources</phase>
<configuration>
<tasks>
@@ -757,8 +805,8 @@
<artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>swt-macosx (copy)</id>
- <!-- Copy profile specific swt -->
+ <id>copy-plugins-macosx</id>
+ <!-- Copy specific plugins for Mac OS X -->
<phase>generate-resources</phase>
<goals>
<goal>copy-eclipse-artifact</goal>
@@ -767,11 +815,11 @@
<destinationDirectory>${studio-dir}-macosx/Apache Directory Studio.app/Contents/Resources/Java/plugins</destinationDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse.swt.carbon</groupId>
+ <groupId>org.eclipse.core.filesystem</groupId>
<artifactId>macosx</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.core.filesystem</groupId>
+ <groupId>org.eclipse.jdt.launching</groupId>
<artifactId>macosx</artifactId>
</artifactItem>
<artifactItem>
@@ -779,14 +827,14 @@
<artifactId>carbon</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse.jdt.launching</groupId>
+ <groupId>org.eclipse.swt.carbon</groupId>
<artifactId>macosx</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
- <id>unpack-launcher-macosx</id>
+ <id>unpack-plugins-macosx</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-with-artifactid-prefix</goal>