branch develop updated (bc27100 -> 8cf23d7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from bc27100 fixes #6542: [TECH] Disparition du .bat au démarrage + amélioration du code new 121fee9 refs #6544 (permettre d'avoir des modules non existants au demarrage) new 3f56288 refs #6544 (utilisation classifier bin sur tutti.exe) new d80cceb refs #6539 add also jar laucnher in windows bundle new 8cf23d7 refs #6539 use launcehr 1.1 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8cf23d7213b291f414b371188dd66b2a62d44fa3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 17:36:15 2015 +0100 refs #6539 use launcehr 1.1 commit d80cceb6b5c74224defbfa6d2a64cdadf16d3882 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 17:35:37 2015 +0100 refs #6539 add also jar laucnher in windows bundle commit 3f56288d677075ba48688c221c650bd32799749a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 13:26:55 2015 +0100 refs #6544 (utilisation classifier bin sur tutti.exe) commit 121fee984eea9a969d5eceffbea68e234fe6d204 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 13:24:45 2015 +0100 refs #6544 (permettre d'avoir des modules non existants au demarrage) Summary of changes: pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 42 ++++++++++++---------- .../ui/swing/updater/UpdaterFileSystemPathes.java | 21 ++++++----- tutti-ui-swing/pom.xml | 12 +++++++ .../src/main/assembly/full-windows-component.xml | 2 +- tutti-ui-swing/src/main/assembly/standalone.xml | 2 +- .../src/main/assembly/standalone/linux/launch.sh | 1 - 7 files changed, 52 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 121fee984eea9a969d5eceffbea68e234fe6d204 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 13:24:45 2015 +0100 refs #6544 (permettre d'avoir des modules non existants au demarrage) --- .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 42 ++++++++++++---------- .../ui/swing/updater/UpdaterFileSystemPathes.java | 21 ++++++----- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java index ecafb14..4b8d75f 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java @@ -176,24 +176,18 @@ public class Updater { } - protected void cleanFiles() throws IOException { - - pathHelper.cleanObsoleteFiles(); - DeleteHelper.deleteDirectory(pathHelper.getUpdateDirectory()); - - } - protected boolean updateRuntimeModule(Module module) throws IOException { - boolean updateFound; + boolean moduleExist = pathHelper.isModuleExists(module); + boolean updateModuleExist = pathHelper.isUpdateModuleExists(module); - String oldVersion = pathHelper.getModuleVersion(module); + String oldVersion = moduleExist ? pathHelper.getModuleVersion(module) : "None"; String moduleNameStr = module.getModuleLoggerName(); System.out.println(String.format("%s Current version: %s", moduleNameStr, oldVersion)); - if (pathHelper.isUpdateModuleExists(module)) { + if (updateModuleExist) { String newVersion = pathHelper.getUpdateModuleVersion(module); @@ -202,27 +196,28 @@ public class Updater { // Remove older backup pathHelper.removeOlderBackup(module); - updateFound = true; - } else { System.out.println(String.format("%s No update found", moduleNameStr)); - updateFound = false; } - return updateFound; + return updateModuleExist; } protected void updateApplicationModule(Module module) throws IOException { + boolean moduleExist = pathHelper.isModuleExists(module); + boolean updateModuleExist = pathHelper.isUpdateModuleExists(module); + + String oldVersion = moduleExist ? pathHelper.getModuleVersion(module) : "None"; + String moduleNameStr = module.getModuleLoggerName(); - String oldVersion = pathHelper.getModuleVersion(module); System.out.println(String.format("%s Current version: %s", moduleNameStr, oldVersion)); - if (pathHelper.isUpdateModuleExists(module)) { + if (updateModuleExist) { String newVersion = pathHelper.getUpdateModuleVersion(module); @@ -232,8 +227,12 @@ public class Updater { Path modulePath = pathHelper.getModulePath(module); - // Backup existing module - pathHelper.backupModule(module, oldVersion); + if (moduleExist) { + + // Backup existing module + pathHelper.backupModule(module, oldVersion); + + } // Installing new module System.out.println(String.format("%s Install new version %s", moduleNameStr, newVersion)); @@ -248,4 +247,11 @@ public class Updater { } + protected void cleanFiles() throws IOException { + + pathHelper.cleanObsoleteFiles(); + DeleteHelper.deleteDirectory(pathHelper.getUpdateDirectory()); + + } + } diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java index e31d01c..82f2772 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java @@ -81,6 +81,14 @@ public class UpdaterFileSystemPathes { return modulePath; } + public boolean isModuleExists(Module module) { + + Path modulePath = getModulePath(module); + boolean isDirectory = Files.isDirectory(modulePath); + return isDirectory; + + } + public String getModuleVersion(Module module) throws IOException { Path modulePath = getModulePath(module); @@ -161,18 +169,15 @@ public class UpdaterFileSystemPathes { public void backupModule(Module module, String version) throws IOException { Path modulePath = getModulePath(module); - if (Files.isDirectory(modulePath)) { - - String moduleName = module.name(); - Path backupDirectory = getBackupDirectory(); + String moduleName = module.name(); - Path backupModulePath = backupDirectory.resolve(String.format("%s-%s-%s", moduleName, version, backupDate)); + Path backupDirectory = getBackupDirectory(); - System.out.println(String.format("%s Backup old version %s to %s", module.getModuleLoggerName(), version, backupModulePath)); - Files.move(modulePath, backupModulePath); + Path backupModulePath = backupDirectory.resolve(String.format("%s-%s-%s", moduleName, version, backupDate)); - } + System.out.println(String.format("%s Backup old version %s to %s", module.getModuleLoggerName(), version, backupModulePath)); + Files.move(modulePath, backupModulePath); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3f56288d677075ba48688c221c650bd32799749a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 13:26:55 2015 +0100 refs #6544 (utilisation classifier bin sur tutti.exe) --- tutti-ui-swing/pom.xml | 2 ++ tutti-ui-swing/src/main/assembly/full-windows-component.xml | 2 +- tutti-ui-swing/src/main/assembly/standalone.xml | 2 +- tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 61f7cd5..b8b8612 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -786,6 +786,7 @@ <artifactId>tutti-launcher</artifactId> <version>${launcherVersion}</version> <type>exe</type> + <classifier>bin</classifier> </artifactItem> </artifactItems> </configuration> @@ -870,6 +871,7 @@ <artifactId>tutti-launcher</artifactId> <version>${launcherVersion}</version> <type>exe</type> + <classifier>bin</classifier> </artifactItem> </artifactItems> </configuration> 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 5f2a1b0..493455a 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -31,7 +31,7 @@ <files> <file> - <source>${project.build.directory}/tutti-launcher-${launcherVersion}.exe</source> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> <outputDirectory/> <destName>tutti.exe</destName> </file> diff --git a/tutti-ui-swing/src/main/assembly/standalone.xml b/tutti-ui-swing/src/main/assembly/standalone.xml index 84032f7..311cece 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -33,7 +33,7 @@ <files> <!--Add embedded launcher executable (TODO :should be removed in further version)--> <file> - <source>${project.build.directory}/tutti-launcher-${launcherVersion}.exe</source> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> <outputDirectory>embedded</outputDirectory> <destName>tutti.exe</destName> </file> 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 5d08be7..970e8a5 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh +++ b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh @@ -3,6 +3,5 @@ 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 d80cceb6b5c74224defbfa6d2a64cdadf16d3882 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 17:35:37 2015 +0100 refs #6539 add also jar laucnher in windows bundle --- tutti-ui-swing/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b8b8612..0e33be5 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -788,6 +788,11 @@ <type>exe</type> <classifier>bin</classifier> </artifactItem> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> </artifactItems> </configuration> </execution> @@ -873,6 +878,11 @@ <type>exe</type> <classifier>bin</classifier> </artifactItem> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> </artifactItems> </configuration> </execution> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 8cf23d7213b291f414b371188dd66b2a62d44fa3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 17:36:15 2015 +0100 refs #6539 use launcehr 1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56662f4..c675798 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ <jreVersion>1.7.72</jreVersion> <!-- Last launcher version --> - <launcherVersion>1.0</launcherVersion> + <launcherVersion>1.1-SNAPSHOT</launcherVersion> <!-- Where are deployed software components --> <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm