- makensis should now compile on any POSIX compliment platform (Linux, *BSD, Mac OS X, etc.)

- improved makefiles so nothing is compiled when it's already up-to-date
- Added SW_HIDE to ExecShell's accepted show modes


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3518 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-03-29 20:21:00 +00:00
parent 8567625b0e
commit 4c5f8a30eb
46 changed files with 2054 additions and 679 deletions

View file

@ -36,6 +36,9 @@ const char *NSIS_VERSION="v2.0";
#include "Platform.h"
#include <stdio.h>
#include <signal.h>
#ifdef _WIN32
# include <direct.h>
#endif
#include "build.h"
#include "util.h"
@ -86,6 +89,8 @@ int main(int argc, char **argv)
int tmpargpos=1;
int no_logo=0;
build.setdirs(argv[0]);
if (argc > 1 && !stricmp(argv[1], "/VERSION"))
{
fprintf(g_output,NSIS_VERSION);
@ -217,9 +222,14 @@ int main(int argc, char **argv)
}
else if (!stricmp(argv[argpos],"/NOTIFYHWND"))
{
#ifdef _WIN32
build.notify_hwnd=(HWND)atol(argv[++argpos]);
if (!IsWindow(build.notify_hwnd))
build.notify_hwnd=0;
#else
argpos++;
build.warning("/NOTIFYHWND is disabled for non Win32 platforms.");
#endif
}
else if (!stricmp(argv[argpos],"/HDRINFO"))
{
@ -257,12 +267,11 @@ int main(int argc, char **argv)
{
g_noconfig=1;
char exepath[1024];
GetModuleFileName(NULL,exepath,sizeof(exepath)-1);
//strncpy(exepath,argv[0],1023);
strncpy(exepath,argv[0],sizeof(exepath)-1);
exepath[1023]=0;
char *p=exepath;
while (*p) p++;
while (p > exepath && *p != '\\') p=CharPrev(exepath,p);
while (p > exepath && *p != PATH_SEPARATOR_C) p=CharPrev(exepath,p);
if (p>exepath) p++;
strcpy(p,"nsisconf.nsh");
FILE *cfg=fopen(exepath,"rt");
@ -320,11 +329,19 @@ int main(int argc, char **argv)
}
if (do_cd)
{
char dirbuf[1024],*p;
char dirbuf[1024]="";
char *p;
#ifdef _WIN32
GetFullPathName(sfile,sizeof(dirbuf),dirbuf,&p);
p=dirbuf;
while (*p) p++;
while (p > dirbuf && *p != '\\') p=CharPrev(dirbuf,p);
p=CharPrev(dirbuf,p);
#else
getcwd(dirbuf,sizeof(dirbuf)-strlen(sfile)-2);
if (dirbuf[strlen(dirbuf)-1]!=PATH_SEPARATOR_C)
strcat(dirbuf,PATH_SEPARATOR_STR);
strcat(dirbuf,sfile);
p=strrchr(dirbuf,PATH_SEPARATOR_C);
#endif
if (!p) p=dirbuf;
*p=0;
if (dirbuf[0])
{
@ -333,7 +350,7 @@ int main(int argc, char **argv)
fprintf(g_output,"Changing directory to: \"%s\"\n",dirbuf);
fflush(g_output);
}
if (!SetCurrentDirectory(dirbuf))
if (chdir(dirbuf))
{
if (build.display_errors)
{