Separate 32 bit bat on Win64 release

diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index 0823664c208eb94fb4df5808399cbf68669688d7..608e7147597b4a71188a94fc0e4c451aba1f265f 100644 (file)
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -159,6 +159,12 @@ $(INSTALL_EXE): winbacula.nsi $(addprefix release64/,$(BACULA_BINARIES) $(DEPKGS
        cp -f ../release32/bat.exe release64
        cp -f ../release32/QtCore4.dll release64
        cp -f ../release32/QtGui4.dll release64
+       cp -f ../win32_installer/release32/mingwm10.dll release64
+       cp -f ../win32_installer/release32/ssleay32.dll release64
+       cp -f ../win32_installer/release32/libeay32.dll release64
+       cp -f ../win32_installer/release32/zlib1.dll release64/zlib132.dll
+       cp -f ../release32/bacula.dll release64/bacula32.dll
+       cp -f ../win32_installer/release32/pthreadGCE.dll release64/pthreadGCE32.dll
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
 

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index d456b7a2a80cc7a3b8d142f7bb228ad383ed075c..f89cd47b22648badf63bca042311f514ce2abdb4 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -337,7 +337,6 @@ Function InstallCommonFiles
     File "${SRC_DIR}\zlib1.dll"
 !endif
     File "${SRC_DIR}\bacula.dll"
-
     File "/oname=$INSTDIR\openssl.cnf" "${SRC_DIR}\openssl.cnf"
     File "${SRC_DIR}\openssl.exe"
     File "${SRC_DIR}\bsleep.exe"
@@ -398,10 +397,10 @@ Section "-Initialize"
   ${StrRep} $R2 "$INSTDIR\working" "\" "\\"
   FileWrite $R1 's;@working_dir_cmd@;$R2;g$\r$\n'
 
-; ${StrRep} $R2 "$INSTDIR" "\" "\\\\"
-; FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'
-; ${StrRep} $R2 "$INSTDIR" "\" "\\"
-; FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
+  ${StrRep} $R2 "$INSTDIR" "\" "\\\\"
+  FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'
+  ${StrRep} $R2 "$INSTDIR" "\" "\\"
+  FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
 
   ${StrRep} $R2 "$INSTDIR\plugins" "\" "\\\\"
   FileWrite $R1 's;@fdplugins_dir@;$R2;g$\r$\n'
@@ -499,33 +498,30 @@ SectionEnd
 Section "Bat Console" SecBatConsole
   SectionIn 1 2 3
 
-  SetOutPath "$INSTDIR"
+  SetOutPath "$INSTDIR\bin32"
 
   Call InstallCommonFiles
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
-
+  File "${SRC_DIR}\mingwm10.dll"
+  File "${SRC_DIR}\ssleay32.dll"
+  File "${SRC_DIR}\libeay32.dll"
   File "${SRC_DIR}\bat.exe"
+  File "/oname=$INSTDIR\bin32\bacula.dll" "${SRC_DIR}\bacula32.dll"
+  File "/oname=$INSTDIR\bin32\pthreadGCE.dll" "${SRC_DIR}\pthreadGCE32.dll"
+  File "/oname=$INSTDIR\bin32\zlib1.dll" "${SRC_DIR}\zlib132.dll"
 
   File "/oname=$PLUGINSDIR\bat.conf" "bat.conf.in"
-  StrCpy $0 "$INSTDIR"
+  StrCpy $0 "$INSTDIR\bin32"
   StrCpy $1 bat.conf
   Call ConfigEditAndCopy
 
   ; Create Start Menu entry
-  CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bat.exe" '-c "$INSTDIR\bat.conf"' "$INSTDIR\bat.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$INSTDIR\bat.conf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bin32\bat.exe" '-c "$INSTDIR\bin32\bat.conf"' "$INSTDIR\bin32\bat.exe" 0
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$INSTDIR\bin32\bat.conf"'
+  SetOutPath "$INSTDIR"
 SectionEnd
 
-
-; Deleted because wxconsole is deprecated
-;Section "Graphical Console" SecWxConsole
-;  SectionIn 1 2 3
-;
-;  SetOutPath "$INSTDIR"
-;
-;SectionEnd
-
 SectionGroupEnd
 
 
@@ -610,6 +606,7 @@ Section "Uninstall"
   MessageBox MB_YESNO|MB_ICONQUESTION \
   "Would you like to delete the current configuration files and the working state file?" IDNO NoDel
     Delete /REBOOTOK "$INSTDIR\*"
+    Delete /REBOOTOK "$INSTDIR\bin32\*"
     Delete /REBOOTOK "$INSTDIR\working\*"
     Delete /REBOOTOK "$INSTDIR\plugins\*"
     Delete /REBOOTOK "$PLUGINSDIR\bacula-*.conf"
@@ -625,6 +622,7 @@ Section "Uninstall"
     Delete /REBOOTOK "$PLUGINSDIR\*.sql"    
     RMDir "$INSTDIR\plugins"
     RMDir "$INSTDIR\working"
+    RMDir "$INSTDIR\bin32"
     RMDir "$INSTDIR"
 NoDel: