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

- b2 version number

Browse source 
- bug with commands starting with ! and ending with \ in if blocks fixed


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2216 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-02-26 15:28:55 +00:00
parent 2e19d22d39
commit 42a72140cd
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/makenssi.cpp
View file

@ -1,4 +1,4 @@
const char *NSIS_VERSION="v2.0b2 (CVS)"; const char *NSIS_VERSION="v2.0b2";
/* /*
Nullsoft "SuperPimp" Installation System - makensis.cpp - installer compiler code Nullsoft "SuperPimp" Installation System - makensis.cpp - installer compiler code

14
Source/script.cpp
View file

@ -49,6 +49,7 @@ int CEXEBuild::process_script(FILE *fp, char *curfilename, int *lineptr)
int CEXEBuild::doParse(const char *str, FILE *fp, const char *curfilename, int *lineptr) int CEXEBuild::doParse(const char *str, FILE *fp, const char *curfilename, int *lineptr)
{ {
static int ignore; static int ignore;
static int last_line_had_slash;
static int ignored_if_count; static int ignored_if_count;
static int wait_for_endif; static int wait_for_endif;
@ -58,14 +59,18 @@ int CEXEBuild::doParse(const char *str, FILE *fp, const char *curfilename, int *
while (*str == ' ' || *str == '\t') str++; while (*str == ' ' || *str == '\t') str++;
// if ignoring, ignore all lines that don't begin with !. // if ignoring, ignore all lines that don't begin with !.
if (ignore && *str!='!') return PS_OK; if (ignore && *str!='!' && !last_line_had_slash) return PS_OK;
if (m_linebuild.getlen()>1) m_linebuild.resize(m_linebuild.getlen()-2); if (m_linebuild.getlen()>1) m_linebuild.resize(m_linebuild.getlen()-2);
m_linebuild.add(str,strlen(str)+1); m_linebuild.add(str,strlen(str)+1);
// remove trailing slash and null // remove trailing slash and null
if (str[0] && CharPrev(str,str+strlen(str))[0] == '\\') return PS_OK; if (str[0] && CharPrev(str,str+strlen(str))[0] == '\\') {
last_line_had_slash = 1;
return PS_OK;
}
else last_line_had_slash = 0;
res=line.parse((char*)m_linebuild.get(),!strnicmp(str,"!define",7)); res=line.parse((char*)m_linebuild.get(),!strnicmp(str,"!define",7));
@ -128,8 +133,9 @@ parse_again:
if (tkid == TOK_P_ELSE) if (tkid == TOK_P_ELSE)
{ {
if (ignored_if_count) if (ignored_if_count) {
return PS_OK; return PS_OK;
}
if (line.getnumtokens() == 1) { if (line.getnumtokens() == 1) {
ignore=!ignore; ignore=!ignore;
@ -1304,7 +1310,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
if (k == -1) PRINTHELP() if (k == -1) PRINTHELP()
SCRIPT_MSG("XPStyle: %s\n", line.gettoken_str(1)); SCRIPT_MSG("XPStyle: %s\n", line.gettoken_str(1));
init_res_editor(); init_res_editor();
char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0b2 (CVS)</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>"; char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0b2</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>";
res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (unsigned char*)szXPManifest, k ? 0 : lstrlen(szXPManifest)); res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (unsigned char*)szXPManifest, k ? 0 : lstrlen(szXPManifest));
} }
catch (exception& err) { catch (exception& err) {