From f2daaa45f46cf704a160e2faf715d7c3f5670c69 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 22 Jan 2010 14:45:02 +0100 Subject: [PATCH] Remove bat from Win64; it doesn't work; why ??? --- .../src/win32/win64_installer/winbacula.nsi | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi index be995a91b1..b2e2022d19 100644 --- a/bacula/src/win32/win64_installer/winbacula.nsi +++ b/bacula/src/win32/win64_installer/winbacula.nsi @@ -495,27 +495,27 @@ SectionEnd Section "Bat Console" SecBatConsole SectionIn 1 2 3 - SetOutPath "$INSTDIR\bin" +; SetOutPath "$INSTDIR\bin" - Call InstallCommonFiles - File "${SRC_DIR}\QtCore4.dll" - File "${SRC_DIR}\QtGui4.dll" +; Call InstallCommonFiles +; File "${SRC_DIR}\QtCore4.dll" +; File "${SRC_DIR}\QtGui4.dll" - File "${SRC_DIR}\bat.exe" +; File "${SRC_DIR}\bat.exe" - ${If} $InstallType = ${MigrateInstall} - ${AndIf} ${FileExists} "$OldInstallDir\bin\bat.conf" - CopyFiles "$OldInstallDir\bin\bat.conf" "$APPDATA\Bacula" - ${Else} - File "/oname=$PLUGINSDIR\bat.conf" "bat.conf.in" - StrCpy $0 "$APPDATA\Bacula" - StrCpy $1 bat.conf - Call ConfigEditAndCopy - ${EndIf} +; ${If} $InstallType = ${MigrateInstall} +; ${AndIf} ${FileExists} "$OldInstallDir\bin\bat.conf" +; CopyFiles "$OldInstallDir\bin\bat.conf" "$APPDATA\Bacula" +; ${Else} +; File "/oname=$PLUGINSDIR\bat.conf" "bat.conf.in" +; StrCpy $0 "$APPDATA\Bacula" +; StrCpy $1 bat.conf +; Call ConfigEditAndCopy +; ${EndIf} ; Create Start Menu entry - CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bin\bat.exe" '-c "$APPDDATA\Bacula\bat.conf"' "$INSTDIR\bin\bat.exe" 0 - CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bat.conf"' +; CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bin\bat.exe" '-c "$APPDDATA\Bacula\bat.conf"' "$INSTDIR\bin\bat.exe" 0 +; CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bat.conf"' SectionEnd @@ -561,7 +561,7 @@ 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_SecBatConsole ${LANG_ENGLISH} "Install Bat graphical console program on this system." +;LangString DESC_SecBatConsole ${LANG_ENGLISH} "Install Bat graphical console program on this system." LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration" LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration." @@ -578,7 +578,7 @@ 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 ${SecBatConsole} $(DESC_SecBatConsole) +; !InsertMacro MUI_DESCRIPTION_TEXT ${SecBatConsole} $(DESC_SecBatConsole) !InsertMacro MUI_FUNCTION_DESCRIPTION_END ; Uninstall section @@ -772,9 +772,9 @@ Function GetSelectedComponents ${If} ${SectionIsSelected} ${SecConsole} IntOp $R0 $R0 | ${ComponentTextConsole} ${EndIf} - ${If} ${SectionIsSelected} ${SecBatConsole} - IntOp $R0 $R0 | ${ComponentBatConsole} - ${EndIf} +; ${If} ${SectionIsSelected} ${SecBatConsole} +; IntOp $R0 $R0 | ${ComponentBatConsole} +; ${EndIf} Exch $R0 FunctionEnd @@ -863,14 +863,14 @@ Function SelectPreviousComponents !InsertMacro UnselectSection ${SecConsole} !InsertMacro ClearSectionFlag ${SecConsole} ${SF_RO} ${EndIf} - IntOp $R1 $PreviousComponents & ${ComponentBatConsole} - ${If} $R1 <> 0 - !InsertMacro SelectSection ${SecBatConsole} - !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_RO} - ${Else} - !InsertMacro UnselectSection ${SecBatConsole} - !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_RO} - ${EndIf} +; IntOp $R1 $PreviousComponents & ${ComponentBatConsole} +; ${If} $R1 <> 0 +; !InsertMacro SelectSection ${SecBatConsole} +; !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_RO} +; ${Else} +; !InsertMacro UnselectSection ${SecBatConsole} +; !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_RO} +; ${EndIf} ${EndIf} FunctionEnd @@ -897,12 +897,12 @@ Function UpdateComponentUI ${Else} !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD} ${EndIf} - IntOp $R1 $NewComponents & ${ComponentBatConsole} - ${If} $R1 <> 0 - !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_BOLD} - ${Else} - !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_BOLD} - ${EndIf} +; IntOp $R1 $NewComponents & ${ComponentBatConsole} +; ${If} $R1 <> 0 +; !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_BOLD} +; ${Else} +; !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_BOLD} +; ${EndIf} ${EndIf} GetDlgItem $R0 $HWNDPARENT 1 -- 2.39.5