From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 21 Mar 2022 14:04:47 +0000 (+0100)
Subject: win32: Do not include PDF in windows installer
X-Git-Tag: Release-11.3.2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b6dd5373ffa039c43ad3eaf197cced6959c27a8;p=thirdparty%2Fbacula.git

win32: Do not include PDF in windows installer
---

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 4938ecd0c..135fb04d6 100644
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -97,9 +97,9 @@ LICENSE_FILES := \
 
 .PHONY: all clean installer distclean
 
-all:	      $(HELP) docs $(INSTALL_EXE) $(EXTRA)
+all:	      $(HELP) $(INSTALL_EXE) $(EXTRA)
 
-installer:    $(HELP) docs $(INSTALL_EXE)
+installer:    $(HELP) $(INSTALL_EXE)
 
 distclean: clean
 
@@ -113,19 +113,6 @@ help:
 	mkdir -p release32/help
 	cp -f $(BINDIR)/help/* release32/help/
 
-docs:
-	rm -rf release32/docs
-	mkdir -p release32/docs/manuals/en/console
-	mkdir -p release32/docs/manuals/en/main
-	mkdir -p release32/docs/manuals/en/misc
-	mkdir -p release32/docs/manuals/en/problems
-	mkdir -p release32/docs/manuals/en/utility
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/console/console.pdf release32/docs/manuals/en/console/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/main/main.pdf release32/docs/manuals/en/main/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/misc/misc.pdf release32/docs/manuals/en/misc/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/problems/problems.pdf release32/docs/manuals/en/problems/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/utility/utility.pdf release32/docs/manuals/en/utility/
-
 #
 # Rules
 #
diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 71985fa5e..c4ce2f8b3 100644
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -1149,9 +1149,6 @@ Function GetSelectedComponents
   ${If} ${SectionIsSelected} ${SecOldExchangePlugin}
     IntOp $R0 $R0 | ${ComponentOldExchangePlugin}
   ${EndIf}
-  ${If} ${SectionIsSelected} ${SecDocPdf}
-    IntOp $R0 $R0 | ${ComponentPDFDocs}
-  ${EndIf}
   Exch $R0
 FunctionEnd
 
@@ -1315,14 +1312,6 @@ Function SelectPreviousComponents
       !InsertMacro UnselectSection ${SecOldExchangePlugin}
       !InsertMacro ClearSectionFlag ${SecOldExchangePlugin} ${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}
   ${EndIf}
 FunctionEnd
 
@@ -1379,12 +1368,6 @@ Function UpdateComponentUI
     ${Else}
       !InsertMacro ClearSectionFlag ${SecOldExchangePlugin} ${SF_BOLD}
     ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentPDFDocs}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_BOLD}
-    ${EndIf}
   ${EndIf}
 
   GetDlgItem $R0 $HWNDPARENT 1
diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index a5174166f..9a86e2fe6 100644
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -127,9 +127,9 @@ EXTRA=
 
 .PHONY: all clean installer distclean
 
-all:		$(HELP) docs $(INSTALL_EXE) $(EXTRA)
+all:		$(HELP) $(INSTALL_EXE) $(EXTRA)
 
-installer:	$(HELP) docs $(INSTALL_EXE)
+installer:	$(HELP) $(INSTALL_EXE)
 
 distclean: clean
 
@@ -143,18 +143,6 @@ help:
 	mkdir -p release64/help
 	cp -f $(BINDIR)/help/* release64/help/
 
-docs:
-	rm -rf release64/docs
-	mkdir -p release64/docs/manuals/en/console
-	mkdir -p release64/docs/manuals/en/main
-	mkdir -p release64/docs/manuals/en/misc
-	mkdir -p release64/docs/manuals/en/problems
-	mkdir -p release64/docs/manuals/en/utility
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/console/console.pdf release64/docs/manuals/en/console/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/main/main.pdf release64/docs/manuals/en/main/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/misc/misc.pdf release64/docs/manuals/en/misc/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/problems/problems.pdf release64/docs/manuals/en/problems/
-	cp -f $(DOCDIR)/docs/manuals/en/pdf-and-html/utility/utility.pdf release64/docs/manuals/en/utility/
 
 #
 # Rules