Update installer

diff --git a/bacula/src/win32/win64_installer/InstallType.ini b/bacula/src/win32/win64_installer/InstallType.ini
index 62c88cf6da423ab47b950797cdc87494c557aa21..562d5d9a59abff6cd49259372a9840c13714ed3f 100644 (file)
--- a/bacula/src/win32/win64_installer/InstallType.ini
+++ b/bacula/src/win32/win64_installer/InstallType.ini
@@ -1,51 +1,51 @@
-[Settings]\r
-NumFields=6\r
-\r
-[Field 1]\r
-Type=Label\r
-Text=This is a new installation.  Please choose the installation type.\r
-Left=0\r
-Right=300\r
-Top=0\r
-Bottom=28\r
-\r
-[Field 2]\r
-Type=GroupBox\r
-Text=Installation Type\r
-Left=0\r
-Right=300\r
-Top=32\r
-Bottom=136\r
-\r
-[Field 3]\r
-Type=RadioButton\r
-Text=Automatic\r
-State=1\r
-Left=6\r
-Right=52\r
-Top=44\r
-Bottom=54\r
-\r
-[Field 4]\r
-Type=RadioButton\r
-Text=Custom\r
-Left=6\r
-Right=44\r
-Top=90\r
-Bottom=100\r
-\r
-[Field 5]\r
-Type=Label\r
-Text=The software will be installed in the default directory "Program Files\\Bacula".  The configuration files will be generated using defaults applicable to most installations.\r
-Left=17\r
-Right=295\r
-Top=58\r
-Bottom=86\r
-\r
-[Field 6]\r
-Type=Label\r
-Text=You may choose the installation directory.  The configuration defaults will be displayed and you will be given the chance to make changes before the configuration files are written.\r
-Left=17\r
-Right=295\r
-Top=104\r
-Bottom=132\r
+[Settings]
+NumFields=6
+
+[Field 1]
+Type=Label
+Text=This is a new installation.  Please choose the installation type.
+Left=0
+Right=300
+Top=0
+Bottom=28
+
+[Field 2]
+Type=GroupBox
+Text=Installation Type
+Left=0
+Right=300
+Top=32
+Bottom=136
+
+[Field 3]
+Type=RadioButton
+Text=Automatic
+State=1
+Left=6
+Right=52
+Top=44
+Bottom=54
+
+[Field 4]
+Type=RadioButton
+Text=Custom (not recommended)
+Left=6
+Right=252
+Top=90
+Bottom=100
+
+[Field 5]
+Type=Label
+Text=The software will be installed in the default directory "Program Files\\Bacula".  The configuration files will be generated using defaults applicable to most installations.
+Left=17
+Right=295
+Top=58
+Bottom=86
+
+[Field 6]
+Type=Label
+Text=You have more options, but you will have to manually edit your bacula-fd.conf file before Bacula will work.
+Left=17
+Right=295
+Top=104
+Bottom=132

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index 382d352162174a91081e82387c494cb68c38e885..05cd5b7f16271a90b04d42596b76dd6ca4921b7b 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -37,8 +37,8 @@
 ;
 ; Kern Sibbald April 2009
 ; Correct some Win64 install problems
-;
-; Version $Id: winbacula.nsi 7074 2008-05-31 18:43:21Z kerns $
+; It is mind boggling how many lines of this insane scripting language
+;   have been written with absolutely no comments
 ;
 ; Command line options:
 ;
@@ -268,6 +268,7 @@ Function .onInit
   StrCpy $ConfigMonitorName              "$HostName-mon"
   ;StrCpy $ConfigMonitorPassword
 
+; PLUGINSDIR refers to temporary helper programs and not Bacula plugins!
   InitPluginsDir
   File "/oname=$PLUGINSDIR\openssl.exe"  "${SRC_DIR}\openssl.exe"
   File "/oname=$PLUGINSDIR\ssleay32-0.9.8.dll" "${SRC_DIR}\ssleay32-0.9.8.dll"
@@ -281,6 +282,7 @@ Function .onInit
 
   SetPluginUnload alwaysoff
 
+; Set client password
   nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
   pop $R0
   ${If} $R0 = 0
@@ -293,6 +295,7 @@ Function .onInit
 
   SetPluginUnload manual
 
+; Set monitor password
   nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
   pop $R0
   ${If} $R0 = 0
@@ -373,6 +376,7 @@ Section "-Initialize"
   File "..\..\..\LICENSE"
   Delete /REBOOTOK "$INSTDIR\License.txt"
 
+; Output a series of SED commands to configure the .conf file(s)
   FileOpen $R1 $PLUGINSDIR\config.sed w
   FileWrite $R1 "s;@VERSION@;${VERSION};g$\r$\n"
   FileWrite $R1 "s;@DATE@;${__DATE__};g$\r$\n"
@@ -453,11 +457,11 @@ Section "File Service" SecFileDaemon
 
   File "${SRC_DIR}\bacula-fd.exe"
 
-    File "/oname=$PLUGINSDIR\bacula-fd.conf" "bacula-fd.conf.in"
+  File "/oname=$PLUGINSDIR\bacula-fd.conf" "bacula-fd.conf.in"
 
-    StrCpy $0 "$INSTDIR"
-    StrCpy $1 bacula-fd.conf
-    Call ConfigEditAndCopy
+  StrCpy $0 "$INSTDIR"
+  StrCpy $1 bacula-fd.conf
+  Call ConfigEditAndCopy
 
   StrCpy $0 bacula-fd
   StrCpy $1 "File Service"
