From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 24 Jan 2010 14:22:10 +0000 (+0100)
Subject: Remove DIR+SD build from Win32 installer
X-Git-Tag: Release-5.0.0~8^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8cfb03f1924389319a0a97aaadb4417b4c749f2e;p=bacula%2Fbacula

Remove DIR+SD build from Win32 installer
---

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 3e9a3e37ba..52b4c91efa 100644
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -1,7 +1,6 @@
 ECHO_CMD=@
 
-WIN32_DIRS=lib cats filed filed/plugins dird stored \
-	 console wx-console tools scripts
+WIN32_DIRS=lib filed filed/plugins console scripts
 
 WIN64_DIRS=lib filed filed/plugins console scripts
 
@@ -12,7 +11,7 @@ ifeq ($(WIN64),yes)
 else
 	 DIRS=$(WIN32_DIRS)
 	 INSTALLER=win32_installer
-	 SPECIAL=bat
+	 SPECIAL=bat bsmtp
 endif
 
 .PHONY: $(DIRS) clean all Makefile.inc win32_installer full_win32_installer \
diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 23e7f858e4..0f3ab9ffb7 100644
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -20,24 +20,11 @@ INSTALL_EXE := $(BUILDDIR)/release32/winbacula-$(VERSION).exe
 
 BACULA_BINARIES := \
 	bacula.dll \
-	cats_mysql.dll \
-	cats_postgresql.dll \
-	cats_sqlite3.dll \
 	exchange-fd.dll \
-	bacula-dir.exe \
 	bacula-fd.exe \
-	bacula-sd.exe \
 	bconsole.exe \
-	bcopy.exe \
-	bextract.exe \
-	bls.exe \
-	bscan.exe \
 	bsleep.exe \
 	bsmtp.exe \
-	btape.exe \
-	dbcheck.exe \
-	scsilist.exe \
-	bwx-console.exe \
 	bat.exe
 
 DEPKGS_BINARIES := \
@@ -45,72 +32,27 @@ DEPKGS_BINARIES := \
 	pthreadGCE.dll \
 	ssleay32.dll \
 	zlib1.dll \
-	sqlite3.exe \
 	openssl.exe \
-	loaderinfo.exe \
-	mt.exe \
-	mtx.exe \
-	scsitape.exe \
 	sed.exe \
-	tapeinfo.exe \
 	expr64.exe \
 	snooze.exe \
 	mkisofs.exe \
 	growisofs.exe \
-	dvd-ram-control.exe \
-	dvd+rw-booktype.exe \
-	dvd+rw-format.exe \
-	dvd+rw-mediainfo.exe \
-	wxbase28_gcc_bacula.dll \
-	wxmsw28_core_gcc_bacula.dll \
 	QtCore4.dll \
 	QtGui4.dll
 
-NONGCC_BINARIES := \
-	libmysql.dll
+NONGCC_BINARIES :=
 
-NONGCC_LIBRARIES := \
-	libpq.dll
+NONGCC_LIBRARIES := 
 
 MINGW_BINARIES := \
 	mingwm10.dll
 
-SCRIPT_FILES := \
-	mtx-changer.cmd \
-	disk-changer.cmd \
-	dvd-handler.cmd
-
-CAT_FILES := \
-	create_mysql_database.cmd \
-	drop_mysql_database.cmd \
-	make_mysql_tables.cmd \
-	make_mysql_tables.sql \
-	drop_mysql_tables.cmd \
-	drop_mysql_tables.sql \
-	grant_mysql_privileges.cmd \
-	grant_mysql_privileges.sql \
-	make_mysql_catalog_backup.cmd \
-	create_postgresql_database.cmd \
-	create_postgresql_database.sql \
-	drop_postgresql_database.cmd \
-	make_postgresql_tables.cmd \
-	make_postgresql_tables.sql \
-	drop_postgresql_tables.cmd \
-	drop_postgresql_tables.sql \
-	grant_postgresql_privileges.cmd \
-	grant_postgresql_privileges.sql \
-	make_postgresql_catalog_backup.cmd \
-	create_sqlite3_database.cmd \
-	drop_sqlite3_database.cmd \
-	make_sqlite3_tables.cmd \
-	make_sqlite3_tables.sql \
-	drop_sqlite3_tables.cmd \
-	grant_sqlite3_privileges.cmd \
-	make_sqlite3_catalog_backup.cmd \
-	delete_catalog_backup.cmd
-
-DIRD_FILES := \
-	query.sql
+SCRIPT_FILES := 
+
+CAT_FILES := 
+
+DIRD_FILES := 
 
 SSL_FILES := \
 	openssl.cnf