[ActiveLock-Development] CVS: installer ActiveLock.nsi,1.5,1.6
Brought to you by:
ialkan
From: Thanh H. T. <th...@us...> - 2004-04-18 02:05:48
|
Update of /cvsroot/activelock/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30582 Modified Files: ActiveLock.nsi Log Message: Batch commit for 2.0.5--see individual module change logs for details Index: ActiveLock.nsi =================================================================== RCS file: /cvsroot/activelock/installer/ActiveLock.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ActiveLock.nsi 13 Oct 2003 09:03:27 -0000 1.5 +++ ActiveLock.nsi 18 Apr 2004 02:05:39 -0000 1.6 @@ -21,21 +21,32 @@ ; ALTestApp.exe, which doesn't sound too bad since they all reside in the ; bin directory, but will cause you pains when you start debugging. ; 10.11.03 - th2tran - Included alutil in the source code section. +; 04.03.04 - th2tran - Changes to work against NSIS 2.0 +; 04.10.04 - th2tran - alcrypto.dll now goes in Windows System directory. +; - included stdafx.cpp in alcrypto source distribution. +; 04.17.04 - th2tran - included MFC sample app ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;-------------------------------- +;General + !define VER_MAJOR 2 -!define VER_MINOR 0.3 +!define VER_MINOR 0.5 +!define VER ${VER_MAJOR}.${VER_MINOR} !define ALUTIL_SRC_ROOT "..\alutil" !define AL_SRC_ROOT "..\activelock" !define ALCRYPTO_ROOT "..\alcrypto" !define ALUGEN_ROOT "..\alugen" !define ASC "ActiveLock Software Group" + ;-------------------------------- ;Configuration - -OutFile ..\ActiveLock-${VER_MAJOR}.${VER_MINOR}.exe SetCompressor bzip2 +Name "ActiveLock ${VER_MAJOR}.${VER_MINOR}" +Icon "${AL_SRC_ROOT}\src\res\activelock.ico" +OutFile ..\ActiveLock-${VER_MAJOR}.${VER_MINOR}.exe InstType "Full (w/ Source and Doc)" InstType "Normal (w/ Doc, w/o Source)" @@ -49,57 +60,52 @@ InstallDirRegKey HKLM "SOFTWARE\${ASC}" "" ;-------------------------------- -!ifndef CLASSIC_UI +;Include Modern UI Macro's +!include "MUI.nsh" - ;Include Modern UI Macro's - !include "${NSISDIR}\Contrib\Modern UI\System.nsh" +;-------------------------------- +;Modern UI Configuration - ;-------------------------------- - ;Modern UI Configuration +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReleaseNotes.htm" +!define MUI_FINISHPAGE_NOREBOOTSUPPORT - !define MUI_PRODUCT "ActiveLock" - !define MUI_VERSION "2.0.3" +!define MUI_HEADERIMAGE "${NSISDIR}\Contrib\Graphics\Header\win.bmp" +!define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico" - !define MUI_NAME "ActiveLock ${MUI_VERSION}" ;Installer name - !define MUI_WELCOMEPAGE - !define MUI_LICENSEPAGE - !define MUI_COMPONENTSPAGE - !define MUI_COMPONENTSPAGE_SMALLDESC - !define MUI_DIRECTORYPAGE - !define MUI_FINISHPAGE - !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReleaseNotes.htm" - !define MUI_FINISHPAGE_NOREBOOTSUPPORT +;-------------------------------- +;Interface Settings !define MUI_ABORTWARNING - !define MUI_UNINSTALLER - !define MUI_UNCONFIRMPAGE - - !define MUI_HEADERBITMAP "${NSISDIR}\Contrib\Icons\modern-header.bmp" - !define MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Icons\modern-wizard nsis llama.bmp" - - ;-------------------------------- - ;Languages - - !define MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of ActiveLock, a free and open-source software licensing tool.\r\n\r\n\r\n" +;-------------------------------- +;Pages - !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_PAGE_WELCOME + !insertmacro MUI_PAGE_LICENSE "${AL_SRC_ROOT}\License.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH - ;-------------------------------- - ;Reserve Files +; !insertmacro MUI_HEADERBITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp" +; !insertmacro MUI_SPECIALBITMAP "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico" + + !insertmacro MUI_UNPAGE_WELCOME + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES + !insertmacro MUI_UNPAGE_FINISH - !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - !insertmacro MUI_RESERVEFILE_SPECIALINI - !insertmacro MUI_RESERVEFILE_SPECIALBITMAP +;-------------------------------- +;Languages +!insertmacro MUI_LANGUAGE "English" +!define MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of ActiveLock, a free and open-source software licensing tool.\r\n\r\n\r\n" -!endif ;-------------------------------- ;Data ;LicenseData ${AL_SRC_ROOT}\License.txt -LicenseData ${AL_SRC_ROOT}\License.txt ;-------------------------------- ;Installer Sections @@ -122,8 +128,8 @@ File ${AL_SRC_ROOT}\bin\activelock2.chm ;File ${AL_SRC_ROOT}\Examples\Example1\ALTestApp.exe - ; ALCrypto.dll goes to Windows directory - SetOutPath $WINDIR + ; ALCrypto.dll goes to Windows System directory + SetOutPath $SYSDIR SetOverwrite on File ${AL_SRC_ROOT}\bin\alcrypto.dll @@ -148,7 +154,7 @@ ; Required files by the examples ;File ${AL_SRC_ROOT}\src\modActiveLock.bas -- don't need this anymore - SetOutPath $INSTDIR\Examples\Example1 + SetOutPath $INSTDIR\Examples\VB File ${AL_SRC_ROOT}\Examples\Example1\ALTestApp.vbp File ${AL_SRC_ROOT}\Examples\Example1\frmMain.frm File ${AL_SRC_ROOT}\Examples\Example1\frmMain.frx @@ -158,6 +164,16 @@ File ${AL_SRC_ROOT}\Examples\Example1\atDisplay.RES File ${AL_SRC_ROOT}\Examples\Example1\al.lic File ${AL_SRC_ROOT}\Examples\Example1\ALTestApp.exe + + SetOutPath $INSTDIR\Examples\MFC + File ${AL_SRC_ROOT}\Examples\MFC\*.h + File ${AL_SRC_ROOT}\Examples\MFC\*.cpp + File ${AL_SRC_ROOT}\Examples\MFC\*.txt + File ${AL_SRC_ROOT}\Examples\MFC\*.rc + File ${AL_SRC_ROOT}\Examples\MFC\*.dsp + File ${AL_SRC_ROOT}\Examples\MFC\*.dsw + File ${AL_SRC_ROOT}\Examples\MFC\*.reg + File ${AL_SRC_ROOT}\Examples\MFC\*.odl SectionEnd !ifndef NO_STARTMENUSHORTCUTS @@ -212,6 +228,7 @@ File ${ALCRYPTO_ROOT}\ALCrypto.dsw File ${ALCRYPTO_ROOT}\Version.rc File ${ALCRYPTO_ROOT}\*.c + File ${ALCRYPTO_ROOT}\*.cpp File ${ALCRYPTO_ROOT}\*.h SectionEnd Section "ActiveLock Universal GENerator" SecSrcALUGEN @@ -242,7 +259,7 @@ WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock2" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "DisplayName" "ActiveLock Licensing System" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "DisplayIcon" "$INSTDIR\bin\activelock2.dll,0" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "DisplayVersion" "${MUI_VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "DisplayVersion" "${VER}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "VersionMajor" "${VER_MAJOR}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "VersionMinor" "${VER_MINOR}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "NoModify" "1" @@ -271,7 +288,7 @@ !ifndef CLASSIC_UI -!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core files required to use ActiveLock" !insertmacro MUI_DESCRIPTION_TEXT ${SecExample} "Example applications that show you how to use ActiveLock" !insertmacro MUI_DESCRIPTION_TEXT ${SecSrc} "Source code for ActiveLock and all related files" @@ -281,7 +298,7 @@ !insertmacro MUI_DESCRIPTION_TEXT ${SecSrcALUGEN} "Source code for ALUGEN" !insertmacro MUI_DESCRIPTION_TEXT ${SecDoc} "ActiveLock Documentation (API docs, Usage Guide, etc..)" !insertmacro MUI_DESCRIPTION_TEXT ${SecIcons} "Creates Start Menu shortcuts." -!insertmacro MUI_FUNCTIONS_DESCRIPTION_END +!insertmacro MUI_FUNCTION_DESCRIPTION_END !endif @@ -322,8 +339,4 @@ RMDir /r $INSTDIR\Src RMDir /r $INSTDIR RMDir "$PROGRAMFILES\${ASC}" - !ifndef CLASSIC_UI - ;Modern UI Finish Header - !insertmacro MUI_UNFINISHHEADER - !endif SectionEnd \ No newline at end of file |