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 fe6e892e3fdd24aaaca9268c97f4fbb028712e9c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 3 13:45:20 2015 +0100 mise en place des nouveaux modules et du packaging --- pom.xml | 24 +++++- src/update/tutti-application.properties | 7 ++ tutti-ui-swing/pom.xml | 10 +++ ...full-component.xml => full-linux-component.xml} | 59 +++++++------- .../src/main/assembly/full-linux-i586.xml | 2 +- .../src/main/assembly/full-linux-x64.xml | 2 +- ...ll-component.xml => full-windows-component.xml} | 60 +++++++------- .../src/main/assembly/full-windows-i586.xml | 2 +- .../src/main/assembly/full-windows-x64.xml | 2 +- .../src/main/assembly/full/tutti-sanity.bat | 43 +--------- .../src/main/assembly/full/tutti-sanity.sh | 31 +------ tutti-ui-swing/src/main/assembly/full/tutti.bat | 44 ---------- tutti-ui-swing/src/main/assembly/full/tutti.sh | 31 +------ .../src/main/assembly/launcher/version.appup | 1 + tutti-ui-swing/src/main/assembly/min/launch.bat | 13 ++- tutti-ui-swing/src/main/assembly/min/launch.sh | 18 ++--- .../src/main/assembly/min/launcher.properties | 3 + tutti-ui-swing/src/main/assembly/min/update.bat | 94 +++------------------- tutti-ui-swing/src/main/assembly/min/update.sh | 84 +++---------------- tutti-ui-swing/src/main/assembly/standalone.xml | 11 +++ 20 files changed, 157 insertions(+), 384 deletions(-) diff --git a/pom.xml b/pom.xml index 4919805..278545a 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,8 @@ <module>tutti-persistence</module> <module>tutti-ichtyometer</module> <module>tutti-service</module> + <module>tutti-ui-swing-launcher</module> + <module>tutti-ui-swing-updater</module> <module>tutti-ui-swing</module> </modules> @@ -155,6 +157,9 @@ <!-- Last JRE version to use --> <jreVersion>1.7.72</jreVersion> + <!-- Last launcher version --> + <launcherVersion>3.12-SNAPSHOT</launcherVersion> + <!-- issues status to include in changelog --> <redmine.statusIds>3,4,5,8</redmine.statusIds> @@ -623,6 +628,18 @@ </configuration> </plugin> + <plugin> + <groupId>com.akathist.maven.plugins.launch4j</groupId> + <artifactId>launch4j-maven-plugin</artifactId> + <version>1.5.2</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + </plugin> + </plugins> </pluginManagement> <extensions> @@ -681,6 +698,10 @@ <property>jreVersion</property> <message>You must set a jreVersion property!</message> </requireProperty> + <requireProperty> + <property>launcherVersion</property> + <message>You must set a launcherVersion property!</message> + </requireProperty> </rules> <ignoreCache>true</ignoreCache> <failFast>true</failFast> @@ -759,6 +780,7 @@ <filterset> <filter value="${project.version}" token="projectVersion" /> <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${launcherVersion}" token="launcherVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> <include name="tutti-application.properties" /> @@ -776,7 +798,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> + <version>1.0</version> <executions> <execution> <id>deploy tutti-application.properties</id> diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index b3385c2..b82b1ae 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -34,6 +34,13 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/c #windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVe... ################################################################################ +### Launcher Updates ########################################################### +################################################################################ + +launcher.version=@launcherVersion@ +launcher.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer... + +################################################################################ ### Tutti Updates ############################################################## ################################################################################ diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b9df966..f7fc9cc 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -110,6 +110,16 @@ <artifactId>tutti-ichtyometer</artifactId> <version>${project.version}</version> </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> <!-- Adagio --> <dependency> diff --git a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml b/tutti-ui-swing/src/main/assembly/full-linux-component.xml similarity index 72% copy from tutti-ui-swing/src/main/assembly/tutti-full-component.xml copy to tutti-ui-swing/src/main/assembly/full-linux-component.xml index 605110f..4f8bfd3 100644 --- a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Tutti :: UI - %% - Copyright (C) 2012 - 2014 Ifremer - %% - This program is free software: you can redistribute it and/or modify - 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" 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/> + <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> + <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> @@ -34,11 +30,8 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> - <include>*.bat</include> + <include>tutti.sh</include> <include>README*</include> - <include>report/**</include> - <include>ichtyometre/**</include> </includes> </fileSet> @@ -49,7 +42,6 @@ </fileSet> <!-- TUTTI component --> - <fileSet> <directory>target</directory> <outputDirectory>tutti</outputDirectory> @@ -66,6 +58,8 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> + <exclude>tutti-ui-swing-launcher-*.jar</exclude> + <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> @@ -76,7 +70,6 @@ <fileMode>0755</fileMode> <includes> <include>*.sh</include> - <include>*.bat</include> </includes> </fileSet> @@ -90,10 +83,20 @@ <excludes> <exclude>*.sh</exclude> <exclude>*.bat</exclude> - <exclude>tutti.config</exclude> + <exclude>obsdeb.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> 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 3448f5c..2cb2d4b 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-i586.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-linux-component.xml </componentDescriptor> </componentDescriptors> 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 0d23033..7f12a20 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-x64.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-linux-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml b/tutti-ui-swing/src/main/assembly/full-windows-component.xml similarity index 73% rename from tutti-ui-swing/src/main/assembly/tutti-full-component.xml rename to tutti-ui-swing/src/main/assembly/full-windows-component.xml index 605110f..b2452d0 100644 --- a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Tutti :: UI - %% - Copyright (C) 2012 - 2014 Ifremer - %% - This program is free software: you can redistribute it and/or modify - 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" 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/> + <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> + <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> @@ -34,11 +30,7 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> - <include>*.bat</include> <include>README*</include> - <include>report/**</include> - <include>ichtyometre/**</include> </includes> </fileSet> @@ -48,11 +40,10 @@ </includes> </fileSet> - <!-- TUTTI component --> - + <!-- tutti component --> <fileSet> <directory>target</directory> - <outputDirectory>tutti</outputDirectory> + <outputDirectory>obsdeb</outputDirectory> <includes> <include>${project.build.finalName}.${project.packaging}</include> </includes> @@ -66,6 +57,8 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> + <exclude>tutti-ui-swing-launcher-*.jar</exclude> + <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> @@ -75,7 +68,6 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> <include>*.bat</include> </includes> </fileSet> @@ -94,6 +86,16 @@ </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> 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 f36760f..f3592db 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-i586.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-windows-component.xml </componentDescriptor> </componentDescriptors> 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 4fa8107..5ccdb55 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-x64.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-windows-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat index 7b1347d..fa2166c 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat @@ -1,44 +1,3 @@ @echo off -set OLDDIR=%CD% -cd /d %~dp0% - -set TUTTI_BASEDIR="%CD%" -set JAVA_HOME=%TUTTI_BASEDIR%\jre -set JAVA_COMMAND=%JAVA_HOME%\bin\java -set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log - -echo Allegro Campaign basedir: %TUTTI_BASEDIR% -echo Allegro Campaign app home: %TUTTI_HOME% -echo Allegro Campaign jre home: %JAVA_HOME% -echo Allegro Campaign log file: %TUTTI_LOG_FILE% - -:start - -copy tutti\update.bat . -echo Searching for updates... -call update.bat -del update.bat -if exist "tutti.config" copy tutti.config tutti -echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% --db-sanity true -if errorlevel 89 goto deletedb -if errorlevel 88 goto start - -goto quit - -:deletedb - -echo "Clean database and restart" - -del /S/Q data\db -del /S/Q data\dbcache -del /S/Q data\dbconf -rmdir data\db -rmdir data\dbcache -rmdir data\dbconf - -goto start - -:quit -cd %OLDDIR% +start tutti.exe --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh index b1f164d..5c451dc 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh @@ -4,38 +4,9 @@ export TUTTI_BASEDIR=$(pwd) export TUTTI_HOME=$TUTTI_BASEDIR/tutti export JAVA_HOME=$TUTTI_BASEDIR/jre export JAVA_COMMAND=$JAVA_HOME/bin/java -export TUTTI_LOG_FILE=$TUTTI_BASEDIR/data/tutti-${project.version}.log - -cd $TUTTI_BASEDIR echo "Allegro Campaign basedir: $TUTTI_BASEDIR" echo "Allegro Campaign app home: $TUTTI_HOME" echo "Allegro Campaign jre home: $JAVA_HOME" -echo "Allegro Campaign log file: $TUTTI_LOG_FILE" - -while true; do - - cp $TUTTI_HOME/update.sh . - echo "Searching for updates..." - ./update.sh - rm -f update.sh - if [ -f $TUTTI_BASEDIR/tutti.config ]; then - cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME - fi - echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR --db-sanity true - exitcode=$? - - if [ "$exitcode" -eq "89" ]; then - # delete db directory and restart - rm -rfv data/db - rm -rfv data/dbcache - rm -rfv data/dbconf - exitcode=88 - fi - if [ ! "$exitcode" -eq "88" ]; then - # quit now! - exit $exitcode - fi -done \ No newline at end of file +$JAVA_COMMAND -jar launcher.jar --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.bat b/tutti-ui-swing/src/main/assembly/full/tutti.bat deleted file mode 100644 index cb9396f..0000000 --- a/tutti-ui-swing/src/main/assembly/full/tutti.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off - -set OLDDIR=%CD% -cd /d %~dp0% - -set TUTTI_BASEDIR="%CD%" -set JAVA_HOME=%TUTTI_BASEDIR%\jre -set JAVA_COMMAND=%JAVA_HOME%\bin\java -set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log - -echo Allegro Campaign basedir: %TUTTI_BASEDIR% -echo Allegro Campaign app home: %TUTTI_HOME% -echo Allegro Campaign jre home: %JAVA_HOME% -echo Allegro Campaign log file: %TUTTI_LOG_FILE% - -:start - -copy tutti\update.bat . -echo Searching for updates... -call update.bat -del update.bat -if exist "tutti.config" copy tutti.config tutti -echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% -if errorlevel 89 goto deletedb -if errorlevel 88 goto start - -goto quit - -:deletedb - -echo "Clean database and restart" - -del /S/Q data\db -del /S/Q data\dbcache -del /S/Q data\dbconf -rmdir data\db -rmdir data\dbcache -rmdir data\dbconf - -goto start - -:quit -cd %OLDDIR% diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.sh b/tutti-ui-swing/src/main/assembly/full/tutti.sh index 1d29184..0cde9bd 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti.sh @@ -4,38 +4,9 @@ export TUTTI_BASEDIR=$(pwd) export TUTTI_HOME=$TUTTI_BASEDIR/tutti export JAVA_HOME=$TUTTI_BASEDIR/jre export JAVA_COMMAND=$JAVA_HOME/bin/java -export TUTTI_LOG_FILE=$TUTTI_BASEDIR/data/tutti-${project.version}.log - -cd $TUTTI_BASEDIR echo "Allegro Campaign basedir: $TUTTI_BASEDIR" echo "Allegro Campaign app home: $TUTTI_HOME" echo "Allegro Campaign jre home: $JAVA_HOME" -echo "Allegro Campaign log file: $TUTTI_LOG_FILE" - -while true; do - - cp $TUTTI_HOME/update.sh . - echo "Searching for updates..." - ./update.sh - rm -f update.sh - if [ -f $TUTTI_BASEDIR/tutti.config ]; then - cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME - fi - echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR - exitcode=$? - - if [ "$exitcode" -eq "89" ]; then - # delete db directory and restart - rm -rfv data/db - rm -rfv data/dbcache - rm -rfv data/dbconf - exitcode=88 - fi - if [ ! "$exitcode" -eq "88" ]; then - # quit now! - exit $exitcode - fi -done \ No newline at end of file +$JAVA_COMMAND -jar launcher.jar diff --git a/tutti-ui-swing/src/main/assembly/launcher/version.appup b/tutti-ui-swing/src/main/assembly/launcher/version.appup new file mode 100644 index 0000000..462d2b3 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/launcher/version.appup @@ -0,0 +1 @@ +${launcherVersion} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/min/launch.bat b/tutti-ui-swing/src/main/assembly/min/launch.bat index 9550fab..fbdb84c 100644 --- a/tutti-ui-swing/src/main/assembly/min/launch.bat +++ b/tutti-ui-swing/src/main/assembly/min/launch.bat @@ -1,10 +1,7 @@ @echo off -set OLDDIR=%CD% -cd /d %~dp0% - -%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=128M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 -set exitcode=%ERRORLEVEL% -echo Stop Allegro Campaign with exitcode: %exitcode% -cd %OLDDIR% -exit /b %exitcode% +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 index c268710..be75bd5 100755 --- a/tutti-ui-swing/src/main/assembly/min/launch.sh +++ b/tutti-ui-swing/src/main/assembly/min/launch.sh @@ -1,15 +1,7 @@ #!/bin/bash -MEMORY="-Xmx1024M -XX:MaxPermSize=128M" -#TUTTI_JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - -REP=$(dirname $0) - -cd $REP - -#echo "java command: $JAVA_COMMAND" - -$JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -Dtutti.log.file=$TUTTI_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* -exitcode=$? -echo "Stop Allegro Campaign with exitcode: $exitcode" -exit $exitcode +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/launcher.properties b/tutti-ui-swing/src/main/assembly/min/launcher.properties new file mode 100644 index 0000000..9048ef8 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/min/launcher.properties @@ -0,0 +1,3 @@ +JAR=tutti/${project.build.finalName}.${project.packaging} +LOGFILE=data/tutti.log +JAVA_OPTS="-XX:MaxPermSize=128M -XX:PermSize=64M -XX:MaxNewSize=32M -XX:NewSize=32M -Xms256m -Xmx1024m" diff --git a/tutti-ui-swing/src/main/assembly/min/update.bat b/tutti-ui-swing/src/main/assembly/min/update.bat index 4765843..7fbfba8 100644 --- a/tutti-ui-swing/src/main/assembly/min/update.bat +++ b/tutti-ui-swing/src/main/assembly/min/update.bat @@ -1,84 +1,14 @@ @echo off -set t=%time::=% -set BACKUP_DATE=%date:~6,4%%date:~3,2%%date:~0,2%%t:~0,6% - -if not exist "NEW\jre" goto tutti - -rem deplacement de l'ancienne jre -set /p oldVersion=<jre\version.appup -set /p newVersion=<NEW\jre\version.appup -set backupdir=OLD\jre-%oldVersion: =%-%BACKUP_DATE: =% -echo Update jre version %oldVersion: =% to %newVersion: =% old jre keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move jre "%backupdir%" -move NEW\jre jre - -:tutti - -if not exist "NEW\tutti" goto i18n - -rem deplacement de l'ancien tutti -set /p oldVersion=<tutti\version.appup -set /p newVersion=<NEW\tutti\version.appup -set backupdir=OLD\tutti-%oldVersion: =%-%BACKUP_DATE: =% -echo Update tutti version %oldVersion: =% to %newVersion: =% old tutti keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move tutti "%backupdir%" -move NEW\tutti tutti - -:i18n - -if not exist "NEW\i18n" goto help - -rem deplacement de l'ancien i18n -set /p oldVersion=<i18n\version.appup -set /p newVersion=<NEW\i18n\version.appup -set backupdir=OLD\i18n-%oldVersion: =%-%BACKUP_DATE: =% -echo Update i18n version %oldVersion: =% to %newVersion: =% old i18n keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move i18n "%backupdir%" -move NEW\i18n i18n - -:help - -if not exist "NEW\help" goto ichtyometer - -rem deplacement de l'ancien help -set /p oldVersion=<help\version.appup -set /p newVersion=<NEW\help\version.appup -set backupdir=OLD\help-%oldVersion: =%-%BACKUP_DATE: =% -echo Update help version %oldVersion: =% to %newVersion: =% old help keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move help "%backupdir%" -move NEW\help help - -:ichtyometer - -if not exist "NEW\ichtyometer" goto report - -rem deplacement de l'ancien ichtyometer -set /p oldVersion=<ichtyometer\version.appup -set /p newVersion=<NEW\ichtyometer\version.appup -set backupdir=OLD\ichtyometer-%oldVersion: =%-%BACKUP_DATE: =% -echo Update ichtyometer version %oldVersion: =% to %newVersion: =% old ichtyometer keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move ichtyometer "%backupdir%" -move NEW\ichtyometer ichtyometer - -:report - -if not exist "NEW\report" goto end - -rem deplacement de l'ancien report -set /p oldVersion=<report\version.appup -set /p newVersion=<NEW\report\version.appup -set backupdir=OLD\report-%oldVersion: =%-%BACKUP_DATE: =% -echo Update report version %oldVersion: =% to %newVersion: =% old report keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move report "%backupdir%" -move NEW\report report - -:end - -if exist "NEW" rmdir /Q NEW \ No newline at end of file +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 index 986842e..9adea09 100644 --- a/tutti-ui-swing/src/main/assembly/min/update.sh +++ b/tutti-ui-swing/src/main/assembly/min/update.sh @@ -1,74 +1,12 @@ #!/bin/bash - -BACKUP_DATE=$(date +%Y%m%d%H%M%S) - -if [ -d NEW/jre ]; then - oldVersion=`cat jre/version.appup` - newVersion=`cat NEW/jre/version.appup` - echo "Update jre version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/jre-$oldVersion-$BACKUP_DATE - echo "Backup jre old version to $backupdir" - mv jre $backupdir - mv NEW/jre . - chmod +x jre/bin/java -fi - -if [ -d NEW/tutti ]; then - oldVersion=`cat tutti/version.appup` - newVersion=`cat NEW/tutti/version.appup` - echo "Update tutti version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/tutti-$oldVersion-$BACKUP_DATE - echo "Backup tutti old version to $backupdir" - mv tutti $backupdir - mv NEW/tutti . - chmod +x tutti/update.sh - chmod +x tutti/launch.sh -fi - -if [ -d NEW/i18n ]; then - oldVersion=`cat i18n/version.appup` - newVersion=`cat NEW/i18n/version.appup` - echo "Update i18n version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/i18n-$oldVersion-$BACKUP_DATE - echo "Backup i18n old version to $backupdir" - mv i18n $backupdir - mv NEW/i18n . -fi - -if [ -d NEW/help ]; then - oldVersion=`cat help/version.appup` - newVersion=`cat NEW/help/version.appup` - echo "Update help version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/help-$oldVersion-$BACKUP_DATE - echo "Backup help old version to $backupdir" - mv help $backupdir - mv NEW/help . -fi - -if [ -d NEW/ichtyometer ]; then - oldVersion=`cat ichtyometer/version.appup` - newVersion=`cat NEW/ichtyometer/version.appup` - echo "Update ichtyometer version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/ichtyometer-$oldVersion-$BACKUP_DATE - echo "Backup ichtyometer old version to $backupdir" - mv ichtyometer $backupdir - mv NEW/ichtyometer . -fi - -if [ -d NEW/report ]; then - oldVersion=`cat report/version.appup` - newVersion=`cat NEW/report/version.appup` - echo "Update report version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/report-$oldVersion-$BACKUP_DATE - echo "Backup report old version to $backupdir" - mv report $backupdir - mv NEW/report . -fi - -rm -rf NEW +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 39e9cad..efb16d7 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -57,6 +57,7 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> + <include>launcher.properties</include> <include>launch.sh</include> <include>launch.bat</include> <include>update.sh</include> @@ -65,6 +66,16 @@ </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> + <fileSet> <includes> <include>README*</include> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.