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 2011/09/05 13:23:42 UTC
svn commit: r1165244 - in /directory/apacheds/trunk: installers/pom.xml
pom.xml
Author: pamarcelot
Date: Mon Sep 5 11:23:42 2011
New Revision: 1165244
URL: http://svn.apache.org/viewvc?rev=1165244&view=rev
Log:
Re-integrated the 'installers-maven-plugin' and 'installers' sub-modules in the default build. Installers generation is triggered by the use of the 'installers' profile ('-Pinstallers').
Modified:
directory/apacheds/trunk/installers/pom.xml
directory/apacheds/trunk/pom.xml
Modified: directory/apacheds/trunk/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/pom.xml?rev=1165244&r1=1165243&r2=1165244&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/pom.xml (original)
+++ directory/apacheds/trunk/installers/pom.xml Mon Sep 5 11:23:42 2011
@@ -54,107 +54,126 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>installers</id>
+ <build>
+ <plugins>
+ <!-- Generating installers -->
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-installers-maven-plugin</artifactId>
+ <configuration>
+
+ <!-- Targets for Mac OS X .pkg installer packages -->
+ <macOsXPkgTargets>
+ <macOsXPkgTarget>
+ <id>apacheds-macosx-32bit</id>
+ <finalName>apacheds-${project.version}-32bit.dmg</finalName>
+ <osArch>x86</osArch>
+ </macOsXPkgTarget>
+ <macOsXPkgTarget>
+ <id>apacheds-macosx-64bit</id>
+ <finalName>apacheds-${project.version}-64bit.dmg</finalName>
+ <osArch>x86_64</osArch>
+ </macOsXPkgTarget>
+ </macOsXPkgTargets>
+
+ <!-- Target for Windows installer package -->
+ <nsisTargets>
+ <nsisTarget>
+ <id>apacheds-win32</id>
+ <finalName>apacheds-${project.version}.exe</finalName>
+ </nsisTarget>
+ </nsisTargets>
+
+ <!-- Targets for Archive installer -->
+ <archiveTargets>
+ <archiveTarget>
+ <id>apacheds-archive-zip</id>
+ <finalName>apacheds-${project.version}.zip</finalName>
+ <archiveType>zip</archiveType>
+ </archiveTarget>
+ <archiveTarget>
+ <id>apacheds-archive-tar.gz</id>
+ <finalName>apacheds-${project.version}.tar.gz</finalName>
+ <archiveType>tar.gz</archiveType>
+ </archiveTarget>
+ </archiveTargets>
+
+ <!-- Targets for Linux .bin installer -->
+ <binTargets>
+ <binTarget>
+ <id>apacheds-bin-installer-32bit</id>
+ <finalName>apacheds-${project.version}-32bit.bin</finalName>
+ <osName>Linux</osName>
+ <osArch>x86</osArch>
+ </binTarget>
+ <binTarget>
+ <id>apacheds-bin-installer-64bit</id>
+ <finalName>apacheds-${project.version}-64bit.bin</finalName>
+ <osName>Linux</osName>
+ <osArch>x86_64</osArch>
+ </binTarget>
+ </binTargets>
+
+ <!-- Targets for Linux .deb installer package -->
+ <debTargets>
+ <debTarget>
+ <id>apacheds-debian-i386</id>
+ <finalName>apacheds-${project.version}-i386.deb</finalName>
+ <osName>Linux</osName>
+ <osArch>i386</osArch>
+ </debTarget>
+ <debTarget>
+ <id>apacheds-debian-amd64</id>
+ <finalName>apacheds-${project.version}-amd64.deb</finalName>
+ <osName>Linux</osName>
+ <osArch>amd64</osArch>
+ </debTarget>
+ </debTargets>
+
+ <!-- Targets for Linux .rpm installer package -->
+ <rpmTargets>
+ <rpmTarget>
+ <id>apacheds-rpm-i386</id>
+ <finalName>apacheds-${project.version}-i386.rpm</finalName>
+ <osName>Linux</osName>
+ <osArch>i386</osArch>
+ </rpmTarget>
+ <rpmTarget>
+ <id>apacheds-rpm-x86_64</id>
+ <finalName>apacheds-${project.version}-x86_64.rpm</finalName>
+ <osName>Linux</osName>
+ <osArch>x86_64</osArch>
+ </rpmTarget>
+ </rpmTargets>
+
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-installers-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
- <!-- Generating installers -->
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-installers-maven-plugin</artifactId>
- <configuration>
-
- <!-- Targets for Mac OS X .pkg installer packages -->
- <macOsXPkgTargets>
- <macOsXPkgTarget>
- <id>apacheds-macosx-32bit</id>
- <finalName>apacheds-${project.version}-32bit.dmg</finalName>
- <osArch>x86</osArch>
- </macOsXPkgTarget>
- <macOsXPkgTarget>
- <id>apacheds-macosx-64bit</id>
- <finalName>apacheds-${project.version}-64bit.dmg</finalName>
- <osArch>x86_64</osArch>
- </macOsXPkgTarget>
- </macOsXPkgTargets>
-
- <!-- Target for Windows installer package -->
- <nsisTargets>
- <nsisTarget>
- <id>apacheds-win32</id>
- <finalName>apacheds-${project.version}.exe</finalName>
- </nsisTarget>
- </nsisTargets>
-
- <!-- Targets for Archive installer -->
- <archiveTargets>
- <archiveTarget>
- <id>apacheds-archive-zip</id>
- <finalName>apacheds-${project.version}.zip</finalName>
- <archiveType>zip</archiveType>
- </archiveTarget>
- <archiveTarget>
- <id>apacheds-archive-tar.gz</id>
- <finalName>apacheds-${project.version}.tar.gz</finalName>
- <archiveType>tar.gz</archiveType>
- </archiveTarget>
- </archiveTargets>
-
- <!-- Targets for Linux .bin installer -->
- <binTargets>
- <binTarget>
- <id>apacheds-bin-installer-32bit</id>
- <finalName>apacheds-${project.version}-32bit.bin</finalName>
- <osName>Linux</osName>
- <osArch>x86</osArch>
- </binTarget>
- <binTarget>
- <id>apacheds-bin-installer-64bit</id>
- <finalName>apacheds-${project.version}-64bit.bin</finalName>
- <osName>Linux</osName>
- <osArch>x86_64</osArch>
- </binTarget>
- </binTargets>
-
- <!-- Targets for Linux .deb installer package -->
- <debTargets>
- <debTarget>
- <id>apacheds-debian-i386</id>
- <finalName>apacheds-${project.version}-i386.deb</finalName>
- <osName>Linux</osName>
- <osArch>i386</osArch>
- </debTarget>
- <debTarget>
- <id>apacheds-debian-amd64</id>
- <finalName>apacheds-${project.version}-amd64.deb</finalName>
- <osName>Linux</osName>
- <osArch>amd64</osArch>
- </debTarget>
- </debTargets>
-
- <!-- Targets for Linux .rpm installer package -->
- <rpmTargets>
- <rpmTarget>
- <id>apacheds-rpm-i386</id>
- <finalName>apacheds-${project.version}-i386.rpm</finalName>
- <osName>Linux</osName>
- <osArch>i386</osArch>
- </rpmTarget>
- <rpmTarget>
- <id>apacheds-rpm-x86_64</id>
- <finalName>apacheds-${project.version}-x86_64.rpm</finalName>
- <osName>Linux</osName>
- <osArch>x86_64</osArch>
- </rpmTarget>
- </rpmTargets>
-
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- Forcing the creation of Eclipse project files -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -165,15 +184,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-installers-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1165244&r1=1165243&r2=1165244&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Mon Sep 5 11:23:42 2011
@@ -143,17 +143,9 @@
<module>hbase-partition</module>
<module>hbase-partition-test</module>
-->
+ <module>installers-maven-plugin</module>
+ <module>installers</module>
</modules>
-
- <profiles>
- <profile>
- <id>installers</id>
- <modules>
- <module>installers-maven-plugin</module>
- <module>installers</module>
- </modules>
- </profile>
- </profiles>
<build>
<pluginManagement>