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 34daab3db37e1d582dc85d4418f007e1709c1a3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 26 19:18:16 2015 +0100 still deliver .bat scripts, .exe does not work sometimes --- .../src/main/assembly/full-windows-component.xml | 17 +++++++---------- tutti-ui-swing/src/main/assembly/full/README.txt | 4 ++++ .../src/main/assembly/full/windows/tutti-sanity.bat | 12 +++++++++++- tutti-ui-swing/src/main/assembly/full/windows/tutti.bat | 12 ++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) 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 4a13b5b..5f2a1b0 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -29,22 +29,19 @@ 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> - <files> <file> <source>${project.build.directory}/tutti-launcher-${launcherVersion}.exe</source> <outputDirectory/> <destName>tutti.exe</destName> </file> + + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> + <outputDirectory/> + <destName>launcher.jar</destName> + </file> + </files> <fileSets> diff --git a/tutti-ui-swing/src/main/assembly/full/README.txt b/tutti-ui-swing/src/main/assembly/full/README.txt index 0212ede..80f2a8a 100644 --- a/tutti-ui-swing/src/main/assembly/full/README.txt +++ b/tutti-ui-swing/src/main/assembly/full/README.txt @@ -5,6 +5,10 @@ Pour démarrer Allegro Campagne Saisie tutti.exe +ou + +tutti.bat + # Sous Linux ./tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat index fa2166c..e508ee5 100644 --- a/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat +++ b/tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat @@ -1,3 +1,13 @@ @echo off -start tutti.exe --db-sanity true +set OLDDIR=%CD% +cd /d %~dp0% + +set TUTTI_BASEDIR="%CD%" +set JAVA_HOME=%TUTTI_BASEDIR%\jre +set JAVA_COMMAND=%JAVA_HOME%\bin\java + +echo Allegro Campaign basedir: %TUTTI_BASEDIR% + +@start tutti.exe --db-sanity true +%JAVA_COMMAND% -jar launcher.jar --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/windows/tutti.bat b/tutti-ui-swing/src/main/assembly/full/windows/tutti.bat new file mode 100644 index 0000000..83412ef --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/full/windows/tutti.bat @@ -0,0 +1,12 @@ +@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 + +echo Allegro Campaign basedir: %TUTTI_BASEDIR% + +%JAVA_COMMAND% -jar launcher.jar \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.