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 02e8bf4f74ecceed42e9c018832494cbdc4af2e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 26 17:11:58 2015 +0100 improve assembly files --- .../src/main/assembly/full-linux-component.xml | 120 +-------------------- .../src/main/assembly/full-linux-i586.xml | 5 +- .../src/main/assembly/full-linux-x64.xml | 5 +- ...nux-component.xml => full-shared-component.xml} | 64 ++++++----- .../src/main/assembly/full-windows-component.xml | 110 +------------------ .../src/main/assembly/full-windows-i586.xml | 5 +- .../src/main/assembly/full-windows-x64.xml | 5 +- .../main/assembly/full/{ => linux}/tutti-sanity.sh | 0 .../src/main/assembly/full/{ => linux}/tutti.sh | 0 .../assembly/full/{ => windows}/tutti-sanity.bat | 0 tutti-ui-swing/src/main/assembly/min/launch.bat | 7 -- tutti-ui-swing/src/main/assembly/min/launch.sh | 7 -- tutti-ui-swing/src/main/assembly/min/update.bat | 14 --- tutti-ui-swing/src/main/assembly/min/update.sh | 12 --- tutti-ui-swing/src/main/assembly/standalone.xml | 15 --- 15 files changed, 40 insertions(+), 329 deletions(-) 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 f0fab70..4aa4cdc 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -29,16 +29,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> - <dependencySets> - <dependencySet> - <outputDirectory>tutti</outputDirectory> - <outputFileNameMapping>updater.jar</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> - </includes> - </dependencySet> - </dependencySets> - <files> <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> @@ -50,120 +40,12 @@ <fileSets> <fileSet> - <directory>src/main/assembly/full</directory> + <directory>src/main/assembly/full/linux</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> <includes> <include>*.sh</include> - <include>README*</include> - </includes> - </fileSet> - - <fileSet> - <includes> - <include>LICENSE*</include> - </includes> - </fileSet> - - <!-- TUTTI component --> - <fileSet> - <directory>target</directory> - <outputDirectory>tutti</outputDirectory> - <includes> - <include>${project.build.finalName}.${project.packaging}</include> - </includes> - </fileSet> - - <fileSet> - <directory>target/lib</directory> - <outputDirectory>tutti/lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-updater-*.jar</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>tutti</outputDirectory> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>*.sh</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>tutti</outputDirectory> - <filtered>true</filtered> - <includes> - <include>*</include> - </includes> - <excludes> - <exclude>*.sh</exclude> - <exclude>*.bat</exclude> - <exclude>tutti.config</exclude> - </excludes> - </fileSet> - - <!-- Launcher component --> - <fileSet> - <directory>src/main/assembly/launcher</directory> - <outputDirectory>launcher</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <!-- I18N component --> - <fileSet> - <directory>target/classes/META-INF</directory> - <outputDirectory>i18n</outputDirectory> - <includes> - <include>tutti-i18n*.properties</include> - <include>tutti-i18n*.csv</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>i18n</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <!-- HELP component --> - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>help</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/help</directory> - <outputDirectory>help</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - - <!-- REPORT component --> - <fileSet> - <directory>src/main/assembly/report</directory> - <outputDirectory>report</outputDirectory> - <includes> - <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-i586.xml b/tutti-ui-swing/src/main/assembly/full-linux-i586.xml index 2cb2d4b..93aee64 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-i586.xml @@ -32,9 +32,8 @@ </formats> <componentDescriptors> - <componentDescriptor> - src/main/assembly/full-linux-component.xml - </componentDescriptor> + <componentDescriptor>src/main/assembly/full-linux-component.xml</componentDescriptor> + <componentDescriptor>src/main/assembly/full-shared-component.xml</componentDescriptor> </componentDescriptors> <fileSets> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-x64.xml b/tutti-ui-swing/src/main/assembly/full-linux-x64.xml index 7f12a20..466b7c7 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-x64.xml @@ -32,9 +32,8 @@ </formats> <componentDescriptors> - <componentDescriptor> - src/main/assembly/full-linux-component.xml - </componentDescriptor> + <componentDescriptor>src/main/assembly/full-linux-component.xml</componentDescriptor> + <componentDescriptor>src/main/assembly/full-shared-component.xml</componentDescriptor> </componentDescriptors> <fileSets> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-component.xml b/tutti-ui-swing/src/main/assembly/full-shared-component.xml similarity index 88% copy from tutti-ui-swing/src/main/assembly/full-linux-component.xml copy to tutti-ui-swing/src/main/assembly/full-shared-component.xml index f0fab70..2f620b1 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-shared-component.xml @@ -11,19 +11,18 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -37,33 +36,27 @@ <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> </includes> </dependencySet> - </dependencySets> - - <files> - <file> - <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> - <outputDirectory/> - <destName>launcher.jar</destName> - </file> - </files> + </dependencySets> <fileSets> <fileSet> - <directory>src/main/assembly/full</directory> - <outputDirectory/> - <filtered>true</filtered> - <fileMode>0755</fileMode> <includes> - <include>*.sh</include> - <include>README*</include> + <include>LICENSE*</include> </includes> </fileSet> <fileSet> + <directory>src/main/assembly/full</directory> + <outputDirectory>tutti</outputDirectory> + <filtered>true</filtered> <includes> - <include>LICENSE*</include> + <include>*</include> </includes> + <excludes> + <exclude>linux</exclude> + <exclude>windows</exclude> + </excludes> </fileSet> <!-- TUTTI component --> @@ -91,24 +84,9 @@ <directory>src/main/assembly/min</directory> <outputDirectory>tutti</outputDirectory> <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>*.sh</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>tutti</outputDirectory> - <filtered>true</filtered> <includes> <include>*</include> </includes> - <excludes> - <exclude>*.sh</exclude> - <exclude>*.bat</exclude> - <exclude>tutti.config</exclude> - </excludes> </fileSet> <!-- Launcher component --> @@ -167,5 +145,23 @@ </includes> </fileSet> + <!-- Ichtyometer component --> + <fileSet> + <directory>src/main/ichtyometer</directory> + <outputDirectory>ichtyometer</outputDirectory> + <includes> + <include>*</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory>ichtyometer</outputDirectory> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> + </fileSets> </component> 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 033fc4c..4a13b5b 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -50,120 +50,12 @@ <fileSets> <fileSet> - <directory>src/main/assembly/full</directory> + <directory>src/main/assembly/full/windows</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> <includes> <include>*.bat</include> - <include>README*</include> - </includes> - </fileSet> - - <fileSet> - <includes> - <include>LICENSE*</include> - </includes> - </fileSet> - - <!-- tutti component --> - <fileSet> - <directory>target</directory> - <outputDirectory>tutti</outputDirectory> - <includes> - <include>${project.build.finalName}.${project.packaging}</include> - </includes> - </fileSet> - - <fileSet> - <directory>target/lib</directory> - <outputDirectory>tutti/lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-updater-*.jar</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>tutti</outputDirectory> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>*.bat</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>tutti</outputDirectory> - <filtered>true</filtered> - <includes> - <include>*</include> - </includes> - <excludes> - <exclude>*.sh</exclude> - <exclude>*.bat</exclude> - <exclude>tutti.config</exclude> - </excludes> - </fileSet> - - <!-- Launcher component --> - <fileSet> - <directory>src/main/assembly/launcher</directory> - <outputDirectory>launcher</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <!-- I18N component --> - <fileSet> - <directory>target/classes/META-INF</directory> - <outputDirectory>i18n</outputDirectory> - <includes> - <include>tutti-i18n*.properties</include> - <include>tutti-i18n*.csv</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>i18n</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <!-- HELP component --> - <fileSet> - <directory>src/main/assembly/min</directory> - <outputDirectory>help</outputDirectory> - <filtered>true</filtered> - <includes> - <include>version.appup</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/help</directory> - <outputDirectory>help</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - - <!-- REPORT component --> - <fileSet> - <directory>src/main/assembly/report</directory> - <outputDirectory>report</outputDirectory> - <includes> - <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-i586.xml b/tutti-ui-swing/src/main/assembly/full-windows-i586.xml index f3592db..67daeff 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-i586.xml @@ -32,9 +32,8 @@ </formats> <componentDescriptors> - <componentDescriptor> - src/main/assembly/full-windows-component.xml - </componentDescriptor> + <componentDescriptor>src/main/assembly/full-windows-component.xml</componentDescriptor> + <componentDescriptor>src/main/assembly/full-shared-component.xml</componentDescriptor> </componentDescriptors> <fileSets> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-x64.xml b/tutti-ui-swing/src/main/assembly/full-windows-x64.xml index 5ccdb55..b731055 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-x64.xml @@ -32,9 +32,8 @@ </formats> <componentDescriptors> - <componentDescriptor> - src/main/assembly/full-windows-component.xml - </componentDescriptor> + <componentDescriptor>src/main/assembly/full-windows-component.xml</componentDescriptor> + <componentDescriptor>src/main/assembly/full-shared-component.xml</componentDescriptor> </componentDescriptors> <fileSets> diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh rename to tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.sh b/tutti-ui-swing/src/main/assembly/full/linux/tutti.sh similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/tutti.sh rename to tutti-ui-swing/src/main/assembly/full/linux/tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat rename to tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat diff --git a/tutti-ui-swing/src/main/assembly/min/launch.bat b/tutti-ui-swing/src/main/assembly/min/launch.bat deleted file mode 100644 index fbdb84c..0000000 --- a/tutti-ui-swing/src/main/assembly/min/launch.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -rem move embedded launcher file to tutti root -verify on -move /Y tutti\launcher launcher -move /Y tutti\tutti.exe tutti.exe -start tutti.exe diff --git a/tutti-ui-swing/src/main/assembly/min/launch.sh b/tutti-ui-swing/src/main/assembly/min/launch.sh deleted file mode 100755 index be75bd5..0000000 --- a/tutti-ui-swing/src/main/assembly/min/launch.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -echo "Move embedded script file to tutti root" -mv -f tutti/launcher . -mv tutti/tutti.sh . -chmod +x tutti.sh -./tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/min/update.bat b/tutti-ui-swing/src/main/assembly/min/update.bat deleted file mode 100644 index 7fbfba8..0000000 --- a/tutti-ui-swing/src/main/assembly/min/update.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off - -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -echo ! ! -echo ! THE LAUNCH AND UPDATE PROCESSES HAVE BEEN CHANGED ! -echo ! PLEASE EXECUTE 'tutti.exe' ! -echo ! ! -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -echo ! ! -echo ! LES PROCESSUS DE DEMARRAGE ET MISE A JOUR ONT CHANGES ! -echo ! VEUILLEZ EXECUTER 'tutti.exe' ! -echo ! ! -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -pause \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/min/update.sh b/tutti-ui-swing/src/main/assembly/min/update.sh deleted file mode 100644 index 9adea09..0000000 --- a/tutti-ui-swing/src/main/assembly/min/update.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -echo ! ! -echo ! THE LAUNCH AND UPDATE PROCESSES HAVE BEEN CHANGED ! -echo ! PLEASE EXECUTE './tutti.sh' ! -echo ! ! -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -echo ! ! -echo ! LES PROCESSUS DE DEMARRAGE ET MISE A JOUR ONT CHANGES ! -echo ! VEUILLEZ EXECUTER './tutti.sh' ! -echo ! ! -echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/standalone.xml b/tutti-ui-swing/src/main/assembly/standalone.xml index efb16d7..4431d52 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -57,21 +57,6 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>launcher.properties</include> - <include>launch.sh</include> - <include>launch.bat</include> - <include>update.sh</include> - <include>update.bat</include> - <include>version.appup</include> - </includes> - </fileSet> - - <!--add embedded launcher directory (TODO :should be removed in further version)--> - <fileSet> - <directory>src/main/assembly/launcher</directory> - <outputDirectory>launcher</outputDirectory> - <filtered>true</filtered> - <includes> <include>*</include> </includes> </fileSet> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.