[Com0com-cvs] com0com/NSIS install.nsi,1.9,1.10

[Vyacheslav F. <vf...@us...>]

Update of /cvsroot/com0com/com0com/NSIS
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12997

Modified Files:
	install.nsi 
Log Message:
Moved output file to target CPU directory
Disabled moving Start Menu shortcuts to all users for Vista
Fixed title truncation
Added show ReadMe checkbox
Added setupg.exe


Index: install.nsi
===================================================================
RCS file: /cvsroot/com0com/com0com/NSIS/install.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** install.nsi	15 Nov 2007 12:12:04 -0000	1.9
--- install.nsi	22 Nov 2007 11:36:41 -0000	1.10
***************
*** 20,23 ****
--- 20,30 ----
   *
   * $Log$
+  * Revision 1.10  2007/11/22 11:36:41  vfrolov
+  * Moved output file to target CPU directory
+  * Disabled moving Start Menu shortcuts to all users for Vista
+  * Fixed title truncation
+  * Added show ReadMe checkbox
+  * Added setupg.exe
+  *
   * Revision 1.9  2007/11/15 12:12:04  vfrolov
   * Removed Function LaunchSetupCommandPrompt
***************
*** 117,121 ****
  
  ; The file to write
! OutFile "setup.exe"
  
  ; The default installation directory
--- 124,128 ----
  
  ; The file to write
! OutFile "..\${TARGET_CPU}\setup.exe"
  
  ; The default installation directory
***************
*** 126,129 ****
--- 133,139 ----
  InstallDirRegKey HKLM "Software\com0com" "Install_Dir"
  
+ ;Vista redirects $SMPROGRAMS to all users without this
+ RequestExecutionLevel admin
+ 
  ShowInstDetails show
  ShowUninstDetails show
***************
*** 132,137 ****
--- 142,154 ----
  ; Pages
  
+   !define MUI_WELCOMEPAGE_TITLE_3LINES
+   !define MUI_FINISHPAGE_TITLE_3LINES
+ 
    !define MUI_FINISHPAGE_RUN setupc.exe
    !define MUI_FINISHPAGE_RUN_TEXT "Launch Setup Command Prompt"
+   !define MUI_FINISHPAGE_RUN_NOTCHECKED
+ 
+   !define MUI_FINISHPAGE_SHOWREADME ReadMe.txt
+   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
  
    !define MUI_FINISHPAGE_LINK "Visit com0com homepage"
***************
*** 139,143 ****
  
    !define MUI_FINISHPAGE_NOAUTOCLOSE
-   !define MUI_UNFINISHPAGE_NOAUTOCLOSE
  
    !insertmacro MUI_PAGE_WELCOME
--- 156,159 ----
***************
*** 147,150 ****
--- 163,170 ----
    !insertmacro MUI_PAGE_FINISH
  
+   !define MUI_WELCOMEPAGE_TITLE_3LINES
+   !define MUI_FINISHPAGE_TITLE_3LINES
+   !define MUI_UNFINISHPAGE_NOAUTOCLOSE
+ 
    !insertmacro MUI_UNPAGE_WELCOME
    !insertmacro MUI_UNPAGE_CONFIRM
***************
*** 153,157 ****
  
  ;--------------------------------
! ;Languages
  
    !insertmacro MUI_LANGUAGE "English"
--- 173,177 ----
  
  ;--------------------------------
! ; Languages
  
    !insertmacro MUI_LANGUAGE "English"
***************
*** 172,175 ****
--- 192,196 ----
    File "..\${TARGET_CPU}\setup.dll"
    File "..\${TARGET_CPU}\setupc.exe"
+   File "..\setupg\Release\setupg.exe"
  
    ; Write the installation path into the registry
***************
*** 196,199 ****
--- 217,221 ----
    CreateDirectory "$SMPROGRAMS\com0com"
    CreateShortCut "$SMPROGRAMS\com0com\Setup Command Prompt.lnk" "$INSTDIR\setupc.exe"
+   CreateShortCut "$SMPROGRAMS\com0com\Setup.lnk" "$INSTDIR\setupg.exe"
    CreateShortCut "$SMPROGRAMS\com0com\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
    CreateShortCut "$SMPROGRAMS\com0com\ReadMe.lnk" "$INSTDIR\ReadMe.txt"
***************
*** 234,237 ****
--- 256,260 ----
    Delete $INSTDIR\setup.dll
    Delete $INSTDIR\setupc.exe
+   Delete $INSTDIR\setupg.exe
    Delete $INSTDIR\uninstall.exe