Author: tchemit Date: 2013-02-08 23:17:35 +0100 (Fri, 08 Feb 2013) New Revision: 371 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/371 Log: improve bundle generation Modified: trunk/tutti-ui-swing/pom.xml Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-08 22:15:35 UTC (rev 370) +++ trunk/tutti-ui-swing/pom.xml 2013-02-08 22:17:35 UTC (rev 371) @@ -228,11 +228,11 @@ <version>${project.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-profiling</artifactId> <version>2.7-SNAPSHOT</version> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton</groupId> @@ -369,7 +369,7 @@ <profiles> <profile> - <id>prepare-jre-profile</id> + <id>default-bundle</id> <activation> <property> <name>performRelease</name> @@ -377,22 +377,63 @@ </property> </activation> <build> - <defaultGoal>process-compile</defaultGoal> + <defaultGoal>package</defaultGoal> <plugins> - <!-- get jre distributions and unpack them --> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>${bundlePrefix}</finalName> + </configuration> + <executions> + <execution> + <id>assembly-standalone</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>true</attach> + <descriptors> + <descriptor> + src/main/assembly/standalone.xml + </descriptor> + <descriptor> + src/main/assembly/i18n.xml + </descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>linux-x64-bundle</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>get-linux-i586-jre</id> - <phase>prepare-package</phase> + <id>get-linux-x64-jre</id> + <phase>process-classes</phase> <goals> <goal>unpack</goal> </goals> <configuration> <outputDirectory> - ${project.build.directory}/jre-linux-i586 + ${project.build.directory}/jre-linux-x64 </outputDirectory> <artifactItems> <artifactItem> @@ -400,20 +441,65 @@ <artifactId>jre</artifactId> <version>${jreVersion}</version> <type>zip</type> - <classifier>linux-i586</classifier> + <classifier>linux-x64</classifier> </artifactItem> </artifactItems> </configuration> </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>${bundlePrefix}</finalName> + </configuration> + <executions> <execution> - <id>get-linux-x64-jre</id> - <phase>process-classes</phase> + <id>assembly-full</id> + <phase>package</phase> <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>false</attach> + <descriptors> + <descriptor> + src/main/assembly/full-linux-x64.xml + </descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>linux-i586-bundle</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get-linux-i586-jre</id> + <phase>prepare-package</phase> + <goals> <goal>unpack</goal> </goals> <configuration> <outputDirectory> - ${project.build.directory}/jre-linux-x64 + ${project.build.directory}/jre-linux-i586 </outputDirectory> <artifactItems> <artifactItem> @@ -421,12 +507,57 @@ <artifactId>jre</artifactId> <version>${jreVersion}</version> <type>zip</type> - <classifier>linux-x64</classifier> + <classifier>linux-i586</classifier> </artifactItem> </artifactItems> </configuration> </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>${bundlePrefix}</finalName> + </configuration> + <executions> <execution> + <id>assembly-full</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>false</attach> + <descriptors> + <descriptor> + src/main/assembly/full-linux-i586.xml + </descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>windows-i586-bundle</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> <id>get-windows-i586-jre</id> <phase>process-classes</phase> <goals> @@ -447,7 +578,52 @@ </artifactItems> </configuration> </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>${bundlePrefix}</finalName> + </configuration> + <executions> <execution> + <id>assembly-full</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>false</attach> + <descriptors> + <descriptor> + src/main/assembly/full-windows-i586.xml + </descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>window-x64-bundle</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> <id>get-windows-x64-jre</id> <phase>process-classes</phase> <goals> @@ -470,23 +646,7 @@ </execution> </executions> </plugin> - </plugins> - </build> - </profile> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <!-- create assemblies --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -503,43 +663,15 @@ <attach>false</attach> <descriptors> <descriptor> - src/main/assembly/full-linux-i586.xml - </descriptor> - <descriptor> - src/main/assembly/full-linux-x64.xml - </descriptor> - <descriptor> - src/main/assembly/full-windows-i586.xml - </descriptor> - <descriptor> src/main/assembly/full-windows-x64.xml </descriptor> </descriptors> </configuration> </execution> - <execution> - <id>assembly-standalone</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>true</attach> - <descriptors> - <descriptor> - src/main/assembly/standalone.xml - </descriptor> - <descriptor> - src/main/assembly/i18n.xml - </descriptor> - </descriptors> - </configuration> - </execution> </executions> </plugin> </plugins> </build> </profile> - </profiles> </project>