From 6d501355a0694173aa4ffeda8aebad429655e960 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 2 Aug 2002 12:45:31 +0000 Subject: [PATCH] no message git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@627 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/makensis.nsi | 3 +- Source/makenssi.dsp | 2 +- Source/makenssi.opt | Bin 58880 -> 59904 bytes Source/makenssi.plg | 221 +----------------------------------------- 4 files changed, 7 insertions(+), 219 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 4975c0c8..60bd1635 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -12,7 +12,7 @@ CRCCheck off Name "NSIS" Caption "Nullsoft Install System - Setup" -OutFile nsis${VER_MAJOR}${VER_MINOR}.exe +OutFile ..\nsis${VER_MAJOR}${VER_MINOR}.exe SetCompressor bzip2 @@ -53,6 +53,7 @@ Section "NSIS development system (required)" SectionIn 1 2 3 RO SetOutPath $INSTDIR SetOverwrite try + Delete $INSTDIR\makensis-bz2.exe File ..\makensis.exe File ..\makensisw.exe File ..\makensis.htm diff --git a/Source/makenssi.dsp b/Source/makenssi.dsp index e2f7ddff..1597ffd9 100644 --- a/Source/makenssi.dsp +++ b/Source/makenssi.dsp @@ -241,7 +241,7 @@ SOURCE=..\makensis.htm # End Source File # Begin Source File -SOURCE=..\makensis.nsi +SOURCE=..\Examples\makensis.nsi # End Source File # End Target # End Project diff --git a/Source/makenssi.opt b/Source/makenssi.opt index 121a7382053677b5527c576149a996f788a8929b..443c7bac176461b98e8b8c383f3d1d2764b6cdd1 100644 GIT binary patch literal 59904 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 delta 768 zcmZp;!rX9%c|!veqvzyCruhQ@{{R0E!rlxF3_d_S*??Jw2P6;*70{TTpX5}TFz?Y>K|kWbl^EwqI|I_ z;wIx{33gsq4iOixaG*XnBK7550qf%e>myZjgD4YlrgPf1Rm7mU)}jk>`$0hse}-jXZq-IKk}Y diff --git a/Source/makenssi.plg b/Source/makenssi.plg index 813f4f4a..85dced7e 100644 --- a/Source/makenssi.plg +++ b/Source/makenssi.plg @@ -2,207 +2,17 @@
 

Build Log

-

---------------------Configuration: exehead_bzip2 - Win32 Release-------------------- -

-

Command Lines

-Creating command line "rc.exe /l 0x409 /fo"Release-bzip2/resource.res" /d "NDEBUG" "C:\Program Files\NSIS\Source\exehead\resource.rc"" -Creating temporary file "F:\Temp\WinTemp\RSP2E5.tmp" with contents -[ -/nologo /ML /W3 /GX /O1 /Oy /D "_WINDOWS" /D "EXEHEAD" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /D "NSIS_COMPRESS_USE_BZIP2" /Fo"Release-bzip2/" /Fd"Release-bzip2/" /FD /c -"C:\Program Files\NSIS\Source\zlib\INFBLOCK.C" -"C:\Program Files\NSIS\Source\zlib\INFCODES.C" -"C:\Program Files\NSIS\Source\zlib\INFLATE.C" -"C:\Program Files\NSIS\Source\zlib\INFTREES.C" -"C:\Program Files\NSIS\Source\zlib\INFUTIL.C" -"C:\Program Files\NSIS\Source\bzip2\bzlib.c" -"C:\Program Files\NSIS\Source\bzip2\decompress.c" -"C:\Program Files\NSIS\Source\bzip2\huffman.c" -"C:\Program Files\NSIS\Source\bzip2\randtable.c" -"C:\Program Files\NSIS\Source\exehead\bgbg.c" -"C:\Program Files\NSIS\Source\crc32.c" -"C:\Program Files\NSIS\Source\exehead\exec.c" -"C:\Program Files\NSIS\Source\exehead\fileform.c" -"C:\Program Files\NSIS\Source\exehead\Main.c" -"C:\Program Files\NSIS\Source\exehead\Ui.c" -"C:\Program Files\NSIS\Source\exehead\util.c" -] -Creating command line "cl.exe @F:\Temp\WinTemp\RSP2E5.tmp" -Creating temporary file "F:\Temp\WinTemp\RSP2E6.tmp" with contents -[ -comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib shell32.lib /nologo /entry:"WinMain" /subsystem:windows /pdb:none /machine:I386 /nodefaultlib /out:"Release-bzip2/exehead_bzip2.exe" /opt:nowin98 -".\Release-bzip2\INFBLOCK.OBJ" -".\Release-bzip2\INFCODES.OBJ" -".\Release-bzip2\INFLATE.OBJ" -".\Release-bzip2\INFTREES.OBJ" -".\Release-bzip2\INFUTIL.OBJ" -".\Release-bzip2\bzlib.obj" -".\Release-bzip2\decompress.obj" -".\Release-bzip2\huffman.obj" -".\Release-bzip2\randtable.obj" -".\Release-bzip2\bgbg.obj" -".\Release-bzip2\crc32.obj" -".\Release-bzip2\exec.obj" -".\Release-bzip2\fileform.obj" -".\Release-bzip2\Main.obj" -".\Release-bzip2\Ui.obj" -".\Release-bzip2\util.obj" -".\Release-bzip2\resource.res" -] -Creating command line "link.exe @F:\Temp\WinTemp\RSP2E6.tmp" -

