From 1421a3e3150617eeb4414932211abc0effbadd9a Mon Sep 17 00:00:00 2001 From: wizou Date: Wed, 16 Jun 2010 15:07:05 +0000 Subject: [PATCH] Default OutFile determined by NSI script filename git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6106 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 6 ++++++ Source/build.h | 2 ++ Source/makenssi.cpp | 1 + 3 files changed, 9 insertions(+) diff --git a/Source/build.cpp b/Source/build.cpp index 78b95bd3..79318a4d 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -2349,6 +2349,12 @@ int CEXEBuild::UpdatePEHeader() return PS_OK; } +void CEXEBuild::set_default_output_filename(const tstring& filename) +{ + if (build_output_filename[0] == 0) + _tcsnccpy(build_output_filename,filename.c_str(),1024-1); +} + int CEXEBuild::check_write_output_errors() const { if (has_called_write_output) diff --git a/Source/build.h b/Source/build.h index 34487f0e..d610afae 100644 --- a/Source/build.h +++ b/Source/build.h @@ -105,6 +105,8 @@ class CEXEBuild { #endif //NSIS_CONFIG_PLUGIN_SUPPORT + void set_default_output_filename(const tstring& filename); + // process a script (you can process as many scripts as you want, // it is as if they are concatenated) int process_script(FILE *filepointer, const TCHAR *filename, BOOL unicode); diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp index f0decb8b..3a0c8149 100644 --- a/Source/makenssi.cpp +++ b/Source/makenssi.cpp @@ -516,6 +516,7 @@ int _tmain(int argc, TCHAR **argv) if (change_to_script_dir(build, script_file)) return 1; } + build.set_default_output_filename(remove_file_extension(sfile)+_T(".exe")); } if (build.display_script)