branch develop updated (50855f2 -> 44525ee)
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 50855f2 refs #6575 ajout des poids tremie et carrousel + ratio vrac trié / vrac total new 44525ee amélioration du démarrage de l'application The 1 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 44525eecf32f3a9d4403826ab5b555d343dffc7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 1 23:41:39 2015 +0100 amélioration du démarrage de l'application Summary of changes: README.txt | 33 +++-------- pom.xml | 6 +- src/update/tutti-application.properties | 2 +- .../src/main/resources/update_runtime.bat | 3 + .../src/main/resources/update_runtime.sh | 7 ++- tutti-ui-swing/pom.xml | 65 ++++++++++++++++++++++ .../src/main/assembly/full-linux-component.xml | 2 +- .../src/main/assembly/full-shared-component.xml | 45 ++++----------- .../src/main/assembly/full-windows-component.xml | 3 +- .../{full-windows-component.xml => launcher.xml} | 61 ++++++++++++++++---- .../main/assembly/{full => launcher}/README.txt | 0 .../{full => launcher}/linux/tutti-sanity.sh | 0 .../assembly/{full => launcher}/linux/tutti.sh | 0 .../{full => launcher}/windows/tutti-sanity.bat | 0 .../assembly/{full => launcher}/windows/tutti.bat | 0 .../src/main/assembly/report/version.appup | 1 - tutti-ui-swing/src/main/assembly/standalone.xml | 30 +++++----- .../main/assembly/standalone/launcher.properties | 8 ++- .../src/main/assembly/standalone/linux/launch.sh | 5 +- .../main/assembly/standalone/windows/launch.bat | 5 +- 20 files changed, 179 insertions(+), 97 deletions(-) copy tutti-ui-swing/src/main/assembly/{full-windows-component.xml => launcher.xml} (52%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/README.txt (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/linux/tutti-sanity.sh (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/linux/tutti.sh (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/windows/tutti-sanity.bat (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/windows/tutti.bat (100%) delete mode 100644 tutti-ui-swing/src/main/assembly/report/version.appup -- 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 44525eecf32f3a9d4403826ab5b555d343dffc7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 1 23:41:39 2015 +0100 amélioration du démarrage de l'application --- README.txt | 33 +++-------- pom.xml | 6 +- src/update/tutti-application.properties | 2 +- .../src/main/resources/update_runtime.bat | 3 + .../src/main/resources/update_runtime.sh | 7 ++- tutti-ui-swing/pom.xml | 65 ++++++++++++++++++++++ .../src/main/assembly/full-linux-component.xml | 2 +- .../src/main/assembly/full-shared-component.xml | 45 ++++----------- .../src/main/assembly/full-windows-component.xml | 3 +- .../{full-windows-component.xml => launcher.xml} | 61 ++++++++++++++++---- .../main/assembly/{full => launcher}/README.txt | 0 .../{full => launcher}/linux/tutti-sanity.sh | 0 .../assembly/{full => launcher}/linux/tutti.sh | 0 .../{full => launcher}/windows/tutti-sanity.bat | 0 .../assembly/{full => launcher}/windows/tutti.bat | 0 .../src/main/assembly/report/version.appup | 1 - tutti-ui-swing/src/main/assembly/standalone.xml | 30 +++++----- .../main/assembly/standalone/launcher.properties | 8 ++- .../src/main/assembly/standalone/linux/launch.sh | 5 +- .../main/assembly/standalone/windows/launch.bat | 5 +- 20 files changed, 179 insertions(+), 97 deletions(-) diff --git a/README.txt b/README.txt index 046caf0..2768ee8 100644 --- a/README.txt +++ b/README.txt @@ -22,27 +22,12 @@ il faut alors suite à la release faire: git checkout master mvn clean verify site-deploy -DperformRelease -Historique des versions de base -------------------------------- - -+---------------------+------------+---------------------------+ -| Application version | Db version | Allegro db schema version | -+=====================+============+===========================+ -+ 2.3 + 2013.06.04 + 3.2.1.01 + -+---------------------+------------+---------------------------+ -+ 2.4 + 2013.06.04 + 3.2.3 + -+---------------------+------------+---------------------------+ -+ 2.8.1 + 2013.08.22 + 3.2.3 + -+---------------------+------------+---------------------------+ -+ 3.0-rc-2 + 2013.11.29 + 3.4.1 + -+---------------------+------------+---------------------------+ -+ 3.0 + 2014.01.10 + 3.4.1 + -+---------------------+------------+---------------------------+ -+ 3.1 + 2014.01.23 + 3.4.1 + -+---------------------+------------+---------------------------+ -+ 3.2 + 2014.03.11 + 3.4.1 + -+---------------------+------------+---------------------------+ -+ 3.5 + 2014.05.06 + 3.5.0 + -+---------------------+------------+---------------------------+ -+ 3.7 + 2014.07.11 + 3.6.3 + -+---------------------+------------+---------------------------+ +Faire une nouvelle version du lanceur d'application +--------------------------------------------------- + +Mettre à jour la propriété *launcherVersion* dans le pom parent. + +Ajouter la propriété -DperformLauncherRelease lors de la release. + +Cela produira l'archive tutti-ui-swing-${project.version}-launcher.zip qui sera déployée sur le nexus puis utilisée +pour les mises à jour. diff --git a/pom.xml b/pom.xml index 841199b..907f10c 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,7 @@ <springVersion>4.1.4.RELEASE</springVersion> <hsqldbVersion>1.8.1.3</hsqldbVersion> <batikVersion>1.7</batikVersion> + <xmlApisVersion>1.3.04</xmlApisVersion> <!-- I18n configuration --> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -155,15 +156,14 @@ <locales>fr</locales> <!-- Last JRE version to use --> - <jreVersion>1.7.72</jreVersion> + <jreVersion>1.7.76</jreVersion> <!-- Last launcher version --> - <launcherVersion>1.0.1</launcherVersion> + <launcherVersion>1.1-SNAPSHOT</launcherVersion> <!-- Where are deployed software components --> <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> - <xmlApisVersion>1.3.04</xmlApisVersion> </properties> <repositories> diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index 0cbadf0..c8e139b 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -38,7 +38,7 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/c ################################################################################ launcher.version=@launcherVersion@ -launcher.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-launcher/@launcherVersion@/tutti-launcher-@launcherVersion@-bin.zip +launcher.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@launcherVersion@/tutti-ui-swing-@launcherVersion@-launcher.zip ################################################################################ ### Tutti Updates ############################################################## diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.bat b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat index e398c2b..f85538a 100644 --- a/tutti-ui-swing-updater/src/main/resources/update_runtime.bat +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat @@ -20,10 +20,13 @@ if not exist \"NEW\\launcher\" goto end echo Update launcher version %oldVersion% to %newVersion% old launcher keep in \"%backupdir%\" if not exist \"OLD\" mkdir OLD move /Y tutti.exe launcher\\tutti.exe + move /Y tutti.bat launcher move /Y launcher \"%backupdir%\" move /Y NEW\\launcher launcher del /F /Q launcher\\*.sh move /Y launcher\\tutti.exe tutti.exe + move /Y launcher\\tutti.bat tutti.bat + move /Y launcher\\README README :end if exist NEW\\jre rmdir /S /Q NEW\\jre diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.sh b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh index a5f39e4..bc3f8f1 100644 --- a/tutti-ui-swing-updater/src/main/resources/update_runtime.sh +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh @@ -24,13 +24,14 @@ if [ -d NEW/launcher ]; then mkdir -p OLD backupdir=OLD/launcher-$oldVersion-$BACKUP_DATE echo \"Backup launcher old version to $backupdir\" - mv tutti.sh launcher/ + mv *.sh launcher/ mv launcher $backupdir mv NEW/launcher . rm launcher/*.exe rm launcher/*.bat - mv launcher/tutti.sh . - chmod +x tutti.sh + mv launcher/*.sh . + mv launcher/README . + chmod +x *.sh fi ./tutti.sh \ No newline at end of file diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 7847998..d538e66 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -946,6 +946,71 @@ </profile> <profile> + <id>launcher-bundle</id> + <activation> + <property> + <name>performLauncherRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + <type>exe</type> + <classifier>bin</classifier> + </artifactItem> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-launcher</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor> + src/main/assembly/launcher.xml + </descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>profiling</id> <build> 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 4aa4cdc..ef03637 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -40,7 +40,7 @@ <fileSets> <fileSet> - <directory>src/main/assembly/full/linux</directory> + <directory>src/main/assembly/launcher/linux</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> 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 eaa4233..23e736a 100644 --- a/tutti-ui-swing/src/main/assembly/full-shared-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-shared-component.xml @@ -27,17 +27,6 @@ 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>tutti</outputDirectory> - <outputFileNameMapping>updater.jar</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> - </includes> - </dependencySet> - </dependencySets> - <fileSets> <fileSet> @@ -47,8 +36,8 @@ </fileSet> <fileSet> - <directory>src/main/assembly/full</directory> - <outputDirectory>tutti</outputDirectory> + <directory>src/main/assembly/launcher</directory> + <outputDirectory/> <filtered>true</filtered> <includes> <include>*</include> @@ -56,9 +45,19 @@ <excludes> <exclude>linux</exclude> <exclude>windows</exclude> + <exclude>version.appup</exclude> </excludes> </fileSet> + <fileSet> + <directory>src/main/assembly/launcher</directory> + <outputDirectory>launcher</outputDirectory> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> + <!-- TUTTI component --> <fileSet> <directory>target</directory> @@ -76,7 +75,6 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> @@ -93,16 +91,6 @@ </excludes> </fileSet> - <!-- Launcher component --> - <fileSet> - <directory>src/main/assembly/launcher</directory> - <outputDirectory>launcher</outputDirectory> - <filtered>true</filtered> - <includes> - <include>**/*</include> - </includes> - </fileSet> - <!-- I18N component --> <fileSet> <directory>target/classes/META-INF</directory> @@ -140,15 +128,6 @@ </includes> </fileSet> - <!-- REPORT component --> - <fileSet> - <directory>src/main/assembly/report</directory> - <outputDirectory>report</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - <!-- Ichtyometer component --> <fileSet> <directory>src/main/ichtyometer</directory> 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 493455a..9da0c47 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -30,6 +30,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> <files> + <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> <outputDirectory/> @@ -47,7 +48,7 @@ <fileSets> <fileSet> - <directory>src/main/assembly/full/windows</directory> + <directory>src/main/assembly/launcher/windows</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-component.xml b/tutti-ui-swing/src/main/assembly/launcher.xml similarity index 52% copy from tutti-ui-swing/src/main/assembly/full-windows-component.xml copy to tutti-ui-swing/src/main/assembly/launcher.xml index 493455a..144879a 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/launcher.xml @@ -2,40 +2,43 @@ <!-- #%L Tutti :: UI - $Id:$ - $HeadURL:$ %% - Copyright (C) 2012 - 2015 Ifremer + Copyright (C) 2015 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" +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/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"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>launcher</id> + <formats> + <format>zip</format> + </formats> <files> + <!--Add embedded launcher executable --> <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> <outputDirectory/> <destName>tutti.exe</destName> </file> + <!--Add embedded launcher executable --> <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> <outputDirectory/> @@ -47,14 +50,48 @@ <fileSets> <fileSet> - <directory>src/main/assembly/full/windows</directory> + <directory>src/main/assembly/launcher</directory> <outputDirectory/> <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.bat</include> + <include>*</include> + </includes> + <excludes> + <exclude>linux</exclude> + <exclude>windows</exclude> + </excludes> + </fileSet> + + + <!--Add embedded windows launcher script --> + <fileSet> + <directory>src/main/assembly/launcher/windows</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + + <!--Add embedded linux launcher script --> + <fileSet> + <directory>src/main/assembly/launcher/linux</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> </includes> </fileSet> </fileSets> -</component> +</assembly> diff --git a/tutti-ui-swing/src/main/assembly/full/README.txt b/tutti-ui-swing/src/main/assembly/launcher/README.txt similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/README.txt rename to tutti-ui-swing/src/main/assembly/launcher/README.txt diff --git a/tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/launcher/linux/tutti-sanity.sh similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh rename to tutti-ui-swing/src/main/assembly/launcher/linux/tutti-sanity.sh diff --git a/tutti-ui-swing/src/main/assembly/full/linux/tutti.sh b/tutti-ui-swing/src/main/assembly/launcher/linux/tutti.sh similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/linux/tutti.sh rename to tutti-ui-swing/src/main/assembly/launcher/linux/tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/launcher/windows/tutti-sanity.bat similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat rename to tutti-ui-swing/src/main/assembly/launcher/windows/tutti-sanity.bat diff --git a/tutti-ui-swing/src/main/assembly/full/windows/tutti.bat b/tutti-ui-swing/src/main/assembly/launcher/windows/tutti.bat similarity index 100% rename from tutti-ui-swing/src/main/assembly/full/windows/tutti.bat rename to tutti-ui-swing/src/main/assembly/launcher/windows/tutti.bat diff --git a/tutti-ui-swing/src/main/assembly/report/version.appup b/tutti-ui-swing/src/main/assembly/report/version.appup deleted file mode 100644 index c227083..0000000 --- a/tutti-ui-swing/src/main/assembly/report/version.appup +++ /dev/null @@ -1 +0,0 @@ -0 \ 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 311cece..79ecf10 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -48,7 +48,7 @@ </files> <!-- Add updater --> - <dependencySets> + <!--dependencySets> <dependencySet> <outputDirectory/> <outputFileNameMapping>updater.jar</outputFileNameMapping> @@ -56,7 +56,7 @@ <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> </includes> </dependencySet> - </dependencySets> + </dependencySets--> <fileSets> @@ -112,21 +112,24 @@ </includes> </fileSet> - <!--Add embedded windows launcher script (TODO :should be removed in further version)--> + <!--Add embedded launcher module (TODO :should be removed in further version)--> <fileSet> - <directory>src/main/assembly/full/windows</directory> - <outputDirectory>embedded</outputDirectory> + <directory>src/main/assembly/launcher</directory> + <outputDirectory>launcher</outputDirectory> <filtered>true</filtered> - <fileMode>0755</fileMode> <includes> - <include>*</include> + <include>**/*</include> </includes> + <excludes> + <exclude>linux</exclude> + <exclude>windows</exclude> + </excludes> </fileSet> - <!--Add embedded linux launcher script (TODO :should be removed in further version)--> + <!--Add embedded windows launcher script (TODO :should be removed in further version)--> <fileSet> - <directory>src/main/assembly/full/linux</directory> - <outputDirectory>embedded</outputDirectory> + <directory>src/main/assembly/launcher/windows</directory> + <outputDirectory>launcher</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> <includes> @@ -134,13 +137,14 @@ </includes> </fileSet> - <!--Add embedded launcher module (TODO :should be removed in further version)--> + <!--Add embedded linux launcher script (TODO :should be removed in further version)--> <fileSet> - <directory>src/main/assembly/launcher</directory> + <directory>src/main/assembly/launcher/linux</directory> <outputDirectory>launcher</outputDirectory> <filtered>true</filtered> + <fileMode>0755</fileMode> <includes> - <include>**/*</include> + <include>*</include> </includes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/standalone/launcher.properties b/tutti-ui-swing/src/main/assembly/standalone/launcher.properties index d9b292b..f06d263 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/launcher.properties +++ b/tutti-ui-swing/src/main/assembly/standalone/launcher.properties @@ -21,6 +21,8 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -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" +UPDATER_JAR=tutti/lib/tutti-ui-swing-updater-${project.version}.jar +UPDATER_LOGFILE=logs/updater.log +APPLICATION_JAR=tutti/${project.build.finalName}.jar +APPLICATION_LOGFILE=logs/tutti.log +APPLICATION_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/standalone/linux/launch.sh b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh index 970e8a5..ddd5b29 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh +++ b/tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh @@ -2,6 +2,9 @@ echo "Move embedded script file to tutti root" mv -f tutti/launcher . -mv -f tutti/embedded/* . +rm launcher/*.exe +rm launcher/*.bat +mv launcher/*.sh . +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 1626ee5..a813d56 100644 --- a/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat +++ b/tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat @@ -3,5 +3,8 @@ rem move embedded launcher file to tutti root verify on move /Y tutti\launcher launcher -move /Y tutti\embedded\* . +del /F /Q launcher\\*.sh +move /Y launcher\tutti.exe tutti.exe +move /Y launcher\tutti.bat tutti.bat +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>.
participants (1)
-
codelutin.com scm