@@ -486,27 +490,12 @@ Section "Command Console" SecConsole
 
 SectionEnd
 
+; Essentially deleted because wxconsole is not implemented on Win64
 Section "Graphical Console" SecWxConsole
   SectionIn 1 2 3
   
   SetOutPath "$INSTDIR"
 
-;  Call InstallCommonFiles
-;!if "${BUILD_TOOLS}" == "MinGW64"
-;  File "${SRC_DIR}\wxbase28_gcc_bacula.dll"
-;  File "${SRC_DIR}\wxmsw28_core_gcc_bacula.dll"
-;!endif
-
-;  File "${SRC_DIR}\bwx-console.exe"
-
-;    File "/oname=$PLUGINSDIR\bwx-console.conf" "bwx-console.conf.in"
-;    StrCpy $0 "$INSTDIR"
-;    StrCpy $1 bwx-console.conf
-;    Call ConfigEditAndCopy
-
-  ; Create Start Menu entry
-;  CreateShortCut "$SMPROGRAMS\Bacula\bwx-console.lnk" "$INSTDIR\bwx-console.exe" '-c "$INSTDIR\bwx-console.conf"' "$INSTDIR\bwx-console.exe" 0
-;  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$INSTDIR\bwx-console.conf"'
 SectionEnd
 
 SectionGroupEnd
@@ -543,9 +532,6 @@ SectionEnd
 
 LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
 LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."
-;LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."
-;LangString DESC_SecDocPdf ${LANG_ENGLISH} "Install documentation in Acrobat format on this system."
-;LangString DESC_SecDocHtml ${LANG_ENGLISH} "Install documentation in HTML format on this system."
 
 LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
 LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
@@ -562,9 +548,6 @@ LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create a resource template f
 !InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
-;  !InsertMacro MUI_DESCRIPTION_TEXT ${SecWxConsole} $(DESC_SecWxConsole)
-;  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocPdf} $(DESC_SecDocPdf)
-;  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocHtml} $(DESC_SecDocHtml)
 !InsertMacro MUI_FUNCTION_DESCRIPTION_END
 
 ; Uninstall section
@@ -758,15 +741,6 @@ Function GetSelectedComponents
   ${If} ${SectionIsSelected} ${SecConsole}
     IntOp $R0 $R0 | ${ComponentTextConsole}
   ${EndIf}
-;  ${If} ${SectionIsSelected} ${SecWxConsole}
-;    IntOp $R0 $R0 | ${ComponentGUIConsole}
-;  ${EndIf}
-;  ${If} ${SectionIsSelected} ${SecDocPdf}
-;    IntOp $R0 $R0 | ${ComponentPDFDocs}
-;  ${EndIf}
-;  ${If} ${SectionIsSelected} ${SecDocHtml}
-;    IntOp $R0 $R0 | ${ComponentHTMLDocs}
-;  ${EndIf}
   Exch $R0
 FunctionEnd
 
@@ -815,7 +789,6 @@ Function EnterWriteTemplates
     WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 1
     DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags
     WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State "C:\$ConfigClientName.conf"
-;    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST
   ${EndIf}
 
 
@@ -856,30 +829,6 @@ Function SelectPreviousComponents
       !InsertMacro UnselectSection ${SecConsole}
       !InsertMacro ClearSectionFlag ${SecConsole} ${SF_RO}
     ${EndIf}
-;    IntOp $R1 $PreviousComponents & ${ComponentGUIConsole}
-;    ${If} $R1 <> 0
-;      !InsertMacro SelectSection ${SecWxConsole}
-;      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_RO}
-;    ${Else}
-;      !InsertMacro UnselectSection ${SecWxConsole}
-;      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_RO}
-;    ${EndIf}
-;    IntOp $R1 $PreviousComponents & ${ComponentPDFDocs}
-;    ${If} $R1 <> 0
-;      !InsertMacro SelectSection ${SecDocPdf}
-;      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_RO}
-;    ${Else}
-;      !InsertMacro UnselectSection ${SecDocPdf}
-;      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_RO}
-;    ${EndIf}
-;    IntOp $R1 $PreviousComponents & ${ComponentHTMLDocs}
-;    ${If} $R1 <> 0
-;      !InsertMacro SelectSection ${SecDocHtml}
-;      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_RO}
-;    ${Else}
-;      !InsertMacro UnselectSection ${SecDocHtml}
-;      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_RO}
-;    ${EndIf}
   ${EndIf}
 FunctionEnd
 
@@ -906,24 +855,6 @@ Function UpdateComponentUI
     ${Else}
       !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD}
     ${EndIf}
-;    IntOp $R1 $NewComponents & ${ComponentGUIConsole}
-;    ${If} $R1 <> 0
-;      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_BOLD}
-;    ${Else}
-;      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_BOLD}
-;    ${EndIf}
-;    IntOp $R1 $NewComponents & ${ComponentPDFDocs}
-;    ${If} $R1 <> 0
-;      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_BOLD}
-;    ${Else}
-;      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_BOLD}
-;    ${EndIf}
-;    IntOp $R1 $NewComponents & ${ComponentHTMLDocs}
-;    ${If} $R1 <> 0
-;      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_BOLD}
-;    ${Else}
-;      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_BOLD}
-;    ${EndIf}
   ${EndIf}
 
   GetDlgItem $R0 $HWNDPARENT 1