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 2009/08/26 10:58:06 UTC

svn commit: r807931 - in /directory/studio/trunk: pom.xml repository/org/apache/directory/studio/launcher-linux-ppc/ studio/pom.xml studio/src/main/assembly/bin-linux-ppc.xml

Author: pamarcelot
Date: Wed Aug 26 08:58:05 2009
New Revision: 807931

URL: http://svn.apache.org/viewvc?rev=807931&view=rev
Log:
Fix for DIRSTUDIO-525 (Remove support for the Linux PPC distribution). Some files and strings were already removed when fixing DIRSTUDIO-523 (Update Eclipse dependencies to version 3.5 Galileo).

Removed:
    directory/studio/trunk/repository/org/apache/directory/studio/launcher-linux-ppc/
    directory/studio/trunk/studio/src/main/assembly/bin-linux-ppc.xml
Modified:
    directory/studio/trunk/pom.xml
    directory/studio/trunk/studio/pom.xml

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=807931&r1=807930&r2=807931&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Aug 26 08:58:05 2009
@@ -385,12 +385,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>launcher-linux-ppc</artifactId>
-      <type>tar.gz</type>
-      <version>1.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>launcher-macosx</artifactId>
       <type>tar.gz</type>
       <version>1.5.0</version>

Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=807931&r1=807930&r2=807931&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Wed Aug 26 08:58:05 2009
@@ -50,7 +50,7 @@
     - In the end the distribution is unzipped in ../target/distribution for immediate use
     
     Note: You can build different distribution in a single run a take the benefits of the general folder. Run e.g.
-          mvn clean install -Plinux-x86,linux-x86_64,linux-ppc,macosx,win32 -Dmaven.test.skip=true
+          mvn clean install -Plinux-x86,linux-x86_64,macosx,win32 -Dmaven.test.skip=true
           from the projects root to generate all available distribution in one run.
   -->
 
@@ -382,169 +382,6 @@
     </profile>
 
     <profile>
-      <id>linux-ppc</id>
-      <activation>
-        <os>
-          <arch>ppc</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <!--
-        Everything in here is linux-ppc specific. 
-        All sources/dependencies within this profile go to
-        target/ApacheDirectoryStudio-linux-ppc 
-      -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-studio-launcher-linux-ppc</id>
-                <!-- Unpack the studio launcher -->
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <overWrite>true</overWrite>
-                  <markersDirectory>${project.build.directory}/maven-dependency-plugin-markers/linux-ppc</markersDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.directory.studio</groupId>
-                      <artifactId>launcher-linux-ppc</artifactId>
-                      <type>tar.gz</type>
-                      <outputDirectory>${studio-dir}-linux-ppc</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>studio-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-plugins-linux-ppc</id>
-                <!-- Copy specific plugins for Linux PPC -->
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>copy-eclipse-artifact</goal>
-                </goals>
-                <configuration>
-                  <destinationDirectory>${studio-dir}-linux-ppc/plugins</destinationDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.eclipse.core.filesystem.linux</groupId>
-                      <artifactId>ppc</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.eclipse.swt.gtk.linux</groupId>
-                      <artifactId>ppc</artifactId>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-              <execution>
-	            <id>unpack-plugins-linux-ppc</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>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <!-- Create the distribution file -->
-            <configuration>
-              <finalName>ApacheDirectoryStudio-linux-ppc-${pom.version}</finalName>
-              <outputDirectory>target/distributions</outputDirectory>
-              <descriptors>
-                <descriptor>src/main/assembly/bin-linux-ppc.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <executions>
-              <execution>
-                <id>assembly-distribution-linux-ppc</id>
-                <phase>package</phase>
-                <configuration>
-                  <finalName>ApacheDirectoryStudio-linux-ppc-${pom.version}</finalName>
-                  <outputDirectory>../target/distributions</outputDirectory>
-                  <descriptors>
-                    <descriptor>src/main/assembly/bin-linux-ppc.xml</descriptor>
-                  </descriptors>
-                </configuration>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <!-- 
-                Finally and after all unzip the created distribution in
-                ../target/distributions to have a working application there for
-                immediate use.
-              -->
-              <execution>
-                <id>unpack-dist-linux-ppc (for immediate use)</id>
-                <phase>install</phase>
-                <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-ppc</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <repositoryId>apache.snapshots.https</repositoryId>
-                  <url>${distMgmtSnapshotsUrl}</url>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz</file>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}.dist</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-ppc</version>
-                  <uniqueVersion>false</uniqueVersion>
-                  <!-- generatePom>false</generatePom -->
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
       <id>win32</id>
       <activation>
         <os>