installer: squash all warnings (except of one that comes later); remove unused code

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39496 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/gui/external.nsh b/development/Win32/packaging/installer/gui/external.nsh
index 16f609ddc30342dd589994231180cd3dd52c440b..003a582aab7081bea232237c8c81120fe72347b2 100644 (file)
--- a/development/Win32/packaging/installer/gui/external.nsh
+++ b/development/Win32/packaging/installer/gui/external.nsh
@@ -8,27 +8,27 @@ downloaded or installed (depending on the type of installer)
 
 */
 
-Var ExternalPage
-Var ExternalPage.Info
-Var ExternalPage.Setup
-Var ExternalPage.Existing
-Var ExternalPage.Folder
-Var ExternalPage.Folder.Text
-Var ExternalPage.Folder.Return
-Var ExternalPage.FolderBrowse
-Var ExternalPage.FolderInfo
-Var ExternalPage.NoInstall
-
-Var ExternalPage.RadioButton.Click
-Var ExternalPage.FolderBrowse.Click
-
-Var LaTeXState
-Var LaTeXSetup.State
-Var LaTeXExisting.State
-Var LaTeXNoInstall.State
-
-Var ControlState
-Var ComponentSize
+#Var ExternalPage
+#Var ExternalPage.Info
+#Var ExternalPage.Setup
+#Var ExternalPage.Existing
+#Var ExternalPage.Folder
+#Var ExternalPage.Folder.Text
+#Var ExternalPage.Folder.Return
+#Var ExternalPage.FolderBrowse
+#Var ExternalPage.FolderInfo
+#Var ExternalPage.NoInstall
+
+#Var ExternalPage.RadioButton.Click
+#Var ExternalPage.FolderBrowse.Click
+
+#Var LaTeXState
+#Var LaTeXSetup.State
+#Var LaTeXExisting.State
+#Var LaTeXNoInstall.State
+
+#Var ControlState
+#Var ComponentSize
 
 !macro EXTERNAL_SHOWDIALOG COMPONENT
 
@@ -36,8 +36,8 @@ Var ComponentSize
 
   !insertmacro MUI_HEADER_TEXT $(TEXT_EXTERNAL_${COMPONENT}_TITLE) $(TEXT_EXTERNAL_${COMPONENT}_SUBTITLE)
   
-  GetFunctionAddress $ExternalPage.RadioButton.Click ExternalRadioButtonClick
-  GetFunctionAddress $ExternalPage.FolderBrowse.Click ExternalFolderBrowseClick
+#  GetFunctionAddress $ExternalPage.RadioButton.Click ExternalRadioButtonClick
+#  GetFunctionAddress $ExternalPage.FolderBrowse.Click ExternalFolderBrowseClick
 
   nsDialogs::Create /NOUNLOAD 1018
   Pop $ExternalPage
@@ -104,7 +104,7 @@ Var ComponentSize
     ${NSD_SetState} $ExternalPage.NoInstall $${COMPONENT}NoInstall.State
   ${EndIf}
   
-  Call ExternalRadioButtonClick
+  #Call ExternalRadioButtonClick
   
   nsDialogs::Show
 
@@ -163,43 +163,43 @@ Var ComponentSize
   
 !macroend
 
-Function ExternalRadioButtonClick
+#Function ExternalRadioButtonClick
 
   # Enable the folder selection controls depending
   # if the option to use an existing installation is selected
 
-  ${NSD_GetState} $ExternalPage.Existing $ControlState
+#  ${NSD_GetState} $ExternalPage.Existing $ControlState
   
-  ${If} $ControlState = ${BST_CHECKED}
-    EnableWindow $ExternalPage.Folder 1
-    EnableWindow $ExternalPage.FolderBrowse 1
-    EnableWindow $ExternalPage.FolderInfo 1
-  ${Else}
-    EnableWindow $ExternalPage.Folder 0
-    EnableWindow $ExternalPage.FolderBrowse 0
-    EnableWindow $ExternalPage.FolderInfo 0
-  ${EndIf}
+#  ${If} $ControlState = ${BST_CHECKED}
+#    EnableWindow $ExternalPage.Folder 1
+#    EnableWindow $ExternalPage.FolderBrowse 1
+#    EnableWindow $ExternalPage.FolderInfo 1
+#  ${Else}
+#    EnableWindow $ExternalPage.Folder 0
+#    EnableWindow $ExternalPage.FolderBrowse 0
+#    EnableWindow $ExternalPage.FolderInfo 0
+#  ${EndIf}
 
