From 4ca94f6615b43492f296292f388610d07a79d6cc Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 17 Dec 2005 13:54:34 +0000 Subject: [PATCH] added "-setup" suffix to installer output file name git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4445 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/makensis.nsi | 2 +- SConstruct | 2 +- Scripts/release.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index c82fb436..819c96f3 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -11,7 +11,7 @@ !ifdef OUTFILE OutFile "${OUTFILE}" !else - OutFile ..\nsis-${VERSION}.exe + OutFile ..\nsis-${VERSION}-setup.exe !endif SetCompressor /SOLID lzma diff --git a/SConstruct b/SConstruct index 3532d6fb..278d18c6 100644 --- a/SConstruct +++ b/SConstruct @@ -236,7 +236,7 @@ if defenv.has_key('VER_MAJOR') and defenv.has_key('VER_MINOR') \ defenv['INSTVER'] += ' /DVER_REVISION=$VER_REVISION' defenv['INSTVER'] += ' /DVER_BUILD=$VER_BUILD' -installer_target = defenv.Command('nsis-${VERSION}${DISTSUFFIX}.exe', +installer_target = defenv.Command('nsis-${VERSION}-setup${DISTSUFFIX}.exe', '$INSTDISTDIR' + os.sep + 'Examples' + os.sep + 'makensis.nsi', '$INSTDISTDIR' + os.sep + 'makensis$PROGSUFFIX ' + '/DOUTFILE=$TARGET.abspath $INSTVER $SOURCE') diff --git a/Scripts/release.py b/Scripts/release.py index 74cc7d0a..f2a71b0a 100644 --- a/Scripts/release.py +++ b/Scripts/release.py @@ -192,7 +192,7 @@ run( ) run( - '..\\nsis-test.exe /S /D=%s\\insttest' % os.getcwd(), + '..\\nsis-test-setup.exe /S /D=%s\\insttest' % os.getcwd(), None, 'installer failed' ) @@ -282,7 +282,7 @@ ftp = FTP('upload.sourceforge.net') ftp.login() upload(ftp, newverdir + '.tar.bz2') -upload(ftp, newverdir + '\\nsis-%s.exe' % VERSION) +upload(ftp, newverdir + '\\nsis-%s-setup.exe' % VERSION) upload(ftp, newverdir + '\\nsis-%s.zip' % VERSION) upload(ftp, 'nsis-%s-log.zip' % VERSION) upload(ftp, 'nsis-%s-strlen_8192.zip' % VERSION)