This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 818d7b6b36d4d64bf3f60006b433fc7906010f7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 22 16:21:20 2015 +0100 utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui) --- tutti-ui-swing/pom.xml | 77 ++++++++++++++++++++-- .../src/main/assembly/full-linux-component.xml | 16 ++--- .../src/main/assembly/full-windows-component.xml | 16 ++--- 3 files changed, 88 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f7fc9cc..9dff5a6 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -112,11 +112,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tutti-ui-swing-launcher</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>tutti-ui-swing-updater</artifactId> <version>${project.version}</version> </dependency> @@ -544,6 +539,23 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-linux-x64-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -610,6 +622,23 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-linux-586-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -676,6 +705,25 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-windows-i586-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + <type>exe</type> + <classifier>bin</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -742,6 +790,25 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-windows-x64-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + <type>exe</type> + <classifier>bin</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-component.xml b/tutti-ui-swing/src/main/assembly/full-linux-component.xml index 4f8bfd3..9039a7a 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -7,13 +7,6 @@ <dependencySets> <dependencySet> - <outputDirectory/> - <outputFileNameMapping>launcher.jar</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-launcher:jar:${project.version}</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>tutti</outputDirectory> <outputFileNameMapping>updater.jar</outputFileNameMapping> <includes> @@ -22,6 +15,14 @@ </dependencySet> </dependencySets> + <files> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> + <outputDirectory>tutti</outputDirectory> + <destName>launcher.jar</destName> + </file> + </files> + <fileSets> <fileSet> @@ -58,7 +59,6 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-launcher-*.jar</exclude> <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-component.xml b/tutti-ui-swing/src/main/assembly/full-windows-component.xml index b2452d0..8e228b8 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -7,13 +7,6 @@ <dependencySets> <dependencySet> - <outputDirectory/> - <outputFileNameMapping>tutti.exe</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-launcher:exe:bin:${project.version}</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>tutti</outputDirectory> <outputFileNameMapping>updater.jar</outputFileNameMapping> <includes> @@ -22,6 +15,14 @@ </dependencySet> </dependencySets> + <files> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> + <outputDirectory/> + <destName>tutti.exe</destName> + </file> + </files> + <fileSets> <fileSet> @@ -57,7 +58,6 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-launcher-*.jar</exclude> <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.