[ActiveLock-Development] CVS: installer ActiveLock.nsi,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/activelock/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv28318

Modified Files:
	ActiveLock.nsi 
Log Message:
Now includes ALUGEN files.

Index: ActiveLock.nsi
===================================================================
RCS file: /cvsroot/activelock/installer/ActiveLock.nsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

--- ActiveLock.nsi	15 Aug 2003 21:02:25 -0000	1.1
+++ ActiveLock.nsi	5 Oct 2003 08:46:41 -0000	1.2
@@ -6,18 +6,26 @@
 ; 08.14.03 - th2tran       - Created. Works against NSIS 1.9
 ;                          - Installs ALCrypto.dll and ActiveLock2.dll in the WinSys dir
 ;                            instead of \bin directory.
+; 10.05.03 - th2tran       - I changed my mind again, alcrypto goes to \bin directory
+;                            along with other dlls and exes.  The reason I moved it to WinSys
+;                            before was because I was thinking that the user application may
+;                            make use of it as well activelock dll.  But it's not likely.
+;                            *** IMPORTANT NOTE: alcrypto.dll MUST reside in the same directory
+;                                                as activelock2.dll.
+;                          - Added ALUGEN files
 ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !define VER_MAJOR 2
-!define VER_MINOR 0a2
+!define VER_MINOR 0.2
 !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
+OutFile ..\ActiveLock-${VER_MAJOR}.${VER_MINOR}.exe
 SetCompressor bzip2
 
 InstType "Full (w/ Source and Doc)"
@@ -41,7 +49,7 @@
   ;Modern UI Configuration
 
   !define MUI_PRODUCT "ActiveLock"
-  !define MUI_VERSION "2.0a2"
+  !define MUI_VERSION "2.0.2"
 
   !define MUI_NAME "ActiveLock ${MUI_VERSION}" ;Installer name
 
@@ -97,15 +105,23 @@
   File "${AL_SRC_ROOT}\License.txt"
   File "${AL_SRC_ROOT}\Docs\ReleaseNotes.htm"
 
-  ; Binaries go to the Windows System directory
-  SetOutPath $SYSDIR
+  ; Binary files go to "bin" directory
+  SetOutPath $INSTDIR\Bin
   SetOverwrite on
-  File ${AL_SRC_ROOT}\src\ActiveLock2.dll
-  File ${AL_SRC_ROOT}\src\ActiveLock2.chm
+  File ${AL_SRC_ROOT}\bin\activelock2.dll
+  File ${AL_SRC_ROOT}\src\activelock2.chm
   ;File ${AL_SRC_ROOT}\Examples\Example1\ALTestApp.exe
 
   ; ALCrypto.dll goes to Windows System32 directory
-  File ${AL_SRC_ROOT}\src\ALCrypto.dll
+  ;SetOutPath $SYSDIR
+  ;SetOverwrite on
+  File ${AL_SRC_ROOT}\bin\alcrypto.dll
+
+  ; ALUGEN files
+  File ${ALUGEN_ROOT}\lib\alugen.dll
+  File ${ALUGEN_ROOT}\app\alugen.exe
+  File ${ALUGEN_ROOT}\app\products.ini
+
 SectionEnd
 
 Section "Documentation" SecDoc
@@ -130,6 +146,7 @@
   File ${AL_SRC_ROOT}\Examples\Example1\atViewPort.ctx
   File ${AL_SRC_ROOT}\Examples\Example1\atDisplay.RES
   File ${AL_SRC_ROOT}\Examples\Example1\al.lic
+  File ${AL_SRC_ROOT}\Examples\Example1\ALTestApp.exe
 SectionEnd
 
 !ifndef NO_STARTMENUSHORTCUTS
@@ -157,7 +174,7 @@
      SectionIn 1
      DetailPrint "Extracting ActiveLock source code...."
      SetDetailsPrint textonly
-     SetOutPath $INSTDIR\Src
+     SetOutPath $INSTDIR\Src\ActiveLock
      File ${AL_SRC_ROOT}\src\ActiveLock2.vbp
      File ${AL_SRC_ROOT}\src\*.cls
      File ${AL_SRC_ROOT}\src\*.bas
@@ -176,18 +193,34 @@
      File ${ALCRYPTO_ROOT}\*.c
      File ${ALCRYPTO_ROOT}\*.h
    SectionEnd
+   Section "ActiveLock Universal GENerator" SecSrcALUGEN
+     SectionIn 1
+     DetailPrint "Extracting ALUGEN source code...."
+     SetDetailsPrint textonly
+     SetOutPath $INSTDIR\Src\ALUGEN\lib
+     File ${ALUGEN_ROOT}\lib\*.cls
+     File ${ALUGEN_ROOT}\lib\*.bas
+     File ${ALUGEN_ROOT}\lib\ALUGENLib.vbp
+     File ${ALUGEN_ROOT}\lib\alugen.dll
+     SetOutPath $INSTDIR\Src\ALUGEN\app
+     File ${ALUGEN_ROOT}\app\*.fr*
+     File ${ALUGEN_ROOT}\app\products.ini
+     File ${ALUGEN_ROOT}\app\ALUGEN.vbp
+   SectionEnd
 SubSectionEnd
 
 Section -post
   SetOutPath $INSTDIR
 
-  RegDLL "$SYSDIR\ActiveLock2.dll"
+  RegDLL "$INSTDIR\bin\alutil.dll"
+  RegDLL "$INSTDIR\bin\activelock2.dll"
+  RegDLL "$INSTDIR\bin\alugen.dll"
 
   WriteRegStr HKLM "SOFTWARE\${ASC}\ActiveLock2" "" $INSTDIR
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock2" "UninstallString" "$INSTDIR\uninst.exe"
   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\ActiveLock2.dll,0"
+  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}"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "VersionMajor" "${VER_MAJOR}"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock" "VersionMinor" "${VER_MINOR}"
@@ -220,9 +253,10 @@
 !insertmacro MUI_FUNCTIONS_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 to ActiveLock and all related files"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSrcAL} "Source code to ActiveLock"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSrcALCrypto} "Source code to ALCrypto"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSrc} "Source code for ActiveLock and all related files"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSrcAL} "Source code for ActiveLock"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSrcALCrypto} "Source code for ALCrypto"
+  !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
@@ -246,11 +280,13 @@
 ;Uninstaller Section
 
 Section Uninstall
-  IfFileExists $SYSDIR\ActiveLock2.dll skip_confirmation
+  IfFileExists $INSTDIR\bin\activelock2.dll skip_confirmation
     MessageBox MB_YESNO "It does not appear that ActiveLock is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)" IDYES skip_confirmation
     Abort "Uninstall aborted by user"
   skip_confirmation:
-  UnRegDLL "$SYSDIR\ActiveLock2.dll"
+  UnRegDLL "$INSTDIR\bin\alutil.dll"
+  UnRegDLL "$INSTDIR\bin\activelock2.dll"
+  UnRegDLL "$INSTDIR\bin\alugen.dll"
 
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ActiveLock"
   DeleteRegKey HKLM "SOFTWARE\${ASC}\ActiveLock2"



