dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Process the auto-appeneded part of InstallDir at compile-time

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2613 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-06-05 20:33:33 +00:00
parent a68f3ac2e1
commit e406ae6c1c
4 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/script.cpp
View file

@ -1288,12 +1288,26 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
SCRIPT_MSG("OutFile: \"%s\"\n",build_output_filename);
return make_sure_not_in_secorfunc(line.gettoken_str(0));
case TOK_INSTDIR:
{
char *p = line.gettoken_str(1);
if (build_header.install_directory_ptr)
{
warning("%s: specified multiple times. wasting space (%s:%d)",line.gettoken_str(0),curfilename,linecnt);
}
build_header.install_directory_ptr = add_string_main(line.gettoken_str(1));
build_header.install_directory_ptr = add_string_main(p);
build_header.install_directory_auto_append = 0;
if (*p && p[strlen(p)-1] != '\\')
{
p = build_strlist.get() + build_header.install_directory_ptr;
char *p2 = strrchr(p, '\\');
if (p2)
{
p2++;
build_header.install_directory_auto_append = build_header.install_directory_ptr + (p2 - p);
}
}
SCRIPT_MSG("InstallDir: \"%s\"\n",line.gettoken_str(1));
}
return make_sure_not_in_secorfunc(line.gettoken_str(0));
case TOK_INSTALLDIRREGKEY: // InstallDirRegKey
{