You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2007/11/07 21:46:35 UTC
svn commit: r592887 - in /directory/sandbox/felixk: ./ studio/
studio/src/main/assembly/
Author: felixk
Date: Wed Nov 7 12:46:34 2007
New Revision: 592887
URL: http://svn.apache.org/viewvc?rev=592887&view=rev
Log:
Activation does not work as wanted for now. As workaround using profile.
To run a build you a profile must be indicated, e.g.
mvn clean install -Plinux-i386
Added:
directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml (with props)
directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml
- copied unchanged from r592736, directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml
- copied unchanged from r592736, directory/sandbox/felixk/studio/src/main/assembly/bin-windows-vista-amd64.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml
- copied unchanged from r592736, directory/sandbox/felixk/studio/src/main/assembly/bin-windows-xp-x86.xml
Removed:
directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-vista-amd64.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-xp-x86.xml
Modified:
directory/sandbox/felixk/pom.xml
directory/sandbox/felixk/studio/pom.xml
Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=592887&r1=592886&r2=592887&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Wed Nov 7 12:46:34 2007
@@ -86,15 +86,18 @@
</properties>
<profiles>
- <!-- Linux i386 -->
+
+ <!-- Linux i386 GTK-->
<profile>
<id>linux-i386</id>
- <activation>
+ <!--
+ <activation>
<os>
- <name>linux</name>
- <arch>i386</arch>
+ <family>unix</family>
+ <arch>i386</arch>
</os>
- </activation>
+ </activation>
+ -->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86</swt.platformrelated.artifactId>
<rcp.platformrelated.artifactId>eclipse-RCP-linux-gtk</rcp.platformrelated.artifactId>
@@ -103,15 +106,17 @@
</properties>
</profile>
- <!-- Linux AMD64 -->
+ <!-- Linux AMD64 GTK-->
<profile>
<id>linux-amd64</id>
- <activation>
+ <!--
+ <activation>
<os>
- <name>linux</name>
- <arch>amd64</arch>
+ <family>unix</family>
+ <arch>amd64</arch>
</os>
- </activation>
+ </activation>
+ -->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.platformrelated.artifactId>
<rcp.platformrelated.artifactId>eclipse-RCP-linux-gtk</rcp.platformrelated.artifactId>
@@ -121,56 +126,101 @@
</properties>
</profile>
- <!-- Windows XP x86 -->
+ <!-- Linux PPC GTK-->
+ <profile>
+ <id>linux-ppc</id>
+ <!--
+ <activation>
+ <os>
+ <family>unix</family>
+ <arch>ppc</arch>
+ </os>
+ </activation>
+ -->
+ <properties>
+ <swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.ppc</swt.platformrelated.artifactId>
+ <rcp.platformrelated.artifactId>eclipse-RCP-linux-gtk</rcp.platformrelated.artifactId>
+ <rcp.platformrelated.classifier>ppc</rcp.platformrelated.classifier>
+ <rcp.platformrelated.type>tar.gz</rcp.platformrelated.type>
+ <assembly.descriptor>bin-linux-ppc</assembly.descriptor>
+ </properties>
+ </profile>
+
+ <!-- Windows -->
<profile>
- <id>windows-xp-x86</id>
- <activation>
+ <id>windows-x86</id>
+ <!--
+ <activation>
<os>
- <name>windows xp</name>
- <arch>x86</arch>
+ <family>windows</family>
+ <arch>x86</arch>
</os>
- </activation>
+ </activation>
+ -->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.win32.win32.x86</swt.platformrelated.artifactId>
<rcp.platformrelated.artifactId>eclipse-RCP-win32</rcp.platformrelated.artifactId>
<rcp.platformrelated.type>zip</rcp.platformrelated.type>
- <assembly.descriptor>bin-windows-xp-x86</assembly.descriptor>
+ <assembly.descriptor>bin-windows-x86</assembly.descriptor>
</properties>
</profile>
- <!-- Windows Vista AMD64 -->
+ <!-- Windows x86_64 -->
<profile>
- <id>windows-vista-amd64</id>
- <activation>
+ <id>windows-amd64</id>
+ <!--
+ <activation>
<os>
- <name>windows vista</name>
- <arch>amd64</arch>
+ <family>windows</family>
+ <arch>amd64</arch>
</os>
- </activation>
+ </activation>
+ -->
<properties>
<!-- only available for SDK/RCP >= 3.4
<swt.platformrelated.artifactId>org.eclipse.swt.win32.win32.x86</swt.platformrelated.artifactId>
<rcp.platformrelated.artifactId>eclipse-RCP-win32</rcp.platformrelated.artifactId>
-->
<rcp.platformrelated.type>zip</rcp.platformrelated.type>
- <assembly.descriptor>bin-windows-vista-amd64</assembly.descriptor>
+ <assembly.descriptor>bin-windows-amd64</assembly.descriptor>
</properties>
</profile>
<!-- Mac OS X i386 -->
<profile>
<id>mac-os-x-i386</id>
- <activation>
+ <!--
+ <activation>
+ <os>
+ <family>mac</family>
+ <arch>i386</arch>
+ </os>
+ </activation>
+ -->
+ <properties>
+ <swt.platformrelated.artifactId>org.eclipse.swt.carbon.macosx</swt.platformrelated.artifactId>
+ <rcp.platformrelated.artifactId>eclipse-RCP-macosx-carbon</rcp.platformrelated.artifactId>
+ <rcp.platformrelated.type>tar.gz</rcp.platformrelated.type>
+ <assembly.descriptor>bin-mac-os-x</assembly.descriptor>
+ </properties>
+ </profile>
+
+ <!-- Mac OS X PPC -->
+ <profile>
+ <id>mac-os-x-ppc</id>
+ <!--
+ <activation>
<os>
- <name>mac os x</name>
- <arch>i386</arch>
+ <family>mac</family>
+ <arch>ppc</arch>
</os>
- </activation>
+ </activation>
+ -->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.carbon.macosx</swt.platformrelated.artifactId>
<rcp.platformrelated.artifactId>eclipse-RCP-macosx-carbon</rcp.platformrelated.artifactId>
<rcp.platformrelated.type>tar.gz</rcp.platformrelated.type>
- <assembly.descriptor>bin-mac-os-x-i386</assembly.descriptor>
+ <assembly.descriptor>bin-mac-os-x</assembly.descriptor>
</properties>
</profile>
</profiles>
@@ -258,6 +308,11 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+ <version>3.2.1.v3235</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.swt.gtk.linux.ppc</artifactId>
<version>3.2.1.v3235</version>
</dependency>
<dependency>
Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=592887&r1=592886&r2=592887&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Wed Nov 7 12:46:34 2007
@@ -40,15 +40,17 @@
</properties>
<profiles>
- <!-- Linux i386 -->
+ <!-- Linux i386 GTK-->
<profile>
- <id>linux-i386org.eclipse.swt.gtk.linux</id>
+ <id>linux-i386</id>
+ <!--
<activation>
<os>
- <name>linux</name>
+ <family>unix</family>
<arch>i386</arch>
</os>
</activation>
+ -->
<build>
<plugins>
<plugin>
@@ -81,15 +83,60 @@
</build>
</profile>
- <!-- Linux AMD64 -->
+ <!-- Linux AMD64 GTK-->
<profile>
<id>linux-amd64</id>
+ <!--
<activation>
<os>
- <name>linux</name>
+ <family>unix</family>
<arch>amd64</arch>
</os>
</activation>
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>adapt-rcp-distribution</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <move file="target/eclipse" tofile="target/ApacheDirectoryStudio" />
+ <delete dir="target/ApacheDirectoryStudio" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio/about_files" />
+ <delete dir="target/ApacheDirectoryStudio/configuration" />
+ <delete dir="target/ApacheDirectoryStudio/feature" />
+ <delete dir="target/ApacheDirectoryStudio/plugins" />
+ <delete dir="target/ApacheDirectoryStudio/readme" />
+ <chmod file="target/ApacheDirectoryStudio/eclipse" perm="755" />
+ <move file="target/ApacheDirectoryStudio/eclipse" tofile="target/ApacheDirectoryStudio/ApacheDirectoryStudio" />
+ <copy file="src/main/configuration/config.ini" todir="target/ApacheDirectoryStudio/configuration" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Linux PPC GTK-->
+ <profile>
+ <id>linux-ppc</id>
+ <!--
+ <activation>
+ <os>
+ <family>unix</family>
+ <arch>ppc</arch>
+ </os>
+ </activation>
+ -->
<build>
<plugins>
<plugin>
@@ -122,15 +169,17 @@
</build>
</profile>
- <!-- Windows XP x86 -->
+ <!-- Windows -->
<profile>
- <id>windows-xp-x86</id>
+ <id>windows-x86</id>
+ <!--
<activation>
<os>
- <name>windows xp</name>
+ <family>windows</family>
<arch>x86</arch>
</os>
</activation>
+ -->
<build>
<plugins>
<plugin>
@@ -163,15 +212,17 @@
</build>
</profile>
- <!-- Windows Vista AMD64 -->
+ <!-- Windows x86_64 -->
<profile>
- <id>windows-vista-amd64</id>
+ <id>windows-amd64</id>
+ <!--
<activation>
<os>
- <name>windows vista</name>
+ <family>windows</family>
<arch>amd64</arch>
</os>
</activation>
+ -->
<!-- only available for SDK/RCP >= 3.4
<build>
<plugins>
@@ -209,12 +260,83 @@
<!-- Mac OS X i386 -->
<profile>
<id>mac-os-x-i386</id>
+ <!--
<activation>
<os>
- <name>mac os x</name>
+ <family>mac</family>
<arch>i386</arch>
</os>
</activation>
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>adapt-rcp-distribution</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <move file="target/eclipse" tofile="target/ApacheDirectoryStudio" />
+ <move file="target/ApacheDirectoryStudio/Eclipse.app" tofile="target/ApacheDirectoryStudio/Apache Directory Studio.app" />
+ <move file="target/ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/eclipse" tofile="target/ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" />
+ <delete file="target/ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/eclipse.ini" />
+ <delete file="target/ApacheDirectoryStudio/eclipse" />
+ <delete dir="target/ApacheDirectoryStudio" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio/about_files" />
+ <delete dir="target/ApacheDirectoryStudio/configuration" />
+ <delete dir="target/ApacheDirectoryStudio/features" />
+ <delete dir="target/ApacheDirectoryStudio/plugins" />
+ <delete dir="target/ApacheDirectoryStudio/readme" />
+ <chmod file="target/ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
+ <copy file="src/main/configuration/config.ini" todir="target/ApacheDirectoryStudio/configuration" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>create-link-for-ApacheDirectoryStudio</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>ln</executable>
+ <workingDirectory>target/ApacheDirectoryStudio</workingDirectory>
+ <arguments>
+ <argument>-s</argument>
+ <argument>Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio</argument>
+ <argument>ApacheDirectoryStudio</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Mac OS X PPC -->
+ <profile>
+ <id>mac-os-x-ppc</id>
+ <!--
+ <activation>
+ <os>
+ <family>mac</family>
+ <arch>ppc</arch>
+ </os>
+ </activation>
+ -->
<build>
<plugins>
<plugin>
Added: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml?rev=592887&view=auto
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml (added)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml Wed Nov 7 12:46:34 2007
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: $ $Date: $ -->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>dist</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>ApacheDirectoryStudio</exclude>
+ </excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>ApacheDirectoryStudio</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Propchange: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml
------------------------------------------------------------------------------
svn:eol-style = native