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 4f3c7cfba27e5eba9e25f78238f908362e4a1a1f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 4 17:08:01 2015 +0100 refs 6544: [TECH] Permettre que les mises à jour fonctionnent depuis la version 3.7 --- tutti-ui-swing/src/main/assembly/standalone.xml | 17 +++-------------- .../src/main/assembly/standalone/linux/launch.sh | 1 + .../src/main/assembly/standalone/windows/launch.bat | 2 ++ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tutti-ui-swing/src/main/assembly/standalone.xml b/tutti-ui-swing/src/main/assembly/standalone.xml index 79ecf10..ad0701b 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -34,30 +34,19 @@ <!--Add embedded launcher executable (TODO :should be removed in further version)--> <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> - <outputDirectory>embedded</outputDirectory> + <outputDirectory>launcher</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> + <outputDirectory>launcher</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> @@ -118,7 +107,7 @@ <outputDirectory>launcher</outputDirectory> <filtered>true</filtered> <includes> - <include>**/*</include> + <include>*</include> </includes> <excludes> <exclude>linux</exclude> diff --git a/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh index 9aa584f..cf246e8 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh +++ b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh @@ -5,6 +5,7 @@ mv -f tutti/launcher . rm launcher/*.exe rm launcher/*.bat mv launcher/*.sh . +mv launcher/*.jar . mv launcher/README . chmod +x *.sh ./tutti.sh $* diff --git a/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat b/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat index a813d56..8c06c4e 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat +++ b/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat @@ -4,7 +4,9 @@ rem move embedded launcher file to tutti root verify on move /Y tutti\launcher launcher del /F /Q launcher\\*.sh + move /Y launcher\tutti.exe tutti.exe move /Y launcher\tutti.bat tutti.bat +move /Y launcher\launcher.bat launcher.jar move /Y launcher\\README README start tutti.exe -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.