From 573b260ad6e3dd5edeaee4095a6a9d78dfac68ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 10 May 2018 20:17:01 +0200 Subject: [PATCH] Remove single nsi executable issue6075 review38211002 --- make-win32-installer.sh | 1 - setup-single.nsi | 37 ------------------------------------- setup.nsi | 2 +- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 setup-single.nsi diff --git a/make-win32-installer.sh b/make-win32-installer.sh index ff4fe0b98d..8caa6d0ce0 100644 --- a/make-win32-installer.sh +++ b/make-win32-installer.sh @@ -4,4 +4,3 @@ version=`python setup.py --version` python setup.py compile_catalog python setup-freeze.py install_exe -d dist makensis -DVERSION=${version} setup.nsi -makensis -DVERSION=${version} setup-single.nsi diff --git a/setup-single.nsi b/setup-single.nsi deleted file mode 100644 index ae68549136..0000000000 --- a/setup-single.nsi +++ /dev/null @@ -1,37 +0,0 @@ -;This file is part of Tryton. The COPYRIGHT file at the top level of -;this repository contains the full copyright notices and license terms. - -;Check version -!ifndef VERSION - !error "Missing VERSION! Specify it with '/DVERSION='" -!endif - -;General -Name "Tryton ${VERSION}" -OutFile "tryton-${VERSION}.exe" -SetCompressor lzma -SetCompress auto -SilentInstall silent -Icon "tryton\data\pixmaps\tryton\tryton.ico" - -Section - InitPluginsDir - - ;Set output path to the installation directory - SetOutPath '$PLUGINSDIR' - - ;Put file - File /r "dist\*" - File "COPYRIGHT" - File "INSTALL" - File "LICENSE" - File "README" - File "CHANGELOG" - - SetOutPath "$PLUGINSDIR\doc" - File /r "doc\*" - - ;Run the exe - SetOutPath '$EXEDIR' - nsExec::Exec $PLUGINSDIR\tryton.exe -SectionEnd diff --git a/setup.nsi b/setup.nsi index 3e1f5dd8b5..c383871e90 100644 --- a/setup.nsi +++ b/setup.nsi @@ -11,7 +11,7 @@ ;General Name "Tryton ${VERSION}" -OutFile "tryton-setup-${VERSION}.exe" +OutFile "tryton-${VERSION}.exe" SetCompressor lzma SetCompress auto