-FunctionEnd
+#FunctionEnd
 
-Function ExternalFolderBrowseClick
+#Function ExternalFolderBrowseClick
 
   # Browse button clicked
   
   # Get current folder to set as default
-  ${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text
+#  ${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text
   
   # Browse for new folder
-  nsDialogs::SelectFolderDialog /NOUNLOAD "" $ExternalPage.Folder.Text
-  Pop $ExternalPage.Folder.Return
+#  nsDialogs::SelectFolderDialog /NOUNLOAD "" $ExternalPage.Folder.Text
+#  Pop $ExternalPage.Folder.Return
   
-  ${If} $ExternalPage.Folder.Return != error
-    StrCpy $ExternalPage.Folder.Text $ExternalPage.Folder.Return
-  ${EndIf}
+#  ${If} $ExternalPage.Folder.Return != error
+#    StrCpy $ExternalPage.Folder.Text $ExternalPage.Folder.Return
+#  ${EndIf}
   
-  ${NSD_SetText} $ExternalPage.Folder $ExternalPage.Folder.Text
+#  ${NSD_SetText} $ExternalPage.Folder $ExternalPage.Folder.Text
 
-FunctionEnd
+#FunctionEnd
 
 # Page functions
 

diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh
index 9cfaddb726e79e604db1c54cf75ed77a74801b27..6fbbbc8e6bf71c2269111b4651506fdec63ce9ab 100644 (file)
--- a/development/Win32/packaging/installer/include/LyXUtils.nsh
+++ b/development/Win32/packaging/installer/include/LyXUtils.nsh
@@ -134,63 +134,6 @@ FunctionEnd
 
 #--------------------------------
 
-Function GetParentA
- # deletes a subfolder of the APPDATA path for all users
- # used by the function "un.getUsers"
-
-  Exch $R0
-  Push $R1
-  Push $R2
-  Push $R3
-  StrCpy $R1 0
-  StrLen $R2 $R0
-  loop:
-   IntOp $R1 $R1 + 1
-   IntCmp $R1 $R2 get 0 get
-   StrCpy $R3 $R0 1 -$R1
-   StrCmp $R3 "\" get
-  Goto loop
-  get:
-   StrCpy $R0 $R0 -$R1
-   Pop $R3
-   Pop $R2
-   Pop $R1
-   Exch $R0
-   
-FunctionEnd
-
-#--------------------------------
-
-Function GetUsers
- # reads the subfolders of the "Documents and Settings" folder to get a list of the users
-
-  StrCpy $R3 ""
-  Push "$PROFILE"
-  Call GetParentA  
-  Pop $R2
-  StrCpy $R2 "$R2"
-  FindFirst $R0 $R1 "$R2\*"
-  StrCmp $R1 "" findend 0
-  findloop:
-   IfFileExists "$R2\$R1\*.*" 0 notDir
-   StrCmp $R1 "." notDir
-   StrCmp $R1 ".." notDir
-   StrCmp $R1 "All Users" notDir
-   StrCmp $R1 "Default User" notDir
-   StrCmp $R1 "All Users.WINNT" notDir
-   StrCmp $R1 "Default User.WINNT" notDir  
-  StrCpy $R3 "$R3|$R1"
-  notDir:
-   FindNext $R0 $R1
-   StrCmp $R1 "" findend 0
-  Goto findloop
-  findend:
-   FindClose $R0
-  
-FunctionEnd
-
-#--------------------------------
-
 Function un.GetParentA
  # deletes a subfolder of the APPDATA path for all users
  # used by the function "un.getUsers"

diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index 97a6075f605fb312b40259ecdc7cbde1d47804a1..d467f128a01aaa75d3d9f54728b369479022eca1 100644 (file)
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -10,8 +10,8 @@ Var PathLaTeX
 Var PathLaTeXLocal
 Var PathBibTeXEditor
 
-Var SetupLaTeX
-Var SizeLaTeX
+#Var SetupLaTeX
+#Var SizeLaTeX
 
 Var Acrobat
 Var APPDATemp