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 9901cbc0a9822b6019000b798a2dab39a47941c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 11:16:33 2015 +0100 fixes #6544: [TECH] Permettre que les mises à jour fonctionnent depuis la version 3.7 --- tutti-ui-swing/pom.xml | 34 ++++++++- .../src/main/assembly/full-shared-component.xml | 20 +++-- tutti-ui-swing/src/main/assembly/help.xml | 4 +- .../src/main/assembly/{min => help}/version.appup | 0 tutti-ui-swing/src/main/assembly/i18n.xml | 4 +- .../src/main/assembly/{min => i18n}/version.appup | 0 tutti-ui-swing/src/main/assembly/ichtyometer.xml | 4 +- .../assembly/{min => ichtyometer}/version.appup | 0 tutti-ui-swing/src/main/assembly/standalone.xml | 85 +++++++++++++++++++++- .../main/assembly/{min => standalone}/README.txt | 0 .../{min => standalone}/launcher.properties | 0 .../src/main/assembly/standalone/linux/launch.sh | 8 ++ .../src/main/assembly/standalone/linux/update.sh | 12 +++ .../assembly/{min => standalone}/version.appup | 0 .../main/assembly/standalone/windows/launch.bat | 7 ++ .../main/assembly/standalone/windows/update.bat | 14 ++++ 16 files changed, 176 insertions(+), 16 deletions(-) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 2ab977a..61f7cd5 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -493,17 +493,49 @@ <goal>single</goal> </goals> <configuration> - <attach>true</attach> <descriptors> <descriptor> src/main/assembly/standalone.xml </descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>assembly-i18n</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> <descriptor> src/main/assembly/i18n.xml </descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>assembly-help</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> <descriptor> src/main/assembly/help.xml </descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>assembly-ichtyometer</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> <descriptor> src/main/assembly/ichtyometer.xml </descriptor> diff --git a/tutti-ui-swing/src/main/assembly/full-shared-component.xml b/tutti-ui-swing/src/main/assembly/full-shared-component.xml index 2f620b1..eaa4233 100644 --- a/tutti-ui-swing/src/main/assembly/full-shared-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-shared-component.xml @@ -81,12 +81,16 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/standalone</directory> <outputDirectory>tutti</outputDirectory> <filtered>true</filtered> <includes> <include>*</include> </includes> + <excludes> + <exclude>linux</exclude> + <exclude>windows</exclude> + </excludes> </fileSet> <!-- Launcher component --> @@ -95,7 +99,7 @@ <outputDirectory>launcher</outputDirectory> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> @@ -110,21 +114,21 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/i18n</directory> <outputDirectory>i18n</outputDirectory> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> <!-- HELP component --> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/help</directory> <outputDirectory>help</outputDirectory> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> @@ -155,11 +159,11 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/ichtyometer</directory> <outputDirectory>ichtyometer</outputDirectory> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/help.xml b/tutti-ui-swing/src/main/assembly/help.xml index 45e9c65..08f1e4d 100644 --- a/tutti-ui-swing/src/main/assembly/help.xml +++ b/tutti-ui-swing/src/main/assembly/help.xml @@ -40,11 +40,11 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/help</directory> <outputDirectory/> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/min/version.appup b/tutti-ui-swing/src/main/assembly/help/version.appup similarity index 100% copy from tutti-ui-swing/src/main/assembly/min/version.appup copy to tutti-ui-swing/src/main/assembly/help/version.appup diff --git a/tutti-ui-swing/src/main/assembly/i18n.xml b/tutti-ui-swing/src/main/assembly/i18n.xml index ed72978..34db328 100644 --- a/tutti-ui-swing/src/main/assembly/i18n.xml +++ b/tutti-ui-swing/src/main/assembly/i18n.xml @@ -41,11 +41,11 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/i18n</directory> <outputDirectory/> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/min/version.appup b/tutti-ui-swing/src/main/assembly/i18n/version.appup similarity index 100% copy from tutti-ui-swing/src/main/assembly/min/version.appup copy to tutti-ui-swing/src/main/assembly/i18n/version.appup diff --git a/tutti-ui-swing/src/main/assembly/ichtyometer.xml b/tutti-ui-swing/src/main/assembly/ichtyometer.xml index b2be346..9fc0feb 100644 --- a/tutti-ui-swing/src/main/assembly/ichtyometer.xml +++ b/tutti-ui-swing/src/main/assembly/ichtyometer.xml @@ -40,11 +40,11 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/ichtyometer</directory> <outputDirectory/> <filtered>true</filtered> <includes> - <include>version.appup</include> + <include>**/*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/min/version.appup b/tutti-ui-swing/src/main/assembly/ichtyometer/version.appup similarity index 100% copy from tutti-ui-swing/src/main/assembly/min/version.appup copy to tutti-ui-swing/src/main/assembly/ichtyometer/version.appup diff --git a/tutti-ui-swing/src/main/assembly/standalone.xml b/tutti-ui-swing/src/main/assembly/standalone.xml index 4431d52..84032f7 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -30,6 +30,34 @@ <format>zip</format> </formats> + <files> + <!--Add embedded launcher executable (TODO :should be removed in further version)--> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}.exe</source> + <outputDirectory>embedded</outputDirectory> + <destName>tutti.exe</destName> + </file> + + <!--Add embedded launcher executable (TODO :should be removed in further version)--> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> + <outputDirectory>embedded</outputDirectory> + <destName>launcher.jar</destName> + </file> + + </files> + + <!-- Add updater --> + <dependencySets> + <dependencySet> + <outputDirectory/> + <outputFileNameMapping>updater.jar</outputFileNameMapping> + <includes> + <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> @@ -52,7 +80,30 @@ </fileSet> <fileSet> - <directory>src/main/assembly/min</directory> + <directory>src/main/assembly/standalone</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + <excludes> + <exclude>linux</exclude> + <exclude>windows</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/standalone/windows</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/assembly/standalone/linux</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -61,6 +112,38 @@ </includes> </fileSet> + <!--Add embedded windows launcher script (TODO :should be removed in further version)--> + <fileSet> + <directory>src/main/assembly/full/windows</directory> + <outputDirectory>embedded</outputDirectory> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + + <!--Add embedded linux launcher script (TODO :should be removed in further version)--> + <fileSet> + <directory>src/main/assembly/full/linux</directory> + <outputDirectory>embedded</outputDirectory> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + + <!--Add embedded launcher module (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> + <fileSet> <includes> <include>README*</include> diff --git a/tutti-ui-swing/src/main/assembly/min/README.txt b/tutti-ui-swing/src/main/assembly/standalone/README.txt similarity index 100% rename from tutti-ui-swing/src/main/assembly/min/README.txt rename to tutti-ui-swing/src/main/assembly/standalone/README.txt diff --git a/tutti-ui-swing/src/main/assembly/min/launcher.properties b/tutti-ui-swing/src/main/assembly/standalone/launcher.properties similarity index 100% rename from tutti-ui-swing/src/main/assembly/min/launcher.properties rename to tutti-ui-swing/src/main/assembly/standalone/launcher.properties diff --git a/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh new file mode 100644 index 0000000..5d08be7 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "Move embedded script file to tutti root" +mv -f tutti/launcher . +mv -f tutti/embedded/* . +mv tutti/launcher.jar . +chmod +x *.sh +./tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/standalone/linux/update.sh b/tutti-ui-swing/src/main/assembly/standalone/linux/update.sh new file mode 100644 index 0000000..1d104cb --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/standalone/linux/update.sh @@ -0,0 +1,12 @@ +#!/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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/tutti-ui-swing/src/main/assembly/min/version.appup b/tutti-ui-swing/src/main/assembly/standalone/version.appup similarity index 100% rename from tutti-ui-swing/src/main/assembly/min/version.appup rename to tutti-ui-swing/src/main/assembly/standalone/version.appup diff --git a/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat b/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat new file mode 100644 index 0000000..1626ee5 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat @@ -0,0 +1,7 @@ +@echo off + +rem move embedded launcher file to tutti root +verify on +move /Y tutti\launcher launcher +move /Y tutti\embedded\* . +start tutti.exe diff --git a/tutti-ui-swing/src/main/assembly/standalone/windows/update.bat b/tutti-ui-swing/src/main/assembly/standalone/windows/update.bat new file mode 100644 index 0000000..24cc4e2 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/standalone/windows/update.bat @@ -0,0 +1,14 @@ +@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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.