Output Window

-Compiling resources... -Compiling... -INFBLOCK.C -INFCODES.C -INFLATE.C -INFTREES.C -INFUTIL.C -bzlib.c -decompress.c -huffman.c -randtable.c -bgbg.c -crc32.c -exec.c -fileform.c -Main.c -Ui.c -util.c -Generating Code... -Linking... -Creating temporary file "F:\Temp\WinTemp\RSP2E8.bat" with contents -[ -@echo off -bin2h Release-bzip2\exehead_bzip2.exe Release-bzip2\exehead_bzip2.h bzip2_header_data -] -Creating command line "F:\Temp\WinTemp\RSP2E8.bat" -generating include file for makenssi -Release-bzip2\exehead_bzip2.exe -> bzip2_header_data (38400 bytes) - -

---------------------Configuration: exehead_zlib - Win32 Release-------------------- -

-

Command Lines

-Creating command line "rc.exe /l 0x409 /fo"Release-zlib/resource.res" /d "NDEBUG" "C:\Program Files\NSIS\Source\exehead\resource.rc"" -Creating temporary file "F:\Temp\WinTemp\RSP2E9.tmp" with contents -[ -/nologo /ML /W3 /GX /O1 /Oy /D "_WINDOWS" /D "EXEHEAD" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /D "NSIS_COMPRESS_USE_ZLIB" /Fo"Release-zlib/" /Fd"Release-zlib/" /FD /c -"C:\Program Files\NSIS\Source\zlib\INFBLOCK.C" -"C:\Program Files\NSIS\Source\zlib\INFCODES.C" -"C:\Program Files\NSIS\Source\zlib\INFLATE.C" -"C:\Program Files\NSIS\Source\zlib\INFTREES.C" -"C:\Program Files\NSIS\Source\zlib\INFUTIL.C" -"C:\Program Files\NSIS\Source\bzip2\bzlib.c" -"C:\Program Files\NSIS\Source\bzip2\decompress.c" -"C:\Program Files\NSIS\Source\bzip2\huffman.c" -"C:\Program Files\NSIS\Source\bzip2\randtable.c" -"C:\Program Files\NSIS\Source\exehead\bgbg.c" -"C:\Program Files\NSIS\Source\crc32.c" -"C:\Program Files\NSIS\Source\exehead\exec.c" -"C:\Program Files\NSIS\Source\exehead\fileform.c" -"C:\Program Files\NSIS\Source\exehead\Main.c" -"C:\Program Files\NSIS\Source\exehead\Ui.c" -"C:\Program Files\NSIS\Source\exehead\util.c" -] -Creating command line "cl.exe @F:\Temp\WinTemp\RSP2E9.tmp" -Creating temporary file "F:\Temp\WinTemp\RSP2EA.tmp" with contents -[ -comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib shell32.lib /nologo /entry:"WinMain" /subsystem:windows /pdb:none /machine:I386 /nodefaultlib /out:"Release-zlib/exehead_zlib.exe" /opt:nowin98 -".\Release-zlib\INFBLOCK.OBJ" -".\Release-zlib\INFCODES.OBJ" -".\Release-zlib\INFLATE.OBJ" -".\Release-zlib\INFTREES.OBJ" -".\Release-zlib\INFUTIL.OBJ" -".\Release-zlib\bzlib.obj" -".\Release-zlib\decompress.obj" -".\Release-zlib\huffman.obj" -".\Release-zlib\randtable.obj" -".\Release-zlib\bgbg.obj" -".\Release-zlib\crc32.obj" -".\Release-zlib\exec.obj" -".\Release-zlib\fileform.obj" -".\Release-zlib\Main.obj" -".\Release-zlib\Ui.obj" -".\Release-zlib\util.obj" -".\Release-zlib\resource.res" -] -Creating command line "link.exe @F:\Temp\WinTemp\RSP2EA.tmp" -

Output Window

-Compiling resources... -Compiling... -INFBLOCK.C -INFCODES.C -INFLATE.C -INFTREES.C -INFUTIL.C -bzlib.c -decompress.c -huffman.c -randtable.c -bgbg.c -crc32.c -exec.c -fileform.c -Main.c -Ui.c -util.c -Generating Code... -Linking... -Creating temporary file "F:\Temp\WinTemp\RSP2EC.bat" with contents -[ -@echo off -bin2h Release-zlib\exehead_zlib.exe Release-zlib\exehead_zlib.h zlib_header_data -bin2h bitmap1.bmp Release-zlib\bitmap1.h bitmap1_data -bin2h nsis.ico Release-zlib\icon.h icon_data -bin2h uninst.ico Release-zlib\unicon.h unicon_data -] -Creating command line "F:\Temp\WinTemp\RSP2EC.bat" -generating include file for makenssi -Release-zlib\exehead_zlib.exe -> zlib_header_data (37888 bytes) - -bitmap1.bmp -> bitmap1_data (886 bytes) - -nsis.ico -> icon_data (766 bytes) - -uninst.ico -> unicon_data (766 bytes) -

--------------------Configuration: makenssi - Win32 Release--------------------

Command Lines

-Creating command line "rc.exe /l 0x409 /fo"Release/Script1.res" /d "NDEBUG" "C:\Program Files\NSIS\Source\Script1.rc"" -Creating temporary file "F:\Temp\WinTemp\RSP2ED.tmp" with contents +Creating temporary file "F:\Temp\WinTemp\RSP8B.tmp" with contents [ /nologo /G6 /ML /W3 /GX /O2 /Ob2 /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"Release/" /Fd"Release/" /FD /c -"C:\Program Files\NSIS\Source\zlib\deflate.c" -"C:\Program Files\NSIS\Source\zlib\trees.c" -"C:\Program Files\NSIS\Source\build.cpp" "C:\Program Files\NSIS\Source\exedata.cpp" -"C:\Program Files\NSIS\Source\makenssi.cpp" -"C:\Program Files\NSIS\Source\util.cpp" ] -Creating command line "cl.exe @F:\Temp\WinTemp\RSP2ED.tmp" -Creating temporary file "F:\Temp\WinTemp\RSP2EE.tmp" with contents -[ -/nologo /ML /W3 /GX /O2 /Ob2 /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"Release/" /Fd"Release/" /FD /c -"C:\Program Files\NSIS\Source\bzip2\blocksort.c" -"C:\Program Files\NSIS\Source\bzip2\bzlib.c" -"C:\Program Files\NSIS\Source\bzip2\compress.c" -"C:\Program Files\NSIS\Source\bzip2\huffman.c" -"C:\Program Files\NSIS\Source\crc32.c" -"C:\Program Files\NSIS\Source\DialogTemplate.cpp" -"C:\Program Files\NSIS\Source\ResourceEditor.cpp" -"C:\Program Files\NSIS\Source\tokens.cpp" -] -Creating command line "cl.exe @F:\Temp\WinTemp\RSP2EE.tmp" -Creating temporary file "F:\Temp\WinTemp\RSP2EF.tmp" with contents -[ -/nologo /ML /W3 /GX /Ot /Ow /Oy /Ob2 /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"Release/" /Fd"Release/" /FD /c -"C:\Program Files\NSIS\Source\script.cpp" -] -Creating command line "cl.exe @F:\Temp\WinTemp\RSP2EF.tmp" -Creating temporary file "F:\Temp\WinTemp\RSP2F0.tmp" with contents +Creating command line "cl.exe @F:\Temp\WinTemp\RSP8B.tmp" +Creating temporary file "F:\Temp\WinTemp\RSP8C.tmp" with contents [ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../makensis.exe" /opt:nowin98 ".\Release\deflate.obj" @@ -222,33 +32,10 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32 ".\Release\util.obj" ".\Release\Script1.res" ] -Creating command line "link.exe @F:\Temp\WinTemp\RSP2F0.tmp" +Creating command line "link.exe @F:\Temp\WinTemp\RSP8C.tmp"

Output Window

-Compiling resources... Compiling... -deflate.c -trees.c -Generating Code... -Compiling... -build.cpp exedata.cpp -makenssi.cpp -util.cpp -Generating Code... -Compiling... -blocksort.c -bzlib.c -compress.c -huffman.c -crc32.c -Generating Code... -Compiling... -DialogTemplate.cpp -ResourceEditor.cpp -tokens.cpp -Generating Code... -Compiling... -script.cpp Linking...