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/10 11:08:50 UTC
svn commit: r593759 - in /directory/sandbox/felixk: ./ studio/
studio/src/main/assembly/
Author: felixk
Date: Sat Nov 10 02:08:48 2007
New Revision: 593759
URL: http://svn.apache.org/viewvc?rev=593759&view=rev
Log:
Make distribution build for multiple profiles working, e.g.
mvn clean install -Dmaven.test.skip=true -Plinux-i386,linux-amd64,linux-ppc,windows-x86,mac-os-x-i386
will result in
felix@donar ~/svn/apache/directory/maven-studio/target/distributions $ l
total 183314
drwxr-xr-x 2 felix felix 544 Nov 10 11:03 ./
drwxr-xr-x 4 felix felix 152 Nov 10 11:02 ../
-rw-r--r-- 1 felix felix 32483738 Nov 10 11:03 ApacheDirectoryStudio-linux-amd64-1.0.2-SNAPSHOT-dist.tar.gz
-rw-r--r-- 1 felix felix 32438315 Nov 10 11:03 ApacheDirectoryStudio-linux-i386-1.0.2-SNAPSHOT-dist.tar.gz
-rw-r--r-- 1 felix felix 32393543 Nov 10 11:03 ApacheDirectoryStudio-linux-ppc-1.0.2-SNAPSHOT-dist.tar.gz
-rw-r--r-- 1 felix felix 32132052 Nov 10 11:03 ApacheDirectoryStudio-mac-os-x-i386-1.0.2-SNAPSHOT-dist.tar.gz
-rw-r--r-- 1 felix felix 32329114 Nov 10 11:03 ApacheDirectoryStudio-windows-x86-1.0.2-SNAPSHOT-dist.tar.gz
-rw-r--r-- 1 felix felix 12869574 Nov 10 11:02 updatesite-1.0.0-dist.tar.gz
-rw-r--r-- 1 felix felix 12873816 Nov 10 11:02 updatesite-1.0.0-dist.zip
Added:
directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml
- copied, changed from r593669, directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml (with props)
Removed:
directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml
Modified:
directory/sandbox/felixk/pom.xml
directory/sandbox/felixk/studio/pom.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml
directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml
Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Sat Nov 10 02:08:48 2007
@@ -129,9 +129,6 @@
-->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86</swt.platformrelated.artifactId>
- <rcp.platformrelated.artifactId>eclipse-RCP-linux-gtk</rcp.platformrelated.artifactId>
- <rcp.platformrelated.type>tar.gz</rcp.platformrelated.type>
- <assembly.descriptor>bin-linux-i386</assembly.descriptor>
</properties>
</profile>
@@ -148,10 +145,6 @@
-->
<properties>
<swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.platformrelated.artifactId>
- <rcp.platformrelated.artifactId>eclipse-RCP-linux-gtk</rcp.platformrelated.artifactId>
- <rcp.platformrelated.classifier>x86_64</rcp.platformrelated.classifier>
- <rcp.platformrelated.type>tar.gz</rcp.platformrelated.type>
- <assembly.descriptor>bin-linux-amd64</assembly.descriptor>
</properties>
</profile>
@@ -168,10 +161,6 @@
-->
<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>
@@ -188,9 +177,6 @@
-->
<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-x86</assembly.descriptor>
</properties>
</profile>
@@ -208,10 +194,7 @@
<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-amd64</assembly.descriptor>
</properties>
</profile>
@@ -228,9 +211,6 @@
-->
<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>
@@ -247,9 +227,6 @@
-->
<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>
</profiles>
Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Sat Nov 10 02:08:48 2007
@@ -44,33 +44,59 @@
<profile>
<id>linux-i386</id>
<!--
- <activation>
+ <activation>
<os>
- <family>unix</family>
- <arch>i386</arch>
+ <family>unix</family>
+ <arch>i386</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-linux-i386</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-i386</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-linux-gtk</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/linux-i386</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-linux-i386</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/features" />
- <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" />
+ <move file="target/linux-i386/eclipse" tofile="target/ApacheDirectoryStudio-linux-i386" />
+ <delete dir="target/ApacheDirectoryStudio-linux-i386" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-linux-i386/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-linux-i386/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-linux-i386/features" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-linux-i386/plugins" excludes="**/org.eclipse.swt.gtk.linux.x86*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-linux-i386/readme" />
+ <chmod file="target/ApacheDirectoryStudio-linux-i386/eclipse" perm="755" />
+ <move file="target/ApacheDirectoryStudio-linux-i386/eclipse" tofile="target/ApacheDirectoryStudio-linux-i386/ApacheDirectoryStudio" />
</tasks>
</configuration>
<goals>
@@ -79,6 +105,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-linux-i386-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-linux-i386.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-linux-i386</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-linux-i386-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-linux-i386.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -87,33 +139,60 @@
<profile>
<id>linux-amd64</id>
<!--
- <activation>
+ <activation>
<os>
- <family>unix</family>
- <arch>amd64</arch>
+ <family>unix</family>
+ <arch>amd64</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-linux-amd64</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-amd64</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-linux-gtk</artifactId>
+ <classifier>x86_64</classifier>
+ <type>tar.gz</type>
+ <outputDirectory>target/linux-amd64</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-linux-amd64</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" />
+ <move file="target/linux-amd64/eclipse" tofile="target/ApacheDirectoryStudio-linux-amd64" />
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64/feature" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-linux-amd64/plugins" excludes="**/org.eclipse.swt.gtk.linux.x86_64*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64/readme" />
+ <chmod file="target/ApacheDirectoryStudio-linux-amd64/eclipse" perm="755" />
+ <move file="target/ApacheDirectoryStudio-linux-amd64/eclipse" tofile="target/ApacheDirectoryStudio-linux-amd64/ApacheDirectoryStudio" />
</tasks>
</configuration>
<goals>
@@ -122,6 +201,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-linux-amd64-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-linux-amd64.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-linux-amd64</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-linux-amd64-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-linux-amd64.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -130,33 +235,60 @@
<profile>
<id>linux-ppc</id>
<!--
- <activation>
+ <activation>
<os>
- <family>unix</family>
- <arch>ppc</arch>
+ <family>unix</family>
+ <arch>ppc</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-linux-ppc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-ppc</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-linux-gtk</artifactId>
+ <classifier>ppc</classifier>
+ <type>tar.gz</type>
+ <outputDirectory>target/linux-ppc</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-linux-ppc</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" />
+ <move file="target/linux-ppc/eclipse" tofile="target/ApacheDirectoryStudio-linux-ppc" />
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc/feature" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-linux-ppc/plugins" excludes="**/org.eclipse.swt.gtk.linux.ppc*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc/readme" />
+ <chmod file="target/ApacheDirectoryStudio-linux-ppc/eclipse" perm="755" />
+ <move file="target/ApacheDirectoryStudio-linux-ppc/eclipse" tofile="target/ApacheDirectoryStudio-linux-ppc/ApacheDirectoryStudio" />
</tasks>
</configuration>
<goals>
@@ -165,6 +297,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-linux-pcc-${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>
</plugins>
</build>
</profile>
@@ -173,33 +331,59 @@
<profile>
<id>windows-x86</id>
<!--
- <activation>
+ <activation>
<os>
- <family>windows</family>
- <arch>x86</arch>
+ <family>windows</family>
+ <arch>x86</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-windows-x86</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/windows-x86</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-win32</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/windows-x86</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-windows-x86</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/features" />
- <delete dir="target/ApacheDirectoryStudio/plugins" />
- <delete dir="target/ApacheDirectoryStudio/readme" />
- <chmod file="target/ApacheDirectoryStudio/eclipse.exe" perm="755" />
- <move file="target/ApacheDirectoryStudio/eclipse.exe" tofile="target/ApacheDirectoryStudio/Apache Directory Studio.exe" />
- <copy file="src/main/configuration/config.ini" todir="target/ApacheDirectoryStudio/configuration" overwrite="true" />
+ <move file="target/windows-x86/eclipse" tofile="target/ApacheDirectoryStudio-windows-x86" />
+ <delete dir="target/ApacheDirectoryStudio-windows-x86" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-windows-x86/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-windows-x86/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-windows-x86/features" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-windows-x86/plugins" excludes="**/org.eclipse.swt.win32.win32.x86*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-windows-x86/readme" />
+ <chmod file="target/ApacheDirectoryStudio-windows-x86/eclipse.exe" perm="755" />
+ <move file="target/ApacheDirectoryStudio-windows-x86/eclipse.exe" tofile="target/ApacheDirectoryStudio-windows-x86/Apache Directory Studio.exe" />
</tasks>
</configuration>
<goals>
@@ -208,6 +392,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-windows-x86-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-windows-x86.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-windows-x86</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-windows-x86-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-windows-x86.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -216,34 +426,61 @@
<profile>
<id>windows-amd64</id>
<!--
- <activation>
+ <activation>
<os>
- <family>windows</family>
- <arch>amd64</arch>
+ <family>windows</family>
+ <arch>amd64</arch>
</os>
- </activation>
+ </activation>
-->
- <!-- only available for SDK/RCP >= 3.4
+ <!-- only available for SDK/RCP >= 3.4 -->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-windows-amd64</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/windows-amd64</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-win32</artifactId>
+ <classifier>x86_64</classifier>
+ <type>zip</type>
+ <outputDirectory>target/windows-amd64</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-windows-amd64</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/features" />
- <delete dir="target/ApacheDirectoryStudio/plugins" />
- <delete dir="target/ApacheDirectoryStudio/readme" />
- <chmod file="target/ApacheDirectoryStudio/eclipse.exe" perm="755" />
- <move file="target/ApacheDirectoryStudio/eclipse.exe" tofile="target/ApacheDirectoryStudio/Apache Directory Studio.exe" />
- <copy file="src/main/configuration/config.ini" todir="target/ApacheDirectoryStudio/configuration" overwrite="true" />
+ <move file="target/windows-amd64/eclipse" tofile="target/ApacheDirectoryStudio-windows-amd64" />
+ <delete dir="target/ApacheDirectoryStudio-windows-amd64" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-windows-amd64/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-windows-amd64/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-windows-amd64/features" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-windows-amd64/plugins" excludes="**/org.eclipse.swt.win32.*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-windows-amd64/readme" />
+ <chmod file="target/ApacheDirectoryStudio-windows-amd64/eclipse.exe" perm="755" />
+ <move file="target/ApacheDirectoryStudio-windows-amd64/eclipse.exe" tofile="target/ApacheDirectoryStudio-windows-amd64/Apache Directory Studio.exe" />
</tasks>
</configuration>
<goals>
@@ -252,45 +489,96 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-windows-amd64-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-windows-amd64.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-windows-amd64</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-windows-amd64-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-windows-amd64.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- -->
</profile>
<!-- Mac OS X i386 -->
<profile>
<id>mac-os-x-i386</id>
<!--
- <activation>
+ <activation>
<os>
- <family>mac</family>
- <arch>i386</arch>
+ <family>mac</family>
+ <arch>i386</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-mac-os-x-i386</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/mac-os-x-i386</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-macosx-carbon</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/mac-os-x-i386</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-mac-os-x-i386</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" />
+ <move file="target/mac-os-x-i386/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-i386" />
+ <move file="target/ApacheDirectoryStudio-mac-os-x-i386/Eclipse.app" tofile="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app" />
+ <move file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" />
+ <delete file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/eclipse.ini" />
+ <delete file="target/ApacheDirectoryStudio-mac-os-x-i386/eclipse" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/features" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-mac-os-x-i386/plugins" excludes="**/org.eclipse.swt.carbon.macosx*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/readme" />
+ <chmod file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
</tasks>
</configuration>
<goals>
@@ -305,7 +593,7 @@
<version>1.1-SNAPSHOT</version>
<executions>
<execution>
- <id>create-link-for-ApacheDirectoryStudio</id>
+ <id>create-link-for-ApacheDirectoryStudio-mac-os-x-i386</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
@@ -314,7 +602,7 @@
</executions>
<configuration>
<executable>ln</executable>
- <workingDirectory>target/ApacheDirectoryStudio</workingDirectory>
+ <workingDirectory>target/ApacheDirectoryStudio-mac-os-x-i386</workingDirectory>
<arguments>
<argument>-s</argument>
<argument>Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio</argument>
@@ -322,6 +610,32 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-mac-os-x-i386-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-mac-os-x-i386.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-mac-os-x-i386</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-mac-os-x-i386-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-mac-os-x-i386.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -330,36 +644,62 @@
<profile>
<id>mac-os-x-ppc</id>
<!--
- <activation>
+ <activation>
<os>
- <family>mac</family>
- <arch>ppc</arch>
+ <family>mac</family>
+ <arch>ppc</arch>
</os>
- </activation>
+ </activation>
-->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eclipse-rcp-mac-os-x-ppc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>false</overWrite>
+ <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/mac-os-x-ppc</markersDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-RCP-macosx-carbon</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/mac-os-x-ppc</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>adapt-rcp-distribution</id>
+ <id>adapt-rcp-distribution-mac-os-x-ppc</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" />
+ <move file="target/mac-os-x-ppc/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-ppc" />
+ <move file="target/ApacheDirectoryStudio-mac-os-x-ppc/Eclipse.app" tofile="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app" />
+ <move file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" />
+ <delete file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/eclipse.ini" />
+ <delete file="target/ApacheDirectoryStudio-mac-os-x-ppc/eclipse" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/about_files" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/configuration" />
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/features" />
+ <delete>
+ <fileset dir="target/ApacheDirectoryStudio-mac-os-x-ppc/plugins" excludes="**/org.eclipse.swt.carbon.macosx*" />
+ </delete>
+ <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/readme" />
+ <chmod file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
</tasks>
</configuration>
<goals>
@@ -374,7 +714,7 @@
<version>1.1-SNAPSHOT</version>
<executions>
<execution>
- <id>create-link-for-ApacheDirectoryStudio</id>
+ <id>create-link-for-ApacheDirectoryStudio-mac-os-x-ppc</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
@@ -383,7 +723,7 @@
</executions>
<configuration>
<executable>ln</executable>
- <workingDirectory>target/ApacheDirectoryStudio</workingDirectory>
+ <workingDirectory>target/ApacheDirectoryStudio-mac-os-x-ppc</workingDirectory>
<arguments>
<argument>-s</argument>
<argument>Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio</argument>
@@ -391,90 +731,44 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}</finalName>
+ <outputDirectory>target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-mac-os-x-ppc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly-distribution-mac-os-x-ppc</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}</finalName>
+ <outputDirectory>../target/distributions</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-mac-os-x-ppc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
- <resources>
- <resource>
- <directory>src/main/configuration</directory>
- <targetPath>../ApacheDirectoryStudio/configuration</targetPath>
- <includes>
- <include>config.ini</include>
- </includes>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/configuration</directory>
- <targetPath>../ApacheDirectoryStudio</targetPath>
- <includes>
- <include>studio.xpm</include>
- </includes>
- </resource>
- <resource>
- <directory>../docs</directory>
- <targetPath>../ApacheDirectoryStudio</targetPath>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
- </resources>
-
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <configuration>
- <finalName>ApacheDirectoryStudio-${pom.version}</finalName>
- <outputDirectory>target/distributions</outputDirectory>
- <descriptors>
- <descriptor>src/main/assembly/${assembly.descriptor}.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <finalName>ApacheDirectoryStudio-${pom.version}</finalName>
- <outputDirectory>../target/distributions</outputDirectory>
- <descriptors>
- <descriptor>src/main/assembly/${assembly.descriptor}.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack-eclipse-rcp</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>target</outputDirectory>
- <overWrite>false</overWrite>
- <artifactItems>
- <artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>${rcp.platformrelated.artifactId}</artifactId>
- <classifier>${rcp.platformrelated.classifier}</classifier>
- <type>${rcp.platformrelated.type}</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
<id>unpack-eclipse-plugins</id>
<phase>process-resources</phase>
<goals>
@@ -603,10 +897,6 @@
<configuration>
<destinationDirectory>${studio-dir}/plugins</destinationDirectory>
<artifactItems>
- <artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>${swt.platformrelated.artifactId}</artifactId>
- </artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.update.ui</artifactId>
Modified: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml Sat Nov 10 02:08:48 2007
@@ -16,16 +16,16 @@
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">
+<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>
+
+ <!-- Platform specific -->
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-amd64</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>ApacheDirectoryStudio</exclude>
@@ -33,12 +33,43 @@
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-amd64</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>ApacheDirectoryStudio</include>
</includes>
<fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>
Modified: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml Sat Nov 10 02:08:48 2007
@@ -16,16 +16,16 @@
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">
+<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>
+
+ <!-- Platform specific -->
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-i386</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>ApacheDirectoryStudio</exclude>
@@ -33,12 +33,43 @@
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-i386</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>ApacheDirectoryStudio</include>
</includes>
<fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>
Modified: 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=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml Sat Nov 10 02:08:48 2007
@@ -16,16 +16,16 @@
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">
+<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>
+
+ <!-- Platform specific -->
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-ppc</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>ApacheDirectoryStudio</exclude>
@@ -33,12 +33,43 @@
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-linux-ppc</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>ApacheDirectoryStudio</include>
</includes>
<fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>
Copied: directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml (from r593669, directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml?p2=directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml&p1=directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml&r1=593669&r2=593759&rev=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml Sat Nov 10 02:08:48 2007
@@ -1,19 +1,19 @@
<?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.
+ 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">
@@ -22,8 +22,10 @@
<format>tar.gz</format>
</formats>
<fileSets>
+
+ <!-- Platform specific -->
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-mac-os-x-i386</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>ApacheDirectoryStudio</exclude>
@@ -31,12 +33,43 @@
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>target/ApacheDirectoryStudio</directory>
+ <directory>target/ApacheDirectoryStudio-mac-os-x-i386</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>ApacheDirectoryStudio</include>
</includes>
<fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>
Added: directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml?rev=593759&view=auto
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml (added)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml Sat Nov 10 02:08:48 2007
@@ -0,0 +1,76 @@
+<?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>
+
+ <!-- Platform specific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-mac-os-x-ppc</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>ApacheDirectoryStudio</exclude>
+ </excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-mac-os-x-ppc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>ApacheDirectoryStudio</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Propchange: directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml Sat Nov 10 02:08:48 2007
@@ -1,30 +1,75 @@
<?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.
+ 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>zip</format>
+ <format>tar.gz</format>
</formats>
<fileSets>
+
+ <!-- Platform specific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-windows-amd64</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>ApacheDirectoryStudio</exclude>
+ </excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-windows-amd64</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>ApacheDirectoryStudio</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
<fileSet>
<directory>target/ApacheDirectoryStudio</directory>
<outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>
Modified: directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml?rev=593759&r1=593758&r2=593759&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml Sat Nov 10 02:08:48 2007
@@ -1,30 +1,75 @@
<?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.
+ 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>zip</format>
+ <format>tar.gz</format>
</formats>
<fileSets>
+
+ <!-- Platform specific -->
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-windows-x86</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>ApacheDirectoryStudio</exclude>
+ </excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/ApacheDirectoryStudio-windows-x86</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>ApacheDirectoryStudio</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <!-- Platform unspecific -->
<fileSet>
<directory>target/ApacheDirectoryStudio</directory>
<outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/configuration</outputDirectory>
+ <includes>
+ <include>config.ini</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/configuration</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>studio.xpm</include>
+ </includes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
</fileSet>
</fileSets>
</assembly>