]> git.sur5r.net Git - bacula/bacula/commitdiff
Fix eol properties.
authorRobert Nelson <robertn@the-nelsons.org>
Wed, 7 Feb 2007 09:18:43 +0000 (09:18 +0000)
committerRobert Nelson <robertn@the-nelsons.org>
Wed, 7 Feb 2007 09:18:43 +0000 (09:18 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4126 91ce42f0-d328-0410-95d8-f526ca767f89

57 files changed:
bacula/src/win32/bacula.sln
bacula/src/win32/bacula/bacula.vcproj
bacula/src/win32/build-depkgs-mingw32 [changed mode: 0644->0755]
bacula/src/win32/build-depkgs-msvc.cmd
bacula/src/win32/build-msvc.cmd
bacula/src/win32/cats/bacula_cats.def
bacula/src/win32/cats/bacula_cats/bacula_cats.def
bacula/src/win32/cats/bacula_cats/bacula_cats.vcproj
bacula/src/win32/cats/cats_mysql/cats_mysql.vcproj
bacula/src/win32/cats/create_sqlite3_database.cmd
bacula/src/win32/cats/drop_sqlite3_database.cmd
bacula/src/win32/cats/drop_sqlite3_tables.cmd
bacula/src/win32/cats/grant_sqlite3_privileges.cmd
bacula/src/win32/cats/make_mysql_catalog_backup.cmd
bacula/src/win32/cats/make_postgresql_catalog_backup.cmd
bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
bacula/src/win32/cats/make_sqlite3_tables.cmd
bacula/src/win32/cats/make_sqlite3_tables.sql
bacula/src/win32/filed/bacula-fd.manifest
bacula/src/win32/installer/ConfigPage1.nsh
bacula/src/win32/installer/ConfigPage2.nsh
bacula/src/win32/installer/DumpLog.nsh
bacula/src/win32/installer/InstallType.ini
bacula/src/win32/installer/InstallType.nsh
bacula/src/win32/installer/Start.bat
bacula/src/win32/installer/Stop.bat
bacula/src/win32/installer/WriteTemplates.ini
bacula/src/win32/installer/bacula-dir.conf.in
bacula/src/win32/installer/bacula-fd.conf.in
bacula/src/win32/installer/bacula-sd.conf.in
bacula/src/win32/installer/bconsole.conf.in
bacula/src/win32/installer/build-installer.cmd
bacula/src/win32/installer/client.conf.in
bacula/src/win32/installer/installer.vcproj
bacula/src/win32/installer/storage.conf.in
bacula/src/win32/installer/winbacula.nsi
bacula/src/win32/installer/wx-console.conf.in
bacula/src/win32/libbac/msvc/bacula.def
bacula/src/win32/libwin32/bacula.rc
bacula/src/win32/libwin32/winres.rc
bacula/src/win32/patches/mt.patch
bacula/src/win32/patches/mtx-msvc2.patch
bacula/src/win32/patches/mtx.patch
bacula/src/win32/patches/nsis.patch
bacula/src/win32/pebuilder/bacula/bacula.inf
bacula/src/win32/pebuilder/bacula/bacula_nu2menu.xml
bacula/src/win32/scripts/bsleep.vcproj
bacula/src/win32/scripts/mtx-changer.cmd
bacula/src/win32/stored/baculasd/bacula-sd.manifest
bacula/src/win32/stored/baculasd/bacula.rc
bacula/src/win32/stored/baculasd/baculasd.vcproj
bacula/src/win32/stored/baculasd/winres.rc
bacula/src/win32/stored/postest/postest.vcproj
bacula/src/win32/tools/bsmtp/bsmtp.vcproj
bacula/src/win32/tools/dbcheck/dbcheck.vcproj
bacula/src/win32/tools/scsilist/scsilist.vcproj
bacula/src/win32/wx-console/wx-console.manifest

index 8b114bd2fa395ce53c13fce694298bf55ae0b5dc..429b639b6ef8afb87898d74fbe2399dd0afcf03f 100644 (file)
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx-console", "wx-console\wx-console.vcproj", "{9BA8E10D-0D82-4B25-8543-DE34641FBC10}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{A0F65E06-9F18-40AC-81F6-A080852F1104}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fstype", "tools\fstype\fstype.vcproj", "{AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbac", "libbac\libbac.vcproj", "{374BF775-AF68-4A88-814A-48F692DFFE5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drivetype", "tools\drivetype\drivetype.vcproj", "{E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfind", "tools\testfind\testfind.vcproj", "{558838F9-D792-4F56-AAB2-99C03687C5FF}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testls", "tools\testls\testls.vcproj", "{28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculafd", "filed\baculafd.vcproj", "{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825DFFD0-4747-43CA-8326-529655E31935}"
-       ProjectSection(SolutionItems) = preProject
-               build-depkgs-mingw32 = build-depkgs-mingw32
-               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd
-               build-msvc.cmd = build-msvc.cmd
-               build-win32-cross-tools = build-win32-cross-tools
-               External-mingw32 = External-mingw32
-               External-msvc = External-msvc
-               README.mingw32 = README.mingw32
-               README.vc8 = README.vc8
-               README.win32 = README.win32
-               ..\..\technotes-1.39 = ..\..\technotes-1.39
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Header Files", "Header Files", "{C8301485-CFD1-43D4-827C-8EA050C8E256}"
-       ProjectSection(SolutionItems) = preProject
-               ..\baconfig.h = ..\baconfig.h
-               ..\bacula.h = ..\bacula.h
-               ..\bc_types.h = ..\bc_types.h
-               ..\jcr.h = ..\jcr.h
-               ..\version.h = ..\version.h
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculadird", "dird\dird.vcproj", "{D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculasd", "stored\baculasd\baculasd.vcproj", "{F5F063F8-11A1-475A-82E2-19759BB40B25}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcopy", "stored\bcopy\bcopy.vcproj", "{614CE916-0972-4126-9392-CD9FC0ADD7DE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextract", "stored\bextract\bextract.vcproj", "{6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bls", "stored\bls\bls.vcproj", "{F8AF7D74-2918-422B-A7B6-4D98566B7160}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bscan", "stored\bscan\bscan.vcproj", "{56EADEDB-FBED-4758-8B54-7B0B47ABDABF}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btape", "stored\btape\btape.vcproj", "{496415E0-AF44-4AD8-8C99-91B837DDF469}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "storelib", "stored\storelib\storelib.vcproj", "{CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "postest", "stored\postest\postest.vcproj", "{208D3989-794B-47A2-9D04-D7AEE1524078}"
-       ProjectSection(ProjectDependencies) = postProject
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{0377E151-3352-487B-A5CF-24BCDC9EC43F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Tools", "Test Tools", "{D6767108-F420-41C0-A834-2E6F487E1AB3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Daemons", "Daemons", "{B9099DDA-18C9-4DE0-AECB-5D8139EA619F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{37F903FE-3474-4C93-AD5B-987CB6A92E62}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Consoles", "Consoles", "{C66C8B3B-C156-4498-91E9-CA9A24CF9051}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bacula", "bacula\bacula.vcproj", "{2D729599-C008-4154-BCCB-53E6A260F220}"
-       ProjectSection(ProjectDependencies) = postProject
-               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {374BF775-AF68-4A88-814A-48F692DFFE5A}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_mysql", "cats\cats_mysql\cats_mysql.vcproj", "{B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bacula_cats", "cats\bacula_cats\bacula_cats.vcproj", "{8B79A2B5-8889-43D4-9B92-9AE8A6F00413}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbcheck", "tools\dbcheck\dbcheck.vcproj", "{85696E20-777A-41F6-BC00-2E7AB375B171}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_postgresql", "cats\cats_postgresql\cats_postgresql.vcproj", "{2FB961E5-213C-4475-8CB3-72F904D40752}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scsilist", "tools\scsilist\scsilist.vcproj", "{56D8C233-610E-4EE4-A73A-72CEF1C6A33A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcproj", "{6D1B0964-FB32-4916-A61C-49D7F715EAD8}"
-       ProjectSection(ProjectDependencies) = postProject
-               {A0F65E06-9F18-40AC-81F6-A080852F1104} = {A0F65E06-9F18-40AC-81F6-A080852F1104}
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10} = {9BA8E10D-0D82-4B25-8543-DE34641FBC10}
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE} = {614CE916-0972-4126-9392-CD9FC0ADD7DE}
-               {85696E20-777A-41F6-BC00-2E7AB375B171} = {85696E20-777A-41F6-BC00-2E7AB375B171}
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F} = {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A} = {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}
-               {23BFE838-5682-4F39-969F-0B40366D4D98} = {23BFE838-5682-4F39-969F-0B40366D4D98}
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC} = {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160} = {F8AF7D74-2918-422B-A7B6-4D98566B7160}
-               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {374BF775-AF68-4A88-814A-48F692DFFE5A}
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA} = {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}
-               {AB67F297-8491-4515-8E52-BFF5340EC242} = {AB67F297-8491-4515-8E52-BFF5340EC242}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0} = {0F56AEB0-14DA-4A80-8962-1F85A17339D0}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B} = {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF} = {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF} = {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E} = {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}
-               {496415E0-AF44-4AD8-8C99-91B837DDF469} = {496415E0-AF44-4AD8-8C99-91B837DDF469}
-               {2FB961E5-213C-4475-8CB3-72F904D40752} = {2FB961E5-213C-4475-8CB3-72F904D40752}
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA} = {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}
-               {F5F063F8-11A1-475A-82E2-19759BB40B25} = {F5F063F8-11A1-475A-82E2-19759BB40B25}
-               {558838F9-D792-4F56-AAB2-99C03687C5FF} = {558838F9-D792-4F56-AAB2-99C03687C5FF}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsleep", "scripts\bsleep.vcproj", "{0F56AEB0-14DA-4A80-8962-1F85A17339D0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsmtp", "tools\bsmtp\bsmtp.vcproj", "{AB67F297-8491-4515-8E52-BFF5340EC242}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{40CADEE4-8D53-4157-AA36-B256F4934FC3}"
-       ProjectSection(SolutionItems) = preProject
-               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd
-               scripts\disk-changer.cmd = scripts\disk-changer.cmd
-               scripts\dvd-handler.cmd = scripts\dvd-handler.cmd
-               scripts\mtx-changer.cmd = scripts\mtx-changer.cmd
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_sqlite3", "cats\cats_sqlite3\cats_sqlite3.vcproj", "{23BFE838-5682-4F39-969F-0B40366D4D98}"
-       ProjectSection(ProjectDependencies) = postProject
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Any CPU = Debug|Any CPU
-               Debug|Win32 = Debug|Win32
-               Release|Any CPU = Release|Any CPU
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.ActiveCfg = Debug|Win32
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.Build.0 = Debug|Win32
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Any CPU.ActiveCfg = Release|Win32
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.ActiveCfg = Release|Win32
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.Build.0 = Release|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.ActiveCfg = Debug|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.Build.0 = Debug|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Any CPU.ActiveCfg = Release|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.ActiveCfg = Release|Win32
-               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.Build.0 = Release|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Win32.Build.0 = Debug|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Any CPU.ActiveCfg = Release|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Win32.ActiveCfg = Release|Win32
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Win32.Build.0 = Release|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Win32.ActiveCfg = Debug|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Win32.Build.0 = Debug|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Any CPU.ActiveCfg = Release|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Win32.ActiveCfg = Release|Win32
-               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Win32.Build.0 = Release|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Win32.Build.0 = Debug|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Any CPU.ActiveCfg = Release|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Win32.ActiveCfg = Release|Win32
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Win32.Build.0 = Release|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Win32.ActiveCfg = Debug|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Win32.Build.0 = Debug|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Any CPU.ActiveCfg = Release|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Win32.ActiveCfg = Release|Win32
-               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Win32.Build.0 = Release|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Win32.ActiveCfg = Debug|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Win32.Build.0 = Debug|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Any CPU.ActiveCfg = Release|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Win32.ActiveCfg = Release|Win32
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Win32.Build.0 = Release|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.ActiveCfg = Debug|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.Build.0 = Debug|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Any CPU.ActiveCfg = Release|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.ActiveCfg = Release|Win32
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.Build.0 = Release|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Win32.ActiveCfg = Debug|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Win32.Build.0 = Debug|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Any CPU.ActiveCfg = Release|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Win32.ActiveCfg = Release|Win32
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Win32.Build.0 = Release|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Win32.Build.0 = Debug|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Any CPU.ActiveCfg = Release|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Win32.ActiveCfg = Release|Win32
-               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Win32.Build.0 = Release|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Win32.Build.0 = Debug|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Any CPU.ActiveCfg = Release|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Win32.ActiveCfg = Release|Win32
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Win32.Build.0 = Release|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Win32.ActiveCfg = Debug|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Win32.Build.0 = Debug|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Any CPU.ActiveCfg = Release|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Win32.ActiveCfg = Release|Win32
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Win32.Build.0 = Release|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Win32.Build.0 = Debug|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Any CPU.ActiveCfg = Release|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Win32.ActiveCfg = Release|Win32
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Win32.Build.0 = Release|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Win32.ActiveCfg = Debug|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Win32.Build.0 = Debug|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Any CPU.ActiveCfg = Release|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Win32.ActiveCfg = Release|Win32
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Win32.Build.0 = Release|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Win32.ActiveCfg = Debug|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Win32.Build.0 = Debug|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Any CPU.ActiveCfg = Release|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Win32.ActiveCfg = Release|Win32
-               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Win32.Build.0 = Release|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Win32.ActiveCfg = Debug|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Win32.Build.0 = Debug|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Any CPU.ActiveCfg = Release|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Win32.ActiveCfg = Release|Win32
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Win32.Build.0 = Release|Win32
-               {208D3989-794B-47A2-9D04-D7AEE1524078}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {208D3989-794B-47A2-9D04-D7AEE1524078}.Debug|Win32.ActiveCfg = Debug|Win32
-               {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Any CPU.ActiveCfg = Release|Win32
-               {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Win32.ActiveCfg = Release|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Win32.Build.0 = Debug|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Any CPU.ActiveCfg = Release|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Win32.ActiveCfg = Release|Win32
-               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Win32.Build.0 = Release|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Win32.ActiveCfg = Debug|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Win32.Build.0 = Debug|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Any CPU.ActiveCfg = Release|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Win32.ActiveCfg = Release|Win32
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Win32.Build.0 = Release|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Win32.ActiveCfg = Debug|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Win32.Build.0 = Debug|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Any CPU.ActiveCfg = Release|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Win32.ActiveCfg = Release|Win32
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Win32.Build.0 = Release|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Win32.ActiveCfg = Debug|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Win32.Build.0 = Debug|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Any CPU.ActiveCfg = Release|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Win32.ActiveCfg = Release|Win32
-               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Win32.Build.0 = Release|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Win32.Build.0 = Debug|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Any CPU.ActiveCfg = Release|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Win32.ActiveCfg = Release|Win32
-               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Win32.Build.0 = Release|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Win32.ActiveCfg = Debug|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Win32.Build.0 = Debug|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Any CPU.ActiveCfg = Release|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Win32.ActiveCfg = Release|Win32
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Win32.Build.0 = Release|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Win32.ActiveCfg = Debug|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Win32.Build.0 = Debug|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Any CPU.ActiveCfg = Release|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Win32.ActiveCfg = Release|Win32
-               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Win32.Build.0 = Release|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.ActiveCfg = Debug|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.Build.0 = Debug|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Any CPU.ActiveCfg = Release|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Win32.ActiveCfg = Release|Win32
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Win32.Build.0 = Release|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Win32.ActiveCfg = Debug|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Win32.Build.0 = Debug|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Any CPU.ActiveCfg = Release|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Win32.ActiveCfg = Release|Win32
-               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Win32.Build.0 = Release|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Any CPU.ActiveCfg = Debug|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Win32.ActiveCfg = Debug|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Win32.Build.0 = Debug|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Any CPU.ActiveCfg = Release|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Win32.ActiveCfg = Release|Win32
-               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-       GlobalSection(NestedProjects) = preSolution
-               {A0F65E06-9F18-40AC-81F6-A080852F1104} = {C66C8B3B-C156-4498-91E9-CA9A24CF9051}
-               {9BA8E10D-0D82-4B25-8543-DE34641FBC10} = {C66C8B3B-C156-4498-91E9-CA9A24CF9051}
-               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F} = {D6767108-F420-41C0-A834-2E6F487E1AB3}
-               {558838F9-D792-4F56-AAB2-99C03687C5FF} = {D6767108-F420-41C0-A834-2E6F487E1AB3}
-               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF} = {D6767108-F420-41C0-A834-2E6F487E1AB3}
-               {208D3989-794B-47A2-9D04-D7AEE1524078} = {D6767108-F420-41C0-A834-2E6F487E1AB3}
-               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E} = {D6767108-F420-41C0-A834-2E6F487E1AB3}
-               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {2D729599-C008-4154-BCCB-53E6A260F220} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {2FB961E5-213C-4475-8CB3-72F904D40752} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {23BFE838-5682-4F39-969F-0B40366D4D98} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}
-               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}
-               {F5F063F8-11A1-475A-82E2-19759BB40B25} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}
-               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}
-               {C8301485-CFD1-43D4-827C-8EA050C8E256} = {825DFFD0-4747-43CA-8326-529655E31935}
-               {40CADEE4-8D53-4157-AA36-B256F4934FC3} = {825DFFD0-4747-43CA-8326-529655E31935}
-               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {F8AF7D74-2918-422B-A7B6-4D98566B7160} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {496415E0-AF44-4AD8-8C99-91B837DDF469} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {614CE916-0972-4126-9392-CD9FC0ADD7DE} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {85696E20-777A-41F6-BC00-2E7AB375B171} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {0F56AEB0-14DA-4A80-8962-1F85A17339D0} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-               {AB67F297-8491-4515-8E52-BFF5340EC242} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}
-       EndGlobalSection
-EndGlobal
+\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx-console", "wx-console\wx-console.vcproj", "{9BA8E10D-0D82-4B25-8543-DE34641FBC10}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{A0F65E06-9F18-40AC-81F6-A080852F1104}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fstype", "tools\fstype\fstype.vcproj", "{AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbac", "libbac\libbac.vcproj", "{374BF775-AF68-4A88-814A-48F692DFFE5A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drivetype", "tools\drivetype\drivetype.vcproj", "{E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfind", "tools\testfind\testfind.vcproj", "{558838F9-D792-4F56-AAB2-99C03687C5FF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testls", "tools\testls\testls.vcproj", "{28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculafd", "filed\baculafd.vcproj", "{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825DFFD0-4747-43CA-8326-529655E31935}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               build-depkgs-mingw32 = build-depkgs-mingw32\r
+               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd\r
+               build-msvc.cmd = build-msvc.cmd\r
+               build-win32-cross-tools = build-win32-cross-tools\r
+               External-mingw32 = External-mingw32\r
+               External-msvc = External-msvc\r
+               README.mingw32 = README.mingw32\r
+               README.vc8 = README.vc8\r
+               README.win32 = README.win32\r
+               ..\..\technotes-1.39 = ..\..\technotes-1.39\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Header Files", "Header Files", "{C8301485-CFD1-43D4-827C-8EA050C8E256}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               ..\baconfig.h = ..\baconfig.h\r
+               ..\bacula.h = ..\bacula.h\r
+               ..\bc_types.h = ..\bc_types.h\r
+               ..\jcr.h = ..\jcr.h\r
+               ..\version.h = ..\version.h\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculadird", "dird\dird.vcproj", "{D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculasd", "stored\baculasd\baculasd.vcproj", "{F5F063F8-11A1-475A-82E2-19759BB40B25}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcopy", "stored\bcopy\bcopy.vcproj", "{614CE916-0972-4126-9392-CD9FC0ADD7DE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextract", "stored\bextract\bextract.vcproj", "{6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bls", "stored\bls\bls.vcproj", "{F8AF7D74-2918-422B-A7B6-4D98566B7160}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bscan", "stored\bscan\bscan.vcproj", "{56EADEDB-FBED-4758-8B54-7B0B47ABDABF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btape", "stored\btape\btape.vcproj", "{496415E0-AF44-4AD8-8C99-91B837DDF469}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "storelib", "stored\storelib\storelib.vcproj", "{CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "postest", "stored\postest\postest.vcproj", "{208D3989-794B-47A2-9D04-D7AEE1524078}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{0377E151-3352-487B-A5CF-24BCDC9EC43F}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Tools", "Test Tools", "{D6767108-F420-41C0-A834-2E6F487E1AB3}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Daemons", "Daemons", "{B9099DDA-18C9-4DE0-AECB-5D8139EA619F}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{37F903FE-3474-4C93-AD5B-987CB6A92E62}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Consoles", "Consoles", "{C66C8B3B-C156-4498-91E9-CA9A24CF9051}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bacula", "bacula\bacula.vcproj", "{2D729599-C008-4154-BCCB-53E6A260F220}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {374BF775-AF68-4A88-814A-48F692DFFE5A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_mysql", "cats\cats_mysql\cats_mysql.vcproj", "{B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bacula_cats", "cats\bacula_cats\bacula_cats.vcproj", "{8B79A2B5-8889-43D4-9B92-9AE8A6F00413}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbcheck", "tools\dbcheck\dbcheck.vcproj", "{85696E20-777A-41F6-BC00-2E7AB375B171}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_postgresql", "cats\cats_postgresql\cats_postgresql.vcproj", "{2FB961E5-213C-4475-8CB3-72F904D40752}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scsilist", "tools\scsilist\scsilist.vcproj", "{56D8C233-610E-4EE4-A73A-72CEF1C6A33A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcproj", "{6D1B0964-FB32-4916-A61C-49D7F715EAD8}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104} = {A0F65E06-9F18-40AC-81F6-A080852F1104}\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10} = {9BA8E10D-0D82-4B25-8543-DE34641FBC10}\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE} = {614CE916-0972-4126-9392-CD9FC0ADD7DE}\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171} = {85696E20-777A-41F6-BC00-2E7AB375B171}\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F} = {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A} = {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98} = {23BFE838-5682-4F39-969F-0B40366D4D98}\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC} = {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160} = {F8AF7D74-2918-422B-A7B6-4D98566B7160}\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {374BF775-AF68-4A88-814A-48F692DFFE5A}\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA} = {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242} = {AB67F297-8491-4515-8E52-BFF5340EC242}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0} = {0F56AEB0-14DA-4A80-8962-1F85A17339D0}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B} = {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF} = {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF} = {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E} = {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469} = {496415E0-AF44-4AD8-8C99-91B837DDF469}\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752} = {2FB961E5-213C-4475-8CB3-72F904D40752}\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA} = {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25} = {F5F063F8-11A1-475A-82E2-19759BB40B25}\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF} = {558838F9-D792-4F56-AAB2-99C03687C5FF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsleep", "scripts\bsleep.vcproj", "{0F56AEB0-14DA-4A80-8962-1F85A17339D0}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsmtp", "tools\bsmtp\bsmtp.vcproj", "{AB67F297-8491-4515-8E52-BFF5340EC242}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{40CADEE4-8D53-4157-AA36-B256F4934FC3}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd\r
+               scripts\disk-changer.cmd = scripts\disk-changer.cmd\r
+               scripts\dvd-handler.cmd = scripts\dvd-handler.cmd\r
+               scripts\mtx-changer.cmd = scripts\mtx-changer.cmd\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_sqlite3", "cats\cats_sqlite3\cats_sqlite3.vcproj", "{23BFE838-5682-4F39-969F-0B40366D4D98}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Any CPU = Release|Any CPU\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.Build.0 = Release|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.Build.0 = Release|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}.Release|Win32.Build.0 = Release|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A}.Release|Win32.Build.0 = Release|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}.Release|Win32.Build.0 = Release|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF}.Release|Win32.Build.0 = Release|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}.Release|Win32.Build.0 = Release|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.Build.0 = Release|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA}.Release|Win32.Build.0 = Release|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25}.Release|Win32.Build.0 = Release|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE}.Release|Win32.Build.0 = Release|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}.Release|Win32.Build.0 = Release|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160}.Release|Win32.Build.0 = Release|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF}.Release|Win32.Build.0 = Release|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Debug|Win32.Build.0 = Debug|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Win32.ActiveCfg = Release|Win32\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469}.Release|Win32.Build.0 = Release|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Win32.Build.0 = Release|Win32\r
+               {208D3989-794B-47A2-9D04-D7AEE1524078}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {208D3989-794B-47A2-9D04-D7AEE1524078}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2D729599-C008-4154-BCCB-53E6A260F220}.Release|Win32.Build.0 = Release|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}.Release|Win32.Build.0 = Release|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413}.Release|Win32.Build.0 = Release|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Debug|Win32.Build.0 = Debug|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Win32.ActiveCfg = Release|Win32\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171}.Release|Win32.Build.0 = Release|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752}.Release|Win32.Build.0 = Release|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A}.Release|Win32.Build.0 = Release|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6D1B0964-FB32-4916-A61C-49D7F715EAD8}.Release|Win32.Build.0 = Release|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Win32.Build.0 = Release|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Debug|Win32.Build.0 = Debug|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Win32.ActiveCfg = Release|Win32\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242}.Release|Win32.Build.0 = Release|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Debug|Win32.Build.0 = Debug|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Any CPU.ActiveCfg = Release|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Win32.ActiveCfg = Release|Win32\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(NestedProjects) = preSolution\r
+               {A0F65E06-9F18-40AC-81F6-A080852F1104} = {C66C8B3B-C156-4498-91E9-CA9A24CF9051}\r
+               {9BA8E10D-0D82-4B25-8543-DE34641FBC10} = {C66C8B3B-C156-4498-91E9-CA9A24CF9051}\r
+               {E5BC5B2E-976D-4DED-AA07-5DD52BF2163F} = {D6767108-F420-41C0-A834-2E6F487E1AB3}\r
+               {558838F9-D792-4F56-AAB2-99C03687C5FF} = {D6767108-F420-41C0-A834-2E6F487E1AB3}\r
+               {28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF} = {D6767108-F420-41C0-A834-2E6F487E1AB3}\r
+               {208D3989-794B-47A2-9D04-D7AEE1524078} = {D6767108-F420-41C0-A834-2E6F487E1AB3}\r
+               {AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E} = {D6767108-F420-41C0-A834-2E6F487E1AB3}\r
+               {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {374BF775-AF68-4A88-814A-48F692DFFE5A} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {2D729599-C008-4154-BCCB-53E6A260F220} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {B52BD53B-0E57-4E9A-A601-8E8171BA1CFC} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {2FB961E5-213C-4475-8CB3-72F904D40752} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {23BFE838-5682-4F39-969F-0B40366D4D98} = {0377E151-3352-487B-A5CF-24BCDC9EC43F}\r
+               {D03415F7-654E-42F4-B0E9-CB8FBE3F22FA} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}\r
+               {F5F063F8-11A1-475A-82E2-19759BB40B25} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}\r
+               {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B} = {B9099DDA-18C9-4DE0-AECB-5D8139EA619F}\r
+               {C8301485-CFD1-43D4-827C-8EA050C8E256} = {825DFFD0-4747-43CA-8326-529655E31935}\r
+               {40CADEE4-8D53-4157-AA36-B256F4934FC3} = {825DFFD0-4747-43CA-8326-529655E31935}\r
+               {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {F8AF7D74-2918-422B-A7B6-4D98566B7160} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {56EADEDB-FBED-4758-8B54-7B0B47ABDABF} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {496415E0-AF44-4AD8-8C99-91B837DDF469} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {614CE916-0972-4126-9392-CD9FC0ADD7DE} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {85696E20-777A-41F6-BC00-2E7AB375B171} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {56D8C233-610E-4EE4-A73A-72CEF1C6A33A} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {0F56AEB0-14DA-4A80-8962-1F85A17339D0} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+               {AB67F297-8491-4515-8E52-BFF5340EC242} = {37F903FE-3474-4C93-AD5B-987CB6A92E62}\r
+       EndGlobalSection\r
+EndGlobal\r
index 091f0b651fd3a0c4e3e3594ca5d6bff50ed74784..ae9fe374a2576e7c2ce2962bc2e7889989da163f 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="bacula"
-       ProjectGUID="{2D729599-C008-4154-BCCB-53E6A260F220}"
-       RootNamespace="bacula"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               AdditionalDependencies="$(TargetDir)libbac.lib"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               SuppressStartupBanner="true"
-                               OutputFile=".\Debug/bacula.bsc"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               AdditionalDependencies="$(TargetDir)libbac.lib"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\compat\getopt.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\parse_conf.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\res.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-               <File
-                       RelativePath=".\ReadMe.txt"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bacula"\r
+       ProjectGUID="{2D729599-C008-4154-BCCB-53E6A260F220}"\r
+       RootNamespace="bacula"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"\r
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               AdditionalDependencies="$(TargetDir)libbac.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               SuppressStartupBanner="true"\r
+                               OutputFile=".\Debug/bacula.bsc"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"\r
+                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               AdditionalDependencies="$(TargetDir)libbac.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\compat\getopt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\lib\parse_conf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\lib\res.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <File\r
+                       RelativePath=".\ReadMe.txt"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
old mode 100644 (file)
new mode 100755 (executable)
index 689a2f32dbc469a17856fa5ced391e8296531b94..5d73f6c16d5b092e2c779a99655171d5e6442c12 100644 (file)
-@echo off
-SETLOCAL
-
-SET PERL_PATH=
-FOR /F "tokens=1" %%I in ( "perl.exe" ) DO SET PERL_PATH=%%~$PATH:I
-
-IF NOT "%PERL_PATH%"=="" GOTO :PERL_OK
-ECHO Perl must be in your PATH.  Please fix and rerun this script!
-EXIT /B 1
-
-:PERL_OK
-
-IF "%CLOBBER_SOURCE%"=="" SET CLOBBER_SOURCE=false
-
-FOR /F "eol=# delims=| tokens=1-4" %%I in ( External-msvc ) DO SET URL_%%I=%%J& SET DIR_%%I=%%K& SET MKD_%%I=%%L
-
-SET CWD=%CD%
-FOR %%I IN ( %0 ) DO CD %%~dpI
-SET SCRIPT_DIR=%CD%
-
-CD ..\..\..
-set TOP_DIR=%CD%
-
-IF NOT EXIST %TOP_DIR%\depkgs-msvc\nul MD %TOP_DIR%\depkgs-msvc
-
-cd %TOP_DIR%\depkgs-msvc
-set DEPPKG_DIR=%CD%
-
-cd %DEPPKG_DIR%
-
-IF /I "%CLOBBER_SOURCE:~0,1%"=="y" SET CLOBBER_SOURCE=true
-IF /I "%CLOBBER_SOURCE:~0,1%"=="t" SET CLOBBER_SOURCE=true
-IF /I "%CLOBBER_SOURCE:~0,1%"=="1" SET CLOBBER_SOURCE=true
-
-SET PATH=%DEPPKG_DIR%\tools;%PATH%
-SET INCLUDE=%INCLUDE%;%DEPPKG_DIR%\include
-SET LIB=%LIB%;%DEPPKG_DIR%\lib
-
-IF NOT EXIST bin\nul MKDIR bin
-IF NOT EXIST src\nul MKDIR src
-IF NOT EXIST include\nul MKDIR include
-IF NOT EXIST lib\nul MKDIR lib
-
-CD src
-
-COPY NUL parse_output.sed >nul 2>&1
-REM ECHO /\\$/N >>parse_output.sed
-REM ECHO s/\\\n// >>parse_output.sed
-ECHO s/\t\+/ /g >>parse_output.sed
-ECHO s/ \+/ /g >>parse_output.sed
-ECHO / [Ee]rror: /p >>parse_output.sed
-REM ECHO s;.*Entering directory[ ]\+.%DEPPKG_DIR%/\([^^ ]\+\).;Entering \1;p >>parse_output.sed
-REM ECHO s;.*Leaving directory[ ]\+.%DEPPKG_DIR%/\([^^ ]\+.\).;Leaving \1;p >>parse_output.sed
-ECHO /[Cc][Ll] \^|[Ll][Ii][Nn][Kk] \^|[Ll][Ii][Bb] /!d >>parse_output.sed
-ECHO s; \(\.\.\\\)\+; ;g >>parse_output.sed
-ECHO s; \.\\; ;g >>parse_output.sed
-ECHO s/.* \([^^ ]\+\(\.[Cc]\^|\.[Cc][Pp][Pp]\^|\.[Cc][Cc]\^|\.[Cc][Xx][Xx]\)\)\( .*\^|\)$/Compiling \1/p >>parse_output.sed
-ECHO s/.* \([^^ ]\+\.[Aa][Ss][Mm]\)\( .*\^|\)$/Assembling \1/p >>parse_output.sed
-ECHO s/.* \/[Oo][Uu][Tt]:\(\.\\\)*\(\.\.\\\)*\([^^ ]\+\)\( .*\^|\)$/Linking \3/p >>parse_output.sed
-REM ECHO s/.*[Ll][Ii][Bb] [^^ ]\+ \([^^ ]\+\)\(\( [^^ ]\+\.o\)\+\)/Updating \1 -\2/p >>parse_output.sed
-
-IF NOT "%1"=="" GOTO :ProcessArgs
-       CALL :process_zlib
-REM    CALL :process_pcre
-       CALL :process_pthreads
-       CALL :process_openssl
-       CALL :process_mysql
-       CALL :process_sqlite
-       CALL :process_postgreSQL
-       CALL :process_wx
-REM    CALL :process_scons
-       CALL :process_nsis
-       CALL :process_mtx
-       CALL :process_mt
-       CALL :process_sed
-       CALL :process_cmd_utils
-       CALL :process_mkisofs
-       CALL :process_dvd_rw_tools
-       GOTO :EOF
-
-:ProcessArgs
-       IF "%1"=="" GOTO :EOF
-       
-       CALL :process_%1
-       SHIFT
-       GOTO :ProcessArgs
-
-:get_source
-       SET URL=%1
-       SET SRC_DIR=%2
-       SET MAKE_SRC_ENABLE=%3
-       SET BASENAME=
-
-       IF NOT "%SRC_DIR%"=="" GOTO :get_source_make_src
-       FOR %%I IN ( %URL% ) DO (SET BASENAME=%%~nI& IF NOT "%%~xI"==".gz" IF NOT "%%~xI"==".bz2" SET SRC_DIR=%%~nI)
-       IF "%SRC_DIR%"=="" FOR %%I IN ( %BASENAME% ) DO SET SRC_DIR=%%~nI
-
-:get_source_make_src
-       SET MAKE_SRC_DIR=
-       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="y" SET MAKE_SRC_DIR=true
-       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="t" SET MAKE_SRC_DIR=true
-       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="1" SET MAKE_SRC_DIR=true
-
-       FOR %%I IN ( %URL% ) DO ( SET ARCHIVE=%%~nxI& SET ARCHIVE_EXT=%%~xI)
-       
-       CD %DEPPKG_DIR%\src
-       
-       IF EXIST %ARCHIVE% GOTO :get_source_check_srcdir
-       ECHO Downloading %URL%
-       wget -nv --passive-ftp "%URL%"
-       IF NOT ERRORLEVEL 1 GOTO :get_source_extract
-       ECHO Unable to download %ARCHIVE%
-       EXIT /B 2
-
-:get_source_check_srcdir
-       IF /I "%ARCHIVE_EXT%"==".exe" EXIT /B 0
-       IF NOT EXIST %SRC_DIR%\nul GOTO :get_source_extract
-       IF NOT "%CLOBBER_SOURCE%"=="true" GOTO :get_source_skipped
-       IF EXIST %SRC_DIR%\nul RD /s /q "%SRC_DIR%"
-:get_source_extract
-       IF /I "%ARCHIVE_EXT%"==".exe" EXIT /B 0
-       SET TAR_ARCHIVE=
-       FOR %%I IN ( "%ARCHIVE%" ) do IF "%%~xI"==".gz" SET TAR_ARCHIVE=%%~nI
-       FOR %%I IN ( "%ARCHIVE%" ) do IF "%%~xI"==".bz2" SET TAR_ARCHIVE=%%~nI
-
-       SET TARGET_DIR=.
-       IF DEFINED MAKE_SRC_DIR IF NOT EXIST %SRC_DIR%\nul MKDIR %SRC_DIR%
-       IF DEFINED MAKE_SRC_DIR SET TARGET_DIR=%SRC_DIR%
-
-       ECHO Extracting %ARCHIVE%
-       7z x -bd -y -o"%TARGET_DIR%" "%ARCHIVE%" 2>&1 > "%ARCHIVE%.log"
-       IF ERRORLEVEL 1 EXIT /B 2
-       IF NOT DEFINED TAR_ARCHIVE GOTO :get_source_done
-       ECHO Extracting %TAR_ARCHIVE%
-       7z x -bd -y -o"%TARGET_DIR%" "%TARGET_DIR%\%TAR_ARCHIVE%" & del /q "%TAR_ARCHIVE%" 2>&1 >> "%ARCHIVE%.log"
-
-:get_source_done
-       CD "%SRC_DIR%"
-       EXIT /B 0
-
-:get_source_skipped
-       CD %SRC_DIR%
-       EXIT /B 1
-
-:process_zlib
-       CALL :get_source %URL_ZLIB% %DIR_ZLIB% %MKD_ZLIB%
-       ECHO Building zlib
-       COPY /Y nul make.log
-REM    XCOPY contrib\masmx86\gvmat32.asm . /Y
-REM    XCOPY contrib\masmx86\gvmat32c.c . /Y
-REM    XCOPY contrib\masmx86\inffas32.asm . /Y
-REM    CALL :do_nmake win32\Makefile.msc AS=nasmw ASFLAGS= LOC="-D_CRT_SECURE_NO_DEPRECATE -DASMV -DASMINF" OBJA="gvmat32c.obj gvmat32.obj inffas32.obj" all
-       CALL :do_nmake win32\Makefile.msc LOC="-D_CRT_SECURE_NO_DEPRECATE" all
-       ECHO Installing zlib
-       XCOPY zlib1.dll.manifest %DEPPKG_DIR%\bin\ /Y
-       XCOPY zlib1.dll %DEPPKG_DIR%\bin\ /Y
-       XCOPY zlib.lib %DEPPKG_DIR%\lib\ /Y
-       XCOPY zdll.lib %DEPPKG_DIR%\lib\ /Y
-       XCOPY zlib.h %DEPPKG_DIR%\include\ /Y
-       XCOPY zconf.h %DEPPKG_DIR%\include\ /Y
-       EXIT /B 0
-
-:process_pcre
-       CALL :get_source %URL_PCRE% %DIR_PCRE% %MKD_PCRE%
-REM    ECHO Patching PCRE
-REM    COPY /Y nul patch.log
-REM    do_patch pcre.patch
-       ECHO Configuring PCRE
-       ./configure CC_FOR_BUILD=gcc CXX_FOR_BUILD=g++ --host=mingw32 --prefix=%DEPPKG_DIR% --enable-utf8 --enable-unicode-properties 2>&1 > make.log
-       ECHO Building PCRE
-       do_make Makefile PREFIX=%DEPPKG_DIR% all
-       ECHO Installing PCRE
-       do_make Makefile PREFIX=%DEPPKG_DIR% install
-       EXIT /B 0
-
-:process_pthreads
-       CALL :get_source %URL_PTHREADS% %DIR_PTHREADS% %MKD_PTHREADS%
-       FOR %%I IN ( %URL_PTHREADS% ) DO (SET ARCHIVE=%%~nxI)
-       IF EXIST %SRC_DIR%\nul GOTO :install_pthreads
-       ECHO Extracting %ARCHIVE%
-       7z x -bd -y -o"%DIR_PTHREADS%" "%ARCHIVE%" 2>&1 > "%ARCHIVE%.log"
-:install_pthreads
-       CD %DIR_PTHREADS%
-       ECHO Installing pthreads
-       XCOPY Pre-built\include\*.h %DEPPKG_DIR%\include\ /Y
-       XCOPY Pre-built\lib\pthreadVCE.lib %DEPPKG_DIR%\lib\ /Y
-       XCOPY Pre-built\lib\pthreadVCE.dll %DEPPKG_DIR%\bin\ /Y
-       EXIT /B 0
-
-:process_openssl
-       CALL :get_source %URL_OPENSSL% %DIR_OPENSSL% %MKD_OPENSSL%
-       IF ERRORLEVEL 2 GOTO :OpenSSLError
-       ECHO Configuring openssl
-       perl Configure VC-WIN32 --prefix=%DEPPKG_DIR:\=/% > make.log
-       ECHO Building openssl
-       CALL ms\do_nasm
-       @ECHO off
-       CALL :do_nmake ms\ntdll.mak 
-       @ECHO off
-       ECHO Installing openssl
-       CALL :do_nmake ms\ntdll.mak install
-       EXIT /B 0
-:OpenSSLError
-       ECHO Unable to download OpenSSL source from %URL_OPENSSL%
-       EXIT /B 1
-
-:process_mysql
-       CALL :get_source %URL_MYSQL% %DIR_MYSQL% %MKD_MYSQL%
-       ECHO Installing mysql
-       IF EXIST ..\..\include\mysql\nul RD /s /q ..\..\include\mysql
-       XCOPY include\* ..\..\include\mysql\ /e/h/k/y 2>&1
-       XCOPY lib\opt\libmysql.lib ..\..\lib\ /y
-       XCOPY lib\opt\libmysql.dll ..\..\bin\ /y
-       EXIT /B 0
-
-:process_postgreSQL
-       CALL :get_source %URL_POSTGRESQL% %DIR_POSTGRESQL% %MKD_POSTGRESQL%
-       IF ERRORLEVEL 2 GOTO :pstgreSQL_Error1
-       CALL :get_source %URL_POSTGRESQL_SRC% %DIR_POSTGRESQL_SRC% %MKD_POSTGRESQL_SRC%
-       IF ERRORLEVEL 2 GOTO :pstgreSQL_Error2
-REM    ECHO Patching postgreSQL
-REM    COPY /Y nul patch.log
-REM    do_patch postgresql.patch
-       ECHO Installing postgreSQL
-       XCOPY ..\pgsql\include\libpq-fe.h ..\..\include\ /Y 2>&1
-       XCOPY ..\pgsql\include\postgres_ext.h ..\..\include\ /Y 2>&1
-       LIB /def:src\interfaces\libpq\libpqdll.def /out:..\..\lib\libpqdll.lib /machine:x86 /subsystem:console
-       XCOPY ..\pgsql\lib\libpq.dll ..\..\bin\ /Y
-       XCOPY ..\pgsql\lib\comerr32.dll ..\..\bin\ /Y
-       XCOPY ..\pgsql\lib\krb5_32.dll ..\..\bin\ /Y
-       XCOPY ..\pgsql\lib\libintl-2.dll ..\..\bin\ /Y
-       XCOPY ..\pgsql\lib\libiconv-2.dll ..\..\bin\ /Y
-       EXIT /B 0
-:pstgreSQL_Error1
-       ECHO Unable to download postgreSQL binaries from %URL_POSTGRESQL%
-       EXIT /B 1
-:pstgreSQL_Error2
-       ECHO Unable to download postgreSQL source from %URL_POSTGRESQL_SRC%
-       EXIT /B 1
-
-:process_sqlite
-       CALL :get_source %URL_SQLITE% %DIR_SQLITE% %MKD_SQLITE%
-       IF ERRORLEVEL 2 GOTO :sqlite_error
-       IF ERRORLEVEL 1 GOTO :sqlite_skip_patch
-       ECHO Patching SQLite
-       COPY /Y nul patch.log
-       CALL :do_patch sqlite_msc.patch
-:sqlite_skip_patch
-       ECHO Configuring SQLite
-       IF NOT EXIST bld/nul MKDIR bld
-       CD bld
-       ECHO Building SQLite
-       COPY /Y nul make.log
-       CALL :do_nmake ../Makefile.msvc clean all
-       ECHO Installing SQLite
-       COPY sqlite3.exe %DEPPKG_DIR%\bin
-       COPY sqlite3.exe.manifest %DEPPKG_DIR%\bin
-       COPY sqlite3.lib %DEPPKG_DIR%\lib
-       COPY sqlite3.h %DEPPKG_DIR%\include
-       EXIT /B 0
-:sqlite_error
-       ECHO Unable to download sqlite source from %URL_SQLITE%
-       EXIT /B 1
-
-:process_wx
-       CALL :get_source %URL_WX% %DIR_WX% %MKD_WX%
-       IF ERRORLEVEL 2 GOTO :wx_error
-REM    IF ERRORLEVEL 1 GOTO :wx_skip_patch
-REM    ECHO Patching wxWidgets
-REM    COPY /Y nul patch.log
-REM    do_patch wx1.patch -o build/msw/config.mingw32
-REM    do_patch wx2.patch
-REM    find . -name makefile.gcc -exec sh -c "sed -f %SCRIPT_DIR%/patches/wx.sed {% > \`ECHO {% | sed s/\.gcc$/\.mingw32/\`" \;
-       ECHO Building wxWidgets
-       cd build\msw
-       COPY /Y nul make.log
-       CALL :do_nmake makefile.vc BUILD=release SHARED=1 VENDOR=bacula DEBUG_INFO=1 CPPFLAGS=-D_USE_32BIT_TIME_T
-       ECHO Installing wxWidgets
-       cd ..\..
-       IF EXIST ..\..\include\wx\nul RD /s /q ..\..\include\wx
-       XCOPY include\wx ..\..\include\wx\ 2>&1
-       XCOPY include\wx\generic ..\..\include\wx\generic\ /e 2>&1
-       XCOPY include\wx\msw ..\..\include\wx\msw\ /e 2>&1
-       XCOPY lib\vc_dll\*.dll ..\..\bin\ /y 
-       IF EXIST ..\..\lib\wx_dll\nul RD /s /q ..\..\lib\wx_dll
-       XCOPY lib\vc_dll\*.lib ..\..\lib\wx_dll\
-       XCOPY lib\vc_dll\msw ..\..\lib\wx_dll\msw\ /e 2>&1
-       EXIT /B 0
-:wx_error
-       ECHO Unable to download wxWidgets source from %URL_MTX%
-       EXIT /B 1
-
-:process_nsis
-       CALL :get_source %URL_NSIS_BIN% %DIR_NSIS_BIN% %MKD_NSIS_BIN%
-       CD ..
-       IF EXIST ..\nsis\nul RD /s /q ..\nsis
-       MOVE nsis-2.17 ..\nsis
-       EXIT /B 0
-
-:process_mtx
-       CALL :get_source %URL_MTX% %DIR_MTX% %MKD_MTX%
-       IF ERRORLEVEL 2 GOTO :mtx_error
-       IF ERRORLEVEL 1 GOTO :mtx_skip_patch
-       ECHO Patching mtx
-       COPY /Y config.h.in config.h
-       COPY /Y Makefile.in Makefile
-       COPY /Y nul patch.log
-       CALL :do_patch mtx.patch
-       CALL :do_patch mtx-msvc1.patch
-       CALL :do_patch mtx-msvc2.patch
-:mtx_skip_patch
-       ECHO Building mtx
-       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% all
-       ECHO Installing mtx
-       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% install
-       EXIT /B 0
-:mtx_error
-       ECHO Unable to download mtx source from %URL_MTX%
-       EXIT /B 1
-
-:process_mt
-       CALL :get_source %URL_MT% %DIR_MT% %MKD_MT%
-       IF ERRORLEVEL 2 GOTO :mt_error
-       IF ERRORLEVEL 1 GOTO :mt_skip_patch
-       ECHO Patching mt
-       COPY /Y nul patch.log
-       CALL :do_patch mt.patch
-:mt_skip_patch
-       ECHO Building mt
-       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% all
-       ECHO Installing mt
-       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% install
-       EXIT /B 0
-:mt_error
-       ECHO Unable to download mt source from %URL_MT%
-       EXIT /B 1
-
-:process_sed
-       CALL :get_source %URL_SED% %DIR_SED% %MKD_SED%
-       IF ERRORLEVEL 2 GOTO :sed_error
-       IF ERRORLEVEL 1 GOTO :sed_skip_patch
-       ECHO Patching sed
-       COPY /Y nul patch.log
-       CALL :do_patch sed_msc.patch
-:sed_skip_patch
-       ECHO Building sed
-       CALL :do_nmake Makefile.msc all
-       ECHO Installing sed
-       CALL :do_nmake Makefile.msc install
-       EXIT /B 0
-:sed_error
-       ECHO Unable to download sed source from %URL_MT%
-       EXIT /B 1
-
-:process_cmd_utils
-       CALL :get_source %URL_CMD_UTILS% %DIR_CMD_UTILS% %MKD_CMD_UTILS%
-       IF ERRORLEVEL 2 GOTO :cmd_utils_error
-       IF ERRORLEVEL 1 GOTO :cmd_utils_skip_patch
-REM    ECHO Patching cmd-utils
-REM    COPY /Y nul patch.log
-REM    CALL :do_patch cmd_utils_msc.patch
-:cmd_utils_skip_patch
-       ECHO Building cmd-utils
-       vcbuild /nologo cmd-utils.sln "Release|WIN32" 2>&1 | tee -a make.log | sed -nf "%DEPPKG_DIR%\src\parse_output.sed"
-       IF ERRORLEVEL 1 GOTO :cmd_utils_build_error
-       ECHO Installing cmd-utils
-       XCOPY Release\*.exe %DEPPKG_DIR%\bin
-       EXIT /B 0
-:cmd_utils_build_error
-       ECHO Make failed - Check %CD%\make.log > con
-       EXIT /B 1
-:cmd_utils_error
-       ECHO Unable to download cmd-utils source from %URL_MT%
-       EXIT /B 1
-
-:process_mkisofs
-       CALL :get_source %URL_MKISOFS% %DIR_MKISOFS% %MKD_MKISOFS%
-       IF ERRORLEVEL 2 GOTO :mkisofs_error
-       ECHO Installing mkisofs
-       FOR %%i IN ( %URL_MKISOFS% ) DO XCOPY %DEPPKG_DIR%\src\%%~nxi %DEPPKG_DIR%\bin /Y /Q >nul 2>&1
-       EXIT /B 0
-:mkisofs_error
-       ECHO Unable to download mkisofs source from %URL_MKISOFS%
-       EXIT /B 1
-
-:process_dvd_rw_tools
-       CALL :get_source %URL_DVD_RW_TOOLS% %DIR_DVD_RW_TOOLS% %MKD_DVD_RW_TOOLS%
-       IF ERRORLEVEL 2 GOTO :dvd_rw_tools_error
-       IF ERRORLEVEL 1 GOTO :dvd_rw_tools_skip_patch
-       ECHO Patching dvd+rw-tools
-       COPY /Y nul patch.log
-       CALL :do_patch dvd+rw-tools.patch
-:dvd_rw_tools_skip_patch
-       ECHO Building dvd+rw-tools
-       IF NOT EXIST Release\nul MKDIR Release
-       CALL :do_nmake Makefile.msc dvd+rw-tools
-       ECHO Installing dvd+rw-tools
-       CALL :do_nmake Makefile.msc prefix=%DEPPKG_DIR% install
-       EXIT /B 0
-:dvd_rw_tools_error
-       ECHO Unable to download dvd+rw-tools source from %URL_DVD_RW_TOOLS%
-       EXIT /B 1
-
-:do_patch
-       SET PATCH_FILE=%SCRIPT_DIR%\patches\%1
-       SHIFT
-       patch -f -p0 %2 %3 %4 %5 %6 %7 %8 %9 >>patch.log < %PATCH_FILE%
-       IF NOT ERRORLEVEL 1 EXIT/B 0
-       ECHO Patch failed - Check %CD%\patch.log > con
-       EXIT /B 1
-
-:do_nmake
-       nmake /nologo -f %* 2>&1 | tee -a make.log | sed -nf "%DEPPKG_DIR%\src\parse_output.sed"
-       IF NOT ERRORLEVEL 1 EXIT /B 0
-       ECHO Make failed - Check %CD%\make.log > con
-       EXIT /B 1
-
-#vss
-#Need to download from Microsoft
+@echo off\r
+SETLOCAL\r
+\r
+SET PERL_PATH=\r
+FOR /F "tokens=1" %%I in ( "perl.exe" ) DO SET PERL_PATH=%%~$PATH:I\r
+\r
+IF NOT "%PERL_PATH%"=="" GOTO :PERL_OK\r
+ECHO Perl must be in your PATH.  Please fix and rerun this script!\r
+EXIT /B 1\r
+\r
+:PERL_OK\r
+\r
+IF "%CLOBBER_SOURCE%"=="" SET CLOBBER_SOURCE=false\r
+\r
+FOR /F "eol=# delims=| tokens=1-4" %%I in ( External-msvc ) DO SET URL_%%I=%%J& SET DIR_%%I=%%K& SET MKD_%%I=%%L\r
+\r
+SET CWD=%CD%\r
+FOR %%I IN ( %0 ) DO CD %%~dpI\r
+SET SCRIPT_DIR=%CD%\r
+\r
+CD ..\..\..\r
+set TOP_DIR=%CD%\r
+\r
+IF NOT EXIST %TOP_DIR%\depkgs-msvc\nul MD %TOP_DIR%\depkgs-msvc\r
+\r
+cd %TOP_DIR%\depkgs-msvc\r
+set DEPPKG_DIR=%CD%\r
+\r
+cd %DEPPKG_DIR%\r
+\r
+IF /I "%CLOBBER_SOURCE:~0,1%"=="y" SET CLOBBER_SOURCE=true\r
+IF /I "%CLOBBER_SOURCE:~0,1%"=="t" SET CLOBBER_SOURCE=true\r
+IF /I "%CLOBBER_SOURCE:~0,1%"=="1" SET CLOBBER_SOURCE=true\r
+\r
+SET PATH=%DEPPKG_DIR%\tools;%PATH%\r
+SET INCLUDE=%INCLUDE%;%DEPPKG_DIR%\include\r
+SET LIB=%LIB%;%DEPPKG_DIR%\lib\r
+\r
+IF NOT EXIST bin\nul MKDIR bin\r
+IF NOT EXIST src\nul MKDIR src\r
+IF NOT EXIST include\nul MKDIR include\r
+IF NOT EXIST lib\nul MKDIR lib\r
+\r
+CD src\r
+\r
+COPY NUL parse_output.sed >nul 2>&1\r
+REM ECHO /\\$/N >>parse_output.sed\r
+REM ECHO s/\\\n// >>parse_output.sed\r
+ECHO s/\t\+/ /g >>parse_output.sed\r
+ECHO s/ \+/ /g >>parse_output.sed\r
+ECHO / [Ee]rror: /p >>parse_output.sed\r
+REM ECHO s;.*Entering directory[ ]\+.%DEPPKG_DIR%/\([^^ ]\+\).;Entering \1;p >>parse_output.sed\r
+REM ECHO s;.*Leaving directory[ ]\+.%DEPPKG_DIR%/\([^^ ]\+.\).;Leaving \1;p >>parse_output.sed\r
+ECHO /[Cc][Ll] \^|[Ll][Ii][Nn][Kk] \^|[Ll][Ii][Bb] /!d >>parse_output.sed\r
+ECHO s; \(\.\.\\\)\+; ;g >>parse_output.sed\r
+ECHO s; \.\\; ;g >>parse_output.sed\r
+ECHO s/.* \([^^ ]\+\(\.[Cc]\^|\.[Cc][Pp][Pp]\^|\.[Cc][Cc]\^|\.[Cc][Xx][Xx]\)\)\( .*\^|\)$/Compiling \1/p >>parse_output.sed\r
+ECHO s/.* \([^^ ]\+\.[Aa][Ss][Mm]\)\( .*\^|\)$/Assembling \1/p >>parse_output.sed\r
+ECHO s/.* \/[Oo][Uu][Tt]:\(\.\\\)*\(\.\.\\\)*\([^^ ]\+\)\( .*\^|\)$/Linking \3/p >>parse_output.sed\r
+REM ECHO s/.*[Ll][Ii][Bb] [^^ ]\+ \([^^ ]\+\)\(\( [^^ ]\+\.o\)\+\)/Updating \1 -\2/p >>parse_output.sed\r
+\r
+IF NOT "%1"=="" GOTO :ProcessArgs\r
+       CALL :process_zlib\r
+REM    CALL :process_pcre\r
+       CALL :process_pthreads\r
+       CALL :process_openssl\r
+       CALL :process_mysql\r
+       CALL :process_sqlite\r
+       CALL :process_postgreSQL\r
+       CALL :process_wx\r
+REM    CALL :process_scons\r
+       CALL :process_nsis\r
+       CALL :process_mtx\r
+       CALL :process_mt\r
+       CALL :process_sed\r
+       CALL :process_cmd_utils\r
+       CALL :process_mkisofs\r
+       CALL :process_dvd_rw_tools\r
+       GOTO :EOF\r
+\r
+:ProcessArgs\r
+       IF "%1"=="" GOTO :EOF\r
+       \r
+       CALL :process_%1\r
+       SHIFT\r
+       GOTO :ProcessArgs\r
+\r
+:get_source\r
+       SET URL=%1\r
+       SET SRC_DIR=%2\r
+       SET MAKE_SRC_ENABLE=%3\r
+       SET BASENAME=\r
+\r
+       IF NOT "%SRC_DIR%"=="" GOTO :get_source_make_src\r
+       FOR %%I IN ( %URL% ) DO (SET BASENAME=%%~nI& IF NOT "%%~xI"==".gz" IF NOT "%%~xI"==".bz2" SET SRC_DIR=%%~nI)\r
+       IF "%SRC_DIR%"=="" FOR %%I IN ( %BASENAME% ) DO SET SRC_DIR=%%~nI\r
+\r
+:get_source_make_src\r
+       SET MAKE_SRC_DIR=\r
+       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="y" SET MAKE_SRC_DIR=true\r
+       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="t" SET MAKE_SRC_DIR=true\r
+       IF /I "%MAKE_SRC_ENABLE:~0,1%"=="1" SET MAKE_SRC_DIR=true\r
+\r
+       FOR %%I IN ( %URL% ) DO ( SET ARCHIVE=%%~nxI& SET ARCHIVE_EXT=%%~xI)\r
+       \r
+       CD %DEPPKG_DIR%\src\r
+       \r
+       IF EXIST %ARCHIVE% GOTO :get_source_check_srcdir\r
+       ECHO Downloading %URL%\r
+       wget -nv --passive-ftp "%URL%"\r
+       IF NOT ERRORLEVEL 1 GOTO :get_source_extract\r
+       ECHO Unable to download %ARCHIVE%\r
+       EXIT /B 2\r
+\r
+:get_source_check_srcdir\r
+       IF /I "%ARCHIVE_EXT%"==".exe" EXIT /B 0\r
+       IF NOT EXIST %SRC_DIR%\nul GOTO :get_source_extract\r
+       IF NOT "%CLOBBER_SOURCE%"=="true" GOTO :get_source_skipped\r
+       IF EXIST %SRC_DIR%\nul RD /s /q "%SRC_DIR%"\r
+:get_source_extract\r
+       IF /I "%ARCHIVE_EXT%"==".exe" EXIT /B 0\r
+       SET TAR_ARCHIVE=\r
+       FOR %%I IN ( "%ARCHIVE%" ) do IF "%%~xI"==".gz" SET TAR_ARCHIVE=%%~nI\r
+       FOR %%I IN ( "%ARCHIVE%" ) do IF "%%~xI"==".bz2" SET TAR_ARCHIVE=%%~nI\r
+\r
+       SET TARGET_DIR=.\r
+       IF DEFINED MAKE_SRC_DIR IF NOT EXIST %SRC_DIR%\nul MKDIR %SRC_DIR%\r
+       IF DEFINED MAKE_SRC_DIR SET TARGET_DIR=%SRC_DIR%\r
+\r
+       ECHO Extracting %ARCHIVE%\r
+       7z x -bd -y -o"%TARGET_DIR%" "%ARCHIVE%" 2>&1 > "%ARCHIVE%.log"\r
+       IF ERRORLEVEL 1 EXIT /B 2\r
+       IF NOT DEFINED TAR_ARCHIVE GOTO :get_source_done\r
+       ECHO Extracting %TAR_ARCHIVE%\r
+       7z x -bd -y -o"%TARGET_DIR%" "%TARGET_DIR%\%TAR_ARCHIVE%" & del /q "%TAR_ARCHIVE%" 2>&1 >> "%ARCHIVE%.log"\r
+\r
+:get_source_done\r
+       CD "%SRC_DIR%"\r
+       EXIT /B 0\r
+\r
+:get_source_skipped\r
+       CD %SRC_DIR%\r
+       EXIT /B 1\r
+\r
+:process_zlib\r
+       CALL :get_source %URL_ZLIB% %DIR_ZLIB% %MKD_ZLIB%\r
+       ECHO Building zlib\r
+       COPY /Y nul make.log\r
+REM    XCOPY contrib\masmx86\gvmat32.asm . /Y\r
+REM    XCOPY contrib\masmx86\gvmat32c.c . /Y\r
+REM    XCOPY contrib\masmx86\inffas32.asm . /Y\r
+REM    CALL :do_nmake win32\Makefile.msc AS=nasmw ASFLAGS= LOC="-D_CRT_SECURE_NO_DEPRECATE -DASMV -DASMINF" OBJA="gvmat32c.obj gvmat32.obj inffas32.obj" all\r
+       CALL :do_nmake win32\Makefile.msc LOC="-D_CRT_SECURE_NO_DEPRECATE" all\r
+       ECHO Installing zlib\r
+       XCOPY zlib1.dll.manifest %DEPPKG_DIR%\bin\ /Y\r
+       XCOPY zlib1.dll %DEPPKG_DIR%\bin\ /Y\r
+       XCOPY zlib.lib %DEPPKG_DIR%\lib\ /Y\r
+       XCOPY zdll.lib %DEPPKG_DIR%\lib\ /Y\r
+       XCOPY zlib.h %DEPPKG_DIR%\include\ /Y\r
+       XCOPY zconf.h %DEPPKG_DIR%\include\ /Y\r
+       EXIT /B 0\r
+\r
+:process_pcre\r
+       CALL :get_source %URL_PCRE% %DIR_PCRE% %MKD_PCRE%\r
+REM    ECHO Patching PCRE\r
+REM    COPY /Y nul patch.log\r
+REM    do_patch pcre.patch\r
+       ECHO Configuring PCRE\r
+       ./configure CC_FOR_BUILD=gcc CXX_FOR_BUILD=g++ --host=mingw32 --prefix=%DEPPKG_DIR% --enable-utf8 --enable-unicode-properties 2>&1 > make.log\r
+       ECHO Building PCRE\r
+       do_make Makefile PREFIX=%DEPPKG_DIR% all\r
+       ECHO Installing PCRE\r
+       do_make Makefile PREFIX=%DEPPKG_DIR% install\r
+       EXIT /B 0\r
+\r
+:process_pthreads\r
+       CALL :get_source %URL_PTHREADS% %DIR_PTHREADS% %MKD_PTHREADS%\r
+       FOR %%I IN ( %URL_PTHREADS% ) DO (SET ARCHIVE=%%~nxI)\r
+       IF EXIST %SRC_DIR%\nul GOTO :install_pthreads\r
+       ECHO Extracting %ARCHIVE%\r
+       7z x -bd -y -o"%DIR_PTHREADS%" "%ARCHIVE%" 2>&1 > "%ARCHIVE%.log"\r
+:install_pthreads\r
+       CD %DIR_PTHREADS%\r
+       ECHO Installing pthreads\r
+       XCOPY Pre-built\include\*.h %DEPPKG_DIR%\include\ /Y\r
+       XCOPY Pre-built\lib\pthreadVCE.lib %DEPPKG_DIR%\lib\ /Y\r
+       XCOPY Pre-built\lib\pthreadVCE.dll %DEPPKG_DIR%\bin\ /Y\r
+       EXIT /B 0\r
+\r
+:process_openssl\r
+       CALL :get_source %URL_OPENSSL% %DIR_OPENSSL% %MKD_OPENSSL%\r
+       IF ERRORLEVEL 2 GOTO :OpenSSLError\r
+       ECHO Configuring openssl\r
+       perl Configure VC-WIN32 --prefix=%DEPPKG_DIR:\=/% > make.log\r
+       ECHO Building openssl\r
+       CALL ms\do_nasm\r
+       @ECHO off\r
+       CALL :do_nmake ms\ntdll.mak \r
+       @ECHO off\r
+       ECHO Installing openssl\r
+       CALL :do_nmake ms\ntdll.mak install\r
+       EXIT /B 0\r
+:OpenSSLError\r
+       ECHO Unable to download OpenSSL source from %URL_OPENSSL%\r
+       EXIT /B 1\r
+\r
+:process_mysql\r
+       CALL :get_source %URL_MYSQL% %DIR_MYSQL% %MKD_MYSQL%\r
+       ECHO Installing mysql\r
+       IF EXIST ..\..\include\mysql\nul RD /s /q ..\..\include\mysql\r
+       XCOPY include\* ..\..\include\mysql\ /e/h/k/y 2>&1\r
+       XCOPY lib\opt\libmysql.lib ..\..\lib\ /y\r
+       XCOPY lib\opt\libmysql.dll ..\..\bin\ /y\r
+       EXIT /B 0\r
+\r
+:process_postgreSQL\r
+       CALL :get_source %URL_POSTGRESQL% %DIR_POSTGRESQL% %MKD_POSTGRESQL%\r
+       IF ERRORLEVEL 2 GOTO :pstgreSQL_Error1\r
+       CALL :get_source %URL_POSTGRESQL_SRC% %DIR_POSTGRESQL_SRC% %MKD_POSTGRESQL_SRC%\r
+       IF ERRORLEVEL 2 GOTO :pstgreSQL_Error2\r
+REM    ECHO Patching postgreSQL\r
+REM    COPY /Y nul patch.log\r
+REM    do_patch postgresql.patch\r
+       ECHO Installing postgreSQL\r
+       XCOPY ..\pgsql\include\libpq-fe.h ..\..\include\ /Y 2>&1\r
+       XCOPY ..\pgsql\include\postgres_ext.h ..\..\include\ /Y 2>&1\r
+       LIB /def:src\interfaces\libpq\libpqdll.def /out:..\..\lib\libpqdll.lib /machine:x86 /subsystem:console\r
+       XCOPY ..\pgsql\lib\libpq.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\lib\comerr32.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\lib\krb5_32.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\lib\libintl-2.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\lib\libiconv-2.dll ..\..\bin\ /Y\r
+       EXIT /B 0\r
+:pstgreSQL_Error1\r
+       ECHO Unable to download postgreSQL binaries from %URL_POSTGRESQL%\r
+       EXIT /B 1\r
+:pstgreSQL_Error2\r
+       ECHO Unable to download postgreSQL source from %URL_POSTGRESQL_SRC%\r
+       EXIT /B 1\r
+\r
+:process_sqlite\r
+       CALL :get_source %URL_SQLITE% %DIR_SQLITE% %MKD_SQLITE%\r
+       IF ERRORLEVEL 2 GOTO :sqlite_error\r
+       IF ERRORLEVEL 1 GOTO :sqlite_skip_patch\r
+       ECHO Patching SQLite\r
+       COPY /Y nul patch.log\r
+       CALL :do_patch sqlite_msc.patch\r
+:sqlite_skip_patch\r
+       ECHO Configuring SQLite\r
+       IF NOT EXIST bld/nul MKDIR bld\r
+       CD bld\r
+       ECHO Building SQLite\r
+       COPY /Y nul make.log\r
+       CALL :do_nmake ../Makefile.msvc clean all\r
+       ECHO Installing SQLite\r
+       COPY sqlite3.exe %DEPPKG_DIR%\bin\r
+       COPY sqlite3.exe.manifest %DEPPKG_DIR%\bin\r
+       COPY sqlite3.lib %DEPPKG_DIR%\lib\r
+       COPY sqlite3.h %DEPPKG_DIR%\include\r
+       EXIT /B 0\r
+:sqlite_error\r
+       ECHO Unable to download sqlite source from %URL_SQLITE%\r
+       EXIT /B 1\r
+\r
+:process_wx\r
+       CALL :get_source %URL_WX% %DIR_WX% %MKD_WX%\r
+       IF ERRORLEVEL 2 GOTO :wx_error\r
+REM    IF ERRORLEVEL 1 GOTO :wx_skip_patch\r
+REM    ECHO Patching wxWidgets\r
+REM    COPY /Y nul patch.log\r
+REM    do_patch wx1.patch -o build/msw/config.mingw32\r
+REM    do_patch wx2.patch\r
+REM    find . -name makefile.gcc -exec sh -c "sed -f %SCRIPT_DIR%/patches/wx.sed {% > \`ECHO {% | sed s/\.gcc$/\.mingw32/\`" \;\r
+       ECHO Building wxWidgets\r
+       cd build\msw\r
+       COPY /Y nul make.log\r
+       CALL :do_nmake makefile.vc BUILD=release SHARED=1 VENDOR=bacula DEBUG_INFO=1 CPPFLAGS=-D_USE_32BIT_TIME_T\r
+       ECHO Installing wxWidgets\r
+       cd ..\..\r
+       IF EXIST ..\..\include\wx\nul RD /s /q ..\..\include\wx\r
+       XCOPY include\wx ..\..\include\wx\ 2>&1\r
+       XCOPY include\wx\generic ..\..\include\wx\generic\ /e 2>&1\r
+       XCOPY include\wx\msw ..\..\include\wx\msw\ /e 2>&1\r
+       XCOPY lib\vc_dll\*.dll ..\..\bin\ /y \r
+       IF EXIST ..\..\lib\wx_dll\nul RD /s /q ..\..\lib\wx_dll\r
+       XCOPY lib\vc_dll\*.lib ..\..\lib\wx_dll\\r
+       XCOPY lib\vc_dll\msw ..\..\lib\wx_dll\msw\ /e 2>&1\r
+       EXIT /B 0\r
+:wx_error\r
+       ECHO Unable to download wxWidgets source from %URL_MTX%\r
+       EXIT /B 1\r
+\r
+:process_nsis\r
+       CALL :get_source %URL_NSIS_BIN% %DIR_NSIS_BIN% %MKD_NSIS_BIN%\r
+       CD ..\r
+       IF EXIST ..\nsis\nul RD /s /q ..\nsis\r
+       MOVE nsis-2.17 ..\nsis\r
+       EXIT /B 0\r
+\r
+:process_mtx\r
+       CALL :get_source %URL_MTX% %DIR_MTX% %MKD_MTX%\r
+       IF ERRORLEVEL 2 GOTO :mtx_error\r
+       IF ERRORLEVEL 1 GOTO :mtx_skip_patch\r
+       ECHO Patching mtx\r
+       COPY /Y config.h.in config.h\r
+       COPY /Y Makefile.in Makefile\r
+       COPY /Y nul patch.log\r
+       CALL :do_patch mtx.patch\r
+       CALL :do_patch mtx-msvc1.patch\r
+       CALL :do_patch mtx-msvc2.patch\r
+:mtx_skip_patch\r
+       ECHO Building mtx\r
+       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% all\r
+       ECHO Installing mtx\r
+       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% install\r
+       EXIT /B 0\r
+:mtx_error\r
+       ECHO Unable to download mtx source from %URL_MTX%\r
+       EXIT /B 1\r
+\r
+:process_mt\r
+       CALL :get_source %URL_MT% %DIR_MT% %MKD_MT%\r
+       IF ERRORLEVEL 2 GOTO :mt_error\r
+       IF ERRORLEVEL 1 GOTO :mt_skip_patch\r
+       ECHO Patching mt\r
+       COPY /Y nul patch.log\r
+       CALL :do_patch mt.patch\r
+:mt_skip_patch\r
+       ECHO Building mt\r
+       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% all\r
+       ECHO Installing mt\r
+       CALL :do_nmake Makefile.msc PREFIX=%DEPPKG_DIR% install\r
+       EXIT /B 0\r
+:mt_error\r
+       ECHO Unable to download mt source from %URL_MT%\r
+       EXIT /B 1\r
+\r
+:process_sed\r
+       CALL :get_source %URL_SED% %DIR_SED% %MKD_SED%\r
+       IF ERRORLEVEL 2 GOTO :sed_error\r
+       IF ERRORLEVEL 1 GOTO :sed_skip_patch\r
+       ECHO Patching sed\r
+       COPY /Y nul patch.log\r
+       CALL :do_patch sed_msc.patch\r
+:sed_skip_patch\r
+       ECHO Building sed\r
+       CALL :do_nmake Makefile.msc all\r
+       ECHO Installing sed\r
+       CALL :do_nmake Makefile.msc install\r
+       EXIT /B 0\r
+:sed_error\r
+       ECHO Unable to download sed source from %URL_MT%\r
+       EXIT /B 1\r
+\r
+:process_cmd_utils\r
+       CALL :get_source %URL_CMD_UTILS% %DIR_CMD_UTILS% %MKD_CMD_UTILS%\r
+       IF ERRORLEVEL 2 GOTO :cmd_utils_error\r
+       IF ERRORLEVEL 1 GOTO :cmd_utils_skip_patch\r
+REM    ECHO Patching cmd-utils\r
+REM    COPY /Y nul patch.log\r
+REM    CALL :do_patch cmd_utils_msc.patch\r
+:cmd_utils_skip_patch\r
+       ECHO Building cmd-utils\r
+       vcbuild /nologo cmd-utils.sln "Release|WIN32" 2>&1 | tee -a make.log | sed -nf "%DEPPKG_DIR%\src\parse_output.sed"\r
+       IF ERRORLEVEL 1 GOTO :cmd_utils_build_error\r
+       ECHO Installing cmd-utils\r
+       XCOPY Release\*.exe %DEPPKG_DIR%\bin\r
+       EXIT /B 0\r
+:cmd_utils_build_error\r
+       ECHO Make failed - Check %CD%\make.log > con\r
+       EXIT /B 1\r
+:cmd_utils_error\r
+       ECHO Unable to download cmd-utils source from %URL_MT%\r
+       EXIT /B 1\r
+\r
+:process_mkisofs\r
+       CALL :get_source %URL_MKISOFS% %DIR_MKISOFS% %MKD_MKISOFS%\r
+       IF ERRORLEVEL 2 GOTO :mkisofs_error\r
+       ECHO Installing mkisofs\r
+       FOR %%i IN ( %URL_MKISOFS% ) DO XCOPY %DEPPKG_DIR%\src\%%~nxi %DEPPKG_DIR%\bin /Y /Q >nul 2>&1\r
+       EXIT /B 0\r
+:mkisofs_error\r
+       ECHO Unable to download mkisofs source from %URL_MKISOFS%\r
+       EXIT /B 1\r
+\r
+:process_dvd_rw_tools\r
+       CALL :get_source %URL_DVD_RW_TOOLS% %DIR_DVD_RW_TOOLS% %MKD_DVD_RW_TOOLS%\r
+       IF ERRORLEVEL 2 GOTO :dvd_rw_tools_error\r
+       IF ERRORLEVEL 1 GOTO :dvd_rw_tools_skip_patch\r
+       ECHO Patching dvd+rw-tools\r
+       COPY /Y nul patch.log\r
+       CALL :do_patch dvd+rw-tools.patch\r
+:dvd_rw_tools_skip_patch\r
+       ECHO Building dvd+rw-tools\r
+       IF NOT EXIST Release\nul MKDIR Release\r
+       CALL :do_nmake Makefile.msc dvd+rw-tools\r
+       ECHO Installing dvd+rw-tools\r
+       CALL :do_nmake Makefile.msc prefix=%DEPPKG_DIR% install\r
+       EXIT /B 0\r
+:dvd_rw_tools_error\r
+       ECHO Unable to download dvd+rw-tools source from %URL_DVD_RW_TOOLS%\r
+       EXIT /B 1\r
+\r
+:do_patch\r
+       SET PATCH_FILE=%SCRIPT_DIR%\patches\%1\r
+       SHIFT\r
+       patch -f -p0 %2 %3 %4 %5 %6 %7 %8 %9 >>patch.log < %PATCH_FILE%\r
+       IF NOT ERRORLEVEL 1 EXIT/B 0\r
+       ECHO Patch failed - Check %CD%\patch.log > con\r
+       EXIT /B 1\r
+\r
+:do_nmake\r
+       nmake /nologo -f %* 2>&1 | tee -a make.log | sed -nf "%DEPPKG_DIR%\src\parse_output.sed"\r
+       IF NOT ERRORLEVEL 1 EXIT /B 0\r
+       ECHO Make failed - Check %CD%\make.log > con\r
+       EXIT /B 1\r
+\r
+#vss\r
+#Need to download from Microsoft\r
index 8265adb2d8c843cc0874cf98badd5c379ba9cef1..ae6434df13431f726ba6de790946f5449e84a7cd 100644 (file)
@@ -1,7 +1,7 @@
-@echo off
-setlocal
-PATH ..\..\..\depkgs-msvc\tools;%PATH%
-for /f %%i in ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\version.h' ) do @set VERSION=%%i 
-echo Building Bacula version %VERSION%
-vcbuild bacula.sln %*
-endlocal
+@echo off\r
+setlocal\r
+PATH ..\..\..\depkgs-msvc\tools;%PATH%\r
+for /f %%i in ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\version.h' ) do @set VERSION=%%i \r
+echo Building Bacula version %VERSION%\r
+vcbuild bacula.sln %*\r
+endlocal\r
index a967f642896c66fe79a2e3b61a04ab16706ca8d6..7cf4871f24480a5b418a202fb53c364c231d784b 100644 (file)
-LIBRARY bacula_cats.dll
-EXPORTS
-
-; bdb.c:
-; mysql.c:
-; postgresql.c:
-; sqlite.c:
-_Z11db_get_typev
-_Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_
-_Z16db_escape_stringPcS_i
-_Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i
-_Z16db_open_databaseP3JCRP4B_DB
-_Z17db_close_databaseP3JCRP4B_DB
-
-; sql.c:
-_Z10_db_unlockPKciP4B_DB
-_Z11db_strerrorP4B_DB
-_Z16db_int64_handlerPviPPc
-_Z18db_end_transactionP3JCRP4B_DB
-_Z20db_start_transactionP3JCRP4B_DB
-_Z8_db_lockPKciP4B_DB
-
-; bdb_create.c:
-; sql_create.c:
-_Z20db_create_job_recordP3JCRP4B_DBP7JOB_DBR
-_Z21db_create_pool_recordP3JCRP4B_DBP8POOL_DBR
-_Z22db_create_media_recordP3JCRP4B_DBP9MEDIA_DBR
-_Z23db_create_client_recordP3JCRP4B_DBP10CLIENT_DBR
-_Z24db_create_counter_recordP3JCRP4B_DBP11COUNTER_DBR
-_Z24db_create_fileset_recordP3JCRP4B_DBP11FILESET_DBR
-_Z24db_create_storage_recordP3JCRP4B_DBP11STORAGE_DBR
-_Z25db_create_jobmedia_recordP3JCRP4B_DBP12JOBMEDIA_DBR
-_Z26db_create_mediatype_recordP3JCRP4B_DBP13MEDIATYPE_DBR
-_Z32db_create_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR
-
-; bdb_delete.c:
-; sql_delete.c:
-_Z21db_delete_pool_recordP3JCRP4B_DBP8POOL_DBR
-_Z22db_delete_media_recordP3JCRP4B_DBP9MEDIA_DBR
-
-; bdb_find.c:
-; sql_find.c:
-_Z18db_find_last_jobidP3JCRP4B_DBPKcP7JOB_DBR
-_Z19db_find_next_volumeP3JCRP4B_DBibP9MEDIA_DBR
-_Z22db_find_job_start_timeP3JCRP4B_DBP7JOB_DBRPPc
-_Z24db_find_failed_job_sinceP3JCRP4B_DBP7JOB_DBRPcRi
-
-; bdb_get.c:
-; sql_get.c:
-_Z15db_get_pool_idsP3JCRP4B_DBPiPPj
-_Z16db_get_media_idsP3JCRP4B_DBjPiPPj
-_Z17db_get_client_idsP3JCRP4B_DBPiPPj
-_Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR
-_Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR
-_Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR
-_Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR
-_Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR
-_Z23db_get_job_volume_namesP3JCRP4B_DBjPPc
-_Z28db_get_job_volume_parametersP3JCRP4B_DBjPP10VOL_PARAMS
-_Z29db_get_file_attributes_recordP3JCRP4B_DBPcP7JOB_DBRP8FILE_DBR
-
-; bdb_list.c:
-; sql_list.c:
-_Z17db_list_sql_queryP3JCRP4B_DBPKcPFvPvS4_ES5_i11e_list_type
-_Z18db_list_job_totalsP3JCRP4B_DBP7JOB_DBRPFvPvPKcES5_
-_Z19db_list_job_recordsP3JCRP4B_DBP7JOB_DBRPFvPvPKcES5_11e_list_type
-_Z20db_list_pool_recordsP3JCRP4B_DBP8POOL_DBRPFvPvPKcES5_11e_list_type
-_Z21db_list_files_for_jobP3JCRP4B_DBjPFvPvPKcES3_
-_Z21db_list_media_recordsP3JCRP4B_DBP9MEDIA_DBRPFvPvPKcES5_11e_list_type
-_Z22db_list_client_recordsP3JCRP4B_DBPFvPvPKcES3_11e_list_type
-_Z24db_list_jobmedia_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type
-
-; bdb_update.c:
-; sql_update.c:
-_Z19db_mark_file_recordP3JCRP4B_DBjj
-_Z21db_update_pool_recordP3JCRP4B_DBP8POOL_DBR
-_Z22db_update_media_recordP3JCRP4B_DBP9MEDIA_DBR
-_Z23db_update_client_recordP3JCRP4B_DBP10CLIENT_DBR
-_Z24db_make_inchanger_uniqueP3JCRP4B_DBP9MEDIA_DBR
-_Z24db_update_counter_recordP3JCRP4B_DBP11COUNTER_DBR
-_Z24db_update_job_end_recordP3JCRP4B_DBP7JOB_DBR
-_Z24db_update_media_defaultsP3JCRP4B_DBP9MEDIA_DBR
-_Z24db_update_storage_recordP3JCRP4B_DBP11STORAGE_DBR
-_Z26db_update_job_start_recordP3JCRP4B_DBP7JOB_DBR
-_Z28db_add_digest_to_file_recordP3JCRP4B_DBjPci
-
-client_backups DATA
-list_pool DATA
-drop_deltabs DATA
-create_deltabs DATA
-insert_delcand DATA
-select_backup_del DATA
-select_verify_del DATA
-select_restore_del DATA
-select_admin_del DATA
-select_migrate_del DATA
-select_job DATA
-del_File DATA
-cnt_DelCand DATA
-del_Job DATA
-del_JobMedia DATA
-cnt_JobMedia DATA
-sel_JobMedia DATA
-upd_Purged DATA
-
-uar_list_jobs DATA
-uar_file DATA
-uar_count_files DATA
-uar_sel_files DATA
-uar_del_temp DATA
-uar_del_temp1 DATA
-uar_create_temp DATA
-uar_create_temp1 DATA
-uar_last_full DATA
-uar_full DATA
-uar_inc DATA
-uar_list_temp DATA
-uar_sel_all_temp1 DATA
-uar_sel_fileset DATA
-uar_mediatype DATA
-uar_jobid_fileindex DATA
-uar_dif DATA
-uar_sel_all_temp DATA
-uar_count_files DATA
-uar_jobids_fileindex DATA
-uar_jobid_fileindex_from_dir DATA
-uar_jobid_fileindex_from_table DATA
-uar_sel_jobid_temp DATA
+LIBRARY bacula_cats.dll\r
+EXPORTS\r
+\r
+; bdb.c:\r
+; mysql.c:\r
+; postgresql.c:\r
+; sqlite.c:\r
+_Z11db_get_typev\r
+_Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_\r
+_Z16db_escape_stringPcS_i\r
+_Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i\r
+_Z16db_open_databaseP3JCRP4B_DB\r
+_Z17db_close_databaseP3JCRP4B_DB\r
+\r
+; sql.c:\r
+_Z10_db_unlockPKciP4B_DB\r
+_Z11db_strerrorP4B_DB\r
+_Z16db_int64_handlerPviPPc\r
+_Z18db_end_transactionP3JCRP4B_DB\r
+_Z20db_start_transactionP3JCRP4B_DB\r
+_Z8_db_lockPKciP4B_DB\r
+\r
+; bdb_create.c:\r
+; sql_create.c:\r
+_Z20db_create_job_recordP3JCRP4B_DBP7JOB_DBR\r
+_Z21db_create_pool_recordP3JCRP4B_DBP8POOL_DBR\r
+_Z22db_create_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
+_Z23db_create_client_recordP3JCRP4B_DBP10CLIENT_DBR\r
+_Z24db_create_counter_recordP3JCRP4B_DBP11COUNTER_DBR\r
+_Z24db_create_fileset_recordP3JCRP4B_DBP11FILESET_DBR\r
+_Z24db_create_storage_recordP3JCRP4B_DBP11STORAGE_DBR\r
+_Z25db_create_jobmedia_recordP3JCRP4B_DBP12JOBMEDIA_DBR\r
+_Z26db_create_mediatype_recordP3JCRP4B_DBP13MEDIATYPE_DBR\r
+_Z32db_create_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR\r
+\r
+; bdb_delete.c:\r
+; sql_delete.c:\r
+_Z21db_delete_pool_recordP3JCRP4B_DBP8POOL_DBR\r
+_Z22db_delete_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
+\r
+; bdb_find.c:\r
+; sql_find.c:\r
+_Z18db_find_last_jobidP3JCRP4B_DBPKcP7JOB_DBR\r
+_Z19db_find_next_volumeP3JCRP4B_DBibP9MEDIA_DBR\r
+_Z22db_find_job_start_timeP3JCRP4B_DBP7JOB_DBRPPc\r
+_Z24db_find_failed_job_sinceP3JCRP4B_DBP7JOB_DBRPcRi\r
+\r
+; bdb_get.c:\r
+; sql_get.c:\r
+_Z15db_get_pool_idsP3JCRP4B_DBPiPPj\r
+_Z16db_get_media_idsP3JCRP4B_DBjPiPPj\r
+_Z17db_get_client_idsP3JCRP4B_DBPiPPj\r
+_Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR\r
+_Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR\r
+_Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
+_Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR\r
+_Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR\r
+_Z23db_get_job_volume_namesP3JCRP4B_DBjPPc\r
+_Z28db_get_job_volume_parametersP3JCRP4B_DBjPP10VOL_PARAMS\r
+_Z29db_get_file_attributes_recordP3JCRP4B_DBPcP7JOB_DBRP8FILE_DBR\r
+\r
+; bdb_list.c:\r
+; sql_list.c:\r
+_Z17db_list_sql_queryP3JCRP4B_DBPKcPFvPvS4_ES5_i11e_list_type\r
+_Z18db_list_job_totalsP3JCRP4B_DBP7JOB_DBRPFvPvPKcES5_\r
+_Z19db_list_job_recordsP3JCRP4B_DBP7JOB_DBRPFvPvPKcES5_11e_list_type\r
+_Z20db_list_pool_recordsP3JCRP4B_DBP8POOL_DBRPFvPvPKcES5_11e_list_type\r
+_Z21db_list_files_for_jobP3JCRP4B_DBjPFvPvPKcES3_\r
+_Z21db_list_media_recordsP3JCRP4B_DBP9MEDIA_DBRPFvPvPKcES5_11e_list_type\r
+_Z22db_list_client_recordsP3JCRP4B_DBPFvPvPKcES3_11e_list_type\r
+_Z24db_list_jobmedia_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type\r
+\r
+; bdb_update.c:\r
+; sql_update.c:\r
+_Z19db_mark_file_recordP3JCRP4B_DBjj\r
+_Z21db_update_pool_recordP3JCRP4B_DBP8POOL_DBR\r
+_Z22db_update_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
+_Z23db_update_client_recordP3JCRP4B_DBP10CLIENT_DBR\r
+_Z24db_make_inchanger_uniqueP3JCRP4B_DBP9MEDIA_DBR\r
+_Z24db_update_counter_recordP3JCRP4B_DBP11COUNTER_DBR\r
+_Z24db_update_job_end_recordP3JCRP4B_DBP7JOB_DBR\r
+_Z24db_update_media_defaultsP3JCRP4B_DBP9MEDIA_DBR\r
+_Z24db_update_storage_recordP3JCRP4B_DBP11STORAGE_DBR\r
+_Z26db_update_job_start_recordP3JCRP4B_DBP7JOB_DBR\r
+_Z28db_add_digest_to_file_recordP3JCRP4B_DBjPci\r
+\r
+client_backups DATA\r
+list_pool DATA\r
+drop_deltabs DATA\r
+create_deltabs DATA\r
+insert_delcand DATA\r
+select_backup_del DATA\r
+select_verify_del DATA\r
+select_restore_del DATA\r
+select_admin_del DATA\r
+select_migrate_del DATA\r
+select_job DATA\r
+del_File DATA\r
+cnt_DelCand DATA\r
+del_Job DATA\r
+del_JobMedia DATA\r
+cnt_JobMedia DATA\r
+sel_JobMedia DATA\r
+upd_Purged DATA\r
+\r
+uar_list_jobs DATA\r
+uar_file DATA\r
+uar_count_files DATA\r
+uar_sel_files DATA\r
+uar_del_temp DATA\r
+uar_del_temp1 DATA\r
+uar_create_temp DATA\r
+uar_create_temp1 DATA\r
+uar_last_full DATA\r
+uar_full DATA\r
+uar_inc DATA\r
+uar_list_temp DATA\r
+uar_sel_all_temp1 DATA\r
+uar_sel_fileset DATA\r
+uar_mediatype DATA\r
+uar_jobid_fileindex DATA\r
+uar_dif DATA\r
+uar_sel_all_temp DATA\r
+uar_count_files DATA\r
+uar_jobids_fileindex DATA\r
+uar_jobid_fileindex_from_dir DATA\r
+uar_jobid_fileindex_from_table DATA\r
+uar_sel_jobid_temp DATA\r
index 7eb0f9ce422d47d8dd94c1232b45a87925e40f65..c036655970c65993c26946188f40dd455e0c83cb 100644 (file)
-LIBRARY bacula_cats.dll
-EXPORTS
-
-; bdb.c:
-; mysql.c:
-; postgresql.c:
-; sqlite.c:
-?db_get_type@@YAPBDXZ
-?db_sql_query@@YAHPAUB_DB@@PBDP6AHPAXHPAPAD@Z2@Z
-?db_escape_string@@YAXPAD0H@Z
-?db_init_database@@YAPAUB_DB@@PAVJCR@@PBD111H1H@Z
-?db_open_database@@YAHPAVJCR@@PAUB_DB@@@Z
-?db_close_database@@YAXPAVJCR@@PAUB_DB@@@Z
-
-; sql.c:
-?_db_unlock@@YAXPBDHPAUB_DB@@@Z
-?db_strerror@@YAPADPAUB_DB@@@Z
-?db_int64_handler@@YAHPAXHPAPAD@Z
-?db_end_transaction@@YAXPAVJCR@@PAUB_DB@@@Z
-?db_start_transaction@@YAXPAVJCR@@PAUB_DB@@@Z
-?_db_lock@@YAXPBDHPAUB_DB@@@Z
-
-; sql_cmds.c
-?list_pool@@3PBDB DATA
-?client_backups@@3PBDB DATA
-?del_File@@3PBDB DATA
-?upd_Purged@@3PBDB DATA
-?cnt_DelCand@@3PBDB DATA
-?del_Job@@3PBDB DATA
-?del_JobMedia@@3PBDB DATA
-?cnt_JobMedia@@3PBDB DATA
-?sel_JobMedia@@3PBDB DATA
-?select_job@@3PBDB DATA
-?drop_deltabs@@3PAPBDA DATA
-?create_deltabs@@3PAPBDA DATA
-?insert_delcand@@3PBDB DATA
-?select_backup_del@@3PBDB DATA
-?select_verify_del@@3PBDB DATA
-?select_restore_del@@3PBDB DATA
-?select_admin_del@@3PBDB DATA
-?select_migrate_del@@3PBDB DATA
-?uar_count_files@@3PBDB DATA
-?uar_list_jobs@@3PBDB DATA
-?uar_file@@3PBDB DATA
-?uar_sel_files@@3PBDB DATA
-?uar_del_temp@@3PBDB DATA
-?uar_del_temp1@@3PBDB DATA
-?uar_create_temp@@3PBDB DATA
-?uar_create_temp1@@3PBDB DATA
-?uar_last_full@@3PBDB DATA
-?uar_full@@3PBDB DATA
-?uar_dif@@3PBDB DATA
-?uar_inc@@3PBDB DATA
-?uar_list_temp@@3PBDB DATA
-?uar_sel_jobid_temp@@3PBDB DATA
-?uar_sel_all_temp1@@3PBDB DATA
-?uar_sel_all_temp@@3PBDB DATA
-?uar_sel_fileset@@3PBDB DATA
-?uar_mediatype@@3PBDB DATA
-?uar_jobid_fileindex@@3PBDB DATA
-?uar_jobids_fileindex@@3PBDB DATA
-?uar_jobid_fileindex_from_dir@@3PBDB DATA
-?uar_jobid_fileindex_from_table@@3PBDB DATA
-
-; bdb_create.c:
-; sql_create.c:
-?db_create_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z
-?db_create_jobmedia_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOBMEDIA_DBR@@@Z
-?db_create_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z
-?db_create_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z
-?db_create_mediatype_record@@YA_NPAVJCR@@PAUB_DB@@PAVMEDIATYPE_DBR@@@Z
-?db_create_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
-?db_create_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z
-?db_create_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z
-?db_create_fileset_record@@YA_NPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z
-?db_create_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PAUATTR_DBR@@@Z
-
-; bdb_delete.c:
-; sql_delete.c:
-?db_delete_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z
-?db_delete_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
-
-; bdb_find.c:
-; sql_find.c:
-?db_find_job_start_time@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PAPAD@Z
-?db_find_failed_job_since@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PADAAH@Z
-?db_find_last_jobid@@YA_NPAVJCR@@PAUB_DB@@PBDPAUJOB_DBR@@@Z
-?db_find_next_volume@@YAHPAVJCR@@PAUB_DB@@H_NPAUMEDIA_DBR@@@Z
-
-; bdb_get.c:
-; sql_get.c:
-?db_get_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PADPAUJOB_DBR@@PAUFILE_DBR@@@Z
-?db_get_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z
-?db_get_job_volume_names@@YAHPAVJCR@@PAUB_DB@@IPAPAD@Z
-?db_get_job_volume_parameters@@YAHPAVJCR@@PAUB_DB@@IPAPAUVOL_PARAMS@@@Z
-?db_get_pool_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z
-?db_get_client_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z
-?db_get_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z
-?db_get_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z
-?db_get_fileset_record@@YAHPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z
-?db_get_media_ids@@YA_NPAVJCR@@PAUB_DB@@IPAHPAPAI@Z
-?db_get_media_record@@YA_NPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
-
-; bdb_list.c:
-; sql_list.c:
-?db_list_sql_query@@YAHPAVJCR@@PAUB_DB@@PBDP6AXPAX2@Z3HW4e_list_type@@@Z
-?db_list_pool_records@@YAXPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z
-?db_list_client_records@@YAXPAVJCR@@PAUB_DB@@P6AXPAXPBD@Z2W4e_list_type@@@Z
-?db_list_media_records@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z
-?db_list_jobmedia_records@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2W4e_list_type@@@Z
-?db_list_job_records@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z
-?db_list_job_totals@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3@Z
-?db_list_files_for_job@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2@Z
-
-; bdb_update.c:
-; sql_update.c:
-?db_add_digest_to_file_record@@YAHPAVJCR@@PAUB_DB@@IPADH@Z
-?db_mark_file_record@@YAHPAVJCR@@PAUB_DB@@II@Z
-?db_update_job_start_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z
-?db_update_job_end_record@@YAHPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z
-?db_update_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z
-?db_update_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z
-?db_update_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z
-?db_update_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z
-?db_update_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
-?db_update_media_defaults@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
-?db_make_inchanger_unique@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z
+LIBRARY bacula_cats.dll\r
+EXPORTS\r
+\r
+; bdb.c:\r
+; mysql.c:\r
+; postgresql.c:\r
+; sqlite.c:\r
+?db_get_type@@YAPBDXZ\r
+?db_sql_query@@YAHPAUB_DB@@PBDP6AHPAXHPAPAD@Z2@Z\r
+?db_escape_string@@YAXPAD0H@Z\r
+?db_init_database@@YAPAUB_DB@@PAVJCR@@PBD111H1H@Z\r
+?db_open_database@@YAHPAVJCR@@PAUB_DB@@@Z\r
+?db_close_database@@YAXPAVJCR@@PAUB_DB@@@Z\r
+\r
+; sql.c:\r
+?_db_unlock@@YAXPBDHPAUB_DB@@@Z\r
+?db_strerror@@YAPADPAUB_DB@@@Z\r
+?db_int64_handler@@YAHPAXHPAPAD@Z\r
+?db_end_transaction@@YAXPAVJCR@@PAUB_DB@@@Z\r
+?db_start_transaction@@YAXPAVJCR@@PAUB_DB@@@Z\r
+?_db_lock@@YAXPBDHPAUB_DB@@@Z\r
+\r
+; sql_cmds.c\r
+?list_pool@@3PBDB DATA\r
+?client_backups@@3PBDB DATA\r
+?del_File@@3PBDB DATA\r
+?upd_Purged@@3PBDB DATA\r
+?cnt_DelCand@@3PBDB DATA\r
+?del_Job@@3PBDB DATA\r
+?del_JobMedia@@3PBDB DATA\r
+?cnt_JobMedia@@3PBDB DATA\r
+?sel_JobMedia@@3PBDB DATA\r
+?select_job@@3PBDB DATA\r
+?drop_deltabs@@3PAPBDA DATA\r
+?create_deltabs@@3PAPBDA DATA\r
+?insert_delcand@@3PBDB DATA\r
+?select_backup_del@@3PBDB DATA\r
+?select_verify_del@@3PBDB DATA\r
+?select_restore_del@@3PBDB DATA\r
+?select_admin_del@@3PBDB DATA\r
+?select_migrate_del@@3PBDB DATA\r
+?uar_count_files@@3PBDB DATA\r
+?uar_list_jobs@@3PBDB DATA\r
+?uar_file@@3PBDB DATA\r
+?uar_sel_files@@3PBDB DATA\r
+?uar_del_temp@@3PBDB DATA\r
+?uar_del_temp1@@3PBDB DATA\r
+?uar_create_temp@@3PBDB DATA\r
+?uar_create_temp1@@3PBDB DATA\r
+?uar_last_full@@3PBDB DATA\r
+?uar_full@@3PBDB DATA\r
+?uar_dif@@3PBDB DATA\r
+?uar_inc@@3PBDB DATA\r
+?uar_list_temp@@3PBDB DATA\r
+?uar_sel_jobid_temp@@3PBDB DATA\r
+?uar_sel_all_temp1@@3PBDB DATA\r
+?uar_sel_all_temp@@3PBDB DATA\r
+?uar_sel_fileset@@3PBDB DATA\r
+?uar_mediatype@@3PBDB DATA\r
+?uar_jobid_fileindex@@3PBDB DATA\r
+?uar_jobids_fileindex@@3PBDB DATA\r
+?uar_jobid_fileindex_from_dir@@3PBDB DATA\r
+?uar_jobid_fileindex_from_table@@3PBDB DATA\r
+\r
+; bdb_create.c:\r
+; sql_create.c:\r
+?db_create_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
+?db_create_jobmedia_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOBMEDIA_DBR@@@Z\r
+?db_create_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
+?db_create_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z\r
+?db_create_mediatype_record@@YA_NPAVJCR@@PAUB_DB@@PAVMEDIATYPE_DBR@@@Z\r
+?db_create_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
+?db_create_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
+?db_create_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z\r
+?db_create_fileset_record@@YA_NPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z\r
+?db_create_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PAUATTR_DBR@@@Z\r
+\r
+; bdb_delete.c:\r
+; sql_delete.c:\r
+?db_delete_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
+?db_delete_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
+\r
+; bdb_find.c:\r
+; sql_find.c:\r
+?db_find_job_start_time@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PAPAD@Z\r
+?db_find_failed_job_since@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PADAAH@Z\r
+?db_find_last_jobid@@YA_NPAVJCR@@PAUB_DB@@PBDPAUJOB_DBR@@@Z\r
+?db_find_next_volume@@YAHPAVJCR@@PAUB_DB@@H_NPAUMEDIA_DBR@@@Z\r
+\r
+; bdb_get.c:\r
+; sql_get.c:\r
+?db_get_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PADPAUJOB_DBR@@PAUFILE_DBR@@@Z\r
+?db_get_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
+?db_get_job_volume_names@@YAHPAVJCR@@PAUB_DB@@IPAPAD@Z\r
+?db_get_job_volume_parameters@@YAHPAVJCR@@PAUB_DB@@IPAPAUVOL_PARAMS@@@Z\r
+?db_get_pool_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z\r
+?db_get_client_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z\r
+?db_get_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
+?db_get_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
+?db_get_fileset_record@@YAHPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z\r
+?db_get_media_ids@@YA_NPAVJCR@@PAUB_DB@@IPAHPAPAI@Z\r
+?db_get_media_record@@YA_NPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
+\r
+; bdb_list.c:\r
+; sql_list.c:\r
+?db_list_sql_query@@YAHPAVJCR@@PAUB_DB@@PBDP6AXPAX2@Z3HW4e_list_type@@@Z\r
+?db_list_pool_records@@YAXPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
+?db_list_client_records@@YAXPAVJCR@@PAUB_DB@@P6AXPAXPBD@Z2W4e_list_type@@@Z\r
+?db_list_media_records@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
+?db_list_jobmedia_records@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2W4e_list_type@@@Z\r
+?db_list_job_records@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
+?db_list_job_totals@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3@Z\r
+?db_list_files_for_job@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2@Z\r
+\r
+; bdb_update.c:\r
+; sql_update.c:\r
+?db_add_digest_to_file_record@@YAHPAVJCR@@PAUB_DB@@IPADH@Z\r
+?db_mark_file_record@@YAHPAVJCR@@PAUB_DB@@II@Z\r
+?db_update_job_start_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
+?db_update_job_end_record@@YAHPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
+?db_update_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
+?db_update_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z\r
+?db_update_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
+?db_update_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z\r
+?db_update_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
+?db_update_media_defaults@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
+?db_make_inchanger_unique@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
index 4dd74d80725ebe9e1699079308a66ac5309da9d9..294b2fc0cc2a5a842d6bb6b3a5ad913fb7279f53 100644 (file)
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="bacula_cats"
-       ProjectGUID="{8B79A2B5-8889-43D4-9B92-9AE8A6F00413}"
-       RootNamespace="bacula_cats"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="0"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def"
-                               ReBuildCommandLine="del $(TargetPath)&#x0D;&#x0A;lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def&#x0D;&#x0A;"
-                               CleanCommandLine="del $(TargetPath)"
-                               Output="$(OutDir)\$(ProjectName).lib"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="0"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def"
-                               ReBuildCommandLine="del $(TargetPath)&#x0D;&#x0A;lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def&#x0D;&#x0A;"
-                               CleanCommandLine="del $(TargetPath)"
-                               Output="$(OutDir)\$(ProjectName).lib"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\bacula_cats.def"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Script Files"
-                       >
-                       <File
-                               RelativePath="..\delete_catalog_backup.cmd"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bacula_cats"\r
+       ProjectGUID="{8B79A2B5-8889-43D4-9B92-9AE8A6F00413}"\r
+       RootNamespace="bacula_cats"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def"\r
+                               ReBuildCommandLine="del $(TargetPath)&#x0D;&#x0A;lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def&#x0D;&#x0A;"\r
+                               CleanCommandLine="del $(TargetPath)"\r
+                               Output="$(OutDir)\$(ProjectName).lib"\r
+                               PreprocessorDefinitions=""\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def"\r
+                               ReBuildCommandLine="del $(TargetPath)&#x0D;&#x0A;lib /nologo /machine:x86 /out:$(TargetPath) /def:bacula_cats.def&#x0D;&#x0A;"\r
+                               CleanCommandLine="del $(TargetPath)"\r
+                               Output="$(OutDir)\$(ProjectName).lib"\r
+                               PreprocessorDefinitions=""\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bacula_cats.def"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Script Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\delete_catalog_backup.cmd"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 2106901ad937f0f37fc1bba69a34b0275713ee34..c863fa5764204904c1ce9ae08379f3a90880983f 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="cats_mysql"
-       ProjectGUID="{B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}"
-       RootNamespace="cats_mysql"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"
-                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="libmysql.lib bacula_cats.exp"
-                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"
-                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="libmysql.lib bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\..\cats\mysql.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_cmds.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_create.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_delete.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_find.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_get.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_list.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_update.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\..\cats\cats.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\protos.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\cats\sql_cmds.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Script Files"
-                       >
-                       <File
-                               RelativePath="..\create_mysql_database.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\drop_mysql_database.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\drop_mysql_tables.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\drop_mysql_tables.sql"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\grant_mysql_privileges.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\grant_mysql_privileges.sql"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\make_mysql_catalog_backup.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\make_mysql_tables.cmd"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\make_mysql_tables.sql"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="cats_mysql"\r
+       ProjectGUID="{B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}"\r
+       RootNamespace="cats_mysql"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"\r
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="libmysql.lib bacula_cats.exp"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"\r
+                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="libmysql.lib bacula_cats.exp"\r
+                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\cats\mysql.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_cmds.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_create.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_delete.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_find.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_get.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_list.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_update.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\cats\cats.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\protos.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\cats\sql_cmds.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Script Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\create_mysql_database.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\drop_mysql_database.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\drop_mysql_tables.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\drop_mysql_tables.sql"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\grant_mysql_privileges.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\grant_mysql_privileges.sql"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\make_mysql_catalog_backup.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\make_mysql_tables.cmd"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\make_mysql_tables.sql"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index c951597aac8a528826b9cc8ba2988c4bec4ef0c2..a2f24d264fc1e4448fb9cf7086cc7b2adfdb98fb 100644 (file)
@@ -1,6 +1,6 @@
-@ECHO off
-REM
-REM Script to create Bacula SQLite tables
-
-ECHO .databases | "@bin_dir_cmd@\sqlite3" %* "@working_dir_cmd@\bacula.db"
-EXIT /b 0
+@ECHO off\r
+REM\r
+REM Script to create Bacula SQLite tables\r
+\r
+ECHO .databases | "@bin_dir_cmd@\sqlite3" %* "@working_dir_cmd@\bacula.db"\r
+EXIT /b 0\r
index 29719243ed05b47b0a08384b06c73f67febf207e..654ca6f0eb06adabacb7944ca4278d54d57b2f39 100644 (file)
@@ -1,7 +1,7 @@
-@ECHO off
-REM
-REM Script to drop Bacula SQLite tables
-
-DEL "@working_dir_cmd@\bacula.db"
-ECHO SQLite database dropped.
-EXIT /b 0
+@ECHO off\r
+REM\r
+REM Script to drop Bacula SQLite tables\r
+\r
+DEL "@working_dir_cmd@\bacula.db"\r
+ECHO SQLite database dropped.\r
+EXIT /b 0\r
index 3a58647e76910c214146cc485163f1544a231550..ac5975fc5ee6e2abee48fe4237e059b2727339b0 100644 (file)
@@ -1,8 +1,8 @@
-@ECHO off
-REM
-REM Script to delete the SQLite Bacula database (same as deleting 
-REM the tables)
-REM
-
-DEL "@working_dir_cmd@\bacula.db"
-EXIT /b 0
+@ECHO off\r
+REM\r
+REM Script to delete the SQLite Bacula database (same as deleting \r
+REM the tables)\r
+REM\r
+\r
+DEL "@working_dir_cmd@\bacula.db"\r
+EXIT /b 0\r
index 1aa0ff22154e835599115313612aca99a3ced91a..a824a34c30e575d4fc726e90770324756fd12ad4 100644 (file)
@@ -1,7 +1,7 @@
-@ECHO off
-REM
-REM Script to grant privileges to the bacula database
-REM
-
-REM nothing to do here
-EXIT /b 0
+@ECHO off\r
+REM\r
+REM Script to grant privileges to the bacula database\r
+REM\r
+\r
+REM nothing to do here\r
+EXIT /b 0\r
index 2d29289b28dc5b01554f59e0a6061d2edb2f5b79..4de853e95d62690a10580afc9bc15e96320a2dbe 100644 (file)
@@ -1,41 +1,41 @@
-@ECHO off
-REM 
-REM  This script dumps your Bacula catalog in ASCII format
-REM  It works for MySQL, SQLite, and PostgreSQL
-REM 
-REM   %1 is the name of the database to be backed up and the name
-REM      of the output file (default = bacula
-REM   %2 is the user name with which to access the database
-REM      (default = bacula).
-REM   %3 is the password with which to access the database or "" if no password
-REM      (default "")
-REM 
-REM 
-@ECHO on
-
-DEL /f "@working_dir_cmd@\%1.sql" 2>nul
-
-set MYSQLPASSWORD=
-
-IF NOT "%3"=="" SET MYSQLPASSWORD=--password=%3
-"@SQL_BINDIR@\mysqldump" -u %2 %MYSQLPASSWORD% -f --opt %1 > "@working_dir_cmd@\%1.sql"
-
-@ECHO off
-REM 
-REM   To read back a MySQL database use: 
-REM      cd @working_dir_cmd@
-REM      rd /s /q @SQL_BINDIR@\..\data\bacula
-REM      mysql < bacula.sql
-REM 
-REM   To read back a SQLite database use:
-REM      cd @working_dir_cmd@
-REM      del /f bacula.db
-REM      sqlite bacula.db < bacula.sql
-REM 
-REM   To read back a PostgreSQL database use:
-REM      cd @working_dir_cmd@
-REM      dropdb bacula
-REM      createdb bacula
-REM      psql bacula < bacula.sql
-REM
-EXIT /b 0
+@ECHO off\r
+REM \r
+REM  This script dumps your Bacula catalog in ASCII format\r
+REM  It works for MySQL, SQLite, and PostgreSQL\r
+REM \r
+REM   %1 is the name of the database to be backed up and the name\r
+REM      of the output file (default = bacula\r
+REM   %2 is the user name with which to access the database\r
+REM      (default = bacula).\r
+REM   %3 is the password with which to access the database or "" if no password\r
+REM      (default "")\r
+REM \r
+REM \r
+@ECHO on\r
+\r
+DEL /f "@working_dir_cmd@\%1.sql" 2>nul\r
+\r
+set MYSQLPASSWORD=\r
+\r
+IF NOT "%3"=="" SET MYSQLPASSWORD=--password=%3\r
+"@SQL_BINDIR@\mysqldump" -u %2 %MYSQLPASSWORD% -f --opt %1 > "@working_dir_cmd@\%1.sql"\r
+\r
+@ECHO off\r
+REM \r
+REM   To read back a MySQL database use: \r
+REM      cd @working_dir_cmd@\r
+REM      rd /s /q @SQL_BINDIR@\..\data\bacula\r
+REM      mysql < bacula.sql\r
+REM \r
+REM   To read back a SQLite database use:\r
+REM      cd @working_dir_cmd@\r
+REM      del /f bacula.db\r
+REM      sqlite bacula.db < bacula.sql\r
+REM \r
+REM   To read back a PostgreSQL database use:\r
+REM      cd @working_dir_cmd@\r
+REM      dropdb bacula\r
+REM      createdb bacula\r
+REM      psql bacula < bacula.sql\r
+REM\r
+EXIT /b 0\r
index 7a2c7feb72d21b30b06f50d9b8bda7732e9ecf1c..16456b314c5c25044170d1010a53e7db14fa7e07 100644 (file)
@@ -1,41 +1,41 @@
-@ECHO off
-REM 
-REM  This script dumps your Bacula catalog in ASCII format
-REM  It works for MySQL, SQLite, and PostgreSQL
-REM 
-REM   %1 is the name of the database to be backed up and the name
-REM      of the output file (default = bacula
-REM   %2 is the user name with which to access the database
-REM      (default = bacula).
-REM   %3 is the password with which to access the database or "" if no password
-REM      (default "")
-REM 
-REM 
-@ECHO on
-
-DEL /f "@working_dir_cmd@\%1.sql" 2>nul
-
-SET PGPASSWORD=
-
-IF NOT "%3"=="" SET PGPASSWORD=--password=%3
-"@SQL_BINDIR@\pg_dump" -c -U %2 %1 >"@working_dir_cmd@\%1.sql"
-
-@ECHO off
-REM 
-REM   To read back a MySQL database use: 
-REM      cd @working_dir_cmd@
-REM      rd /s /q @SQL_BINDIR@\..\data\bacula
-REM      mysql < bacula.sql
-REM 
-REM   To read back a SQLite database use:
-REM      cd @working_dir_cmd@
-REM      del /f bacula.db
-REM      sqlite bacula.db < bacula.sql
-REM 
-REM   To read back a PostgreSQL database use:
-REM      cd @working_dir_cmd@
-REM      dropdb bacula
-REM      createdb bacula
-REM      psql bacula < bacula.sql
-REM 
-EXIT /b 0
+@ECHO off\r
+REM \r
+REM  This script dumps your Bacula catalog in ASCII format\r
+REM  It works for MySQL, SQLite, and PostgreSQL\r
+REM \r
+REM   %1 is the name of the database to be backed up and the name\r
+REM      of the output file (default = bacula\r
+REM   %2 is the user name with which to access the database\r
+REM      (default = bacula).\r
+REM   %3 is the password with which to access the database or "" if no password\r
+REM      (default "")\r
+REM \r
+REM \r
+@ECHO on\r
+\r
+DEL /f "@working_dir_cmd@\%1.sql" 2>nul\r
+\r
+SET PGPASSWORD=\r
+\r
+IF NOT "%3"=="" SET PGPASSWORD=--password=%3\r
+"@SQL_BINDIR@\pg_dump" -c -U %2 %1 >"@working_dir_cmd@\%1.sql"\r
+\r
+@ECHO off\r
+REM \r
+REM   To read back a MySQL database use: \r
+REM      cd @working_dir_cmd@\r
+REM      rd /s /q @SQL_BINDIR@\..\data\bacula\r
+REM      mysql < bacula.sql\r
+REM \r
+REM   To read back a SQLite database use:\r
+REM      cd @working_dir_cmd@\r
+REM      del /f bacula.db\r
+REM      sqlite bacula.db < bacula.sql\r
+REM \r
+REM   To read back a PostgreSQL database use:\r
+REM      cd @working_dir_cmd@\r
+REM      dropdb bacula\r
+REM      createdb bacula\r
+REM      psql bacula < bacula.sql\r
+REM \r
+EXIT /b 0\r
index 90be3615c5c98970bdd392551509b85bd66155be..7cdd00ba9c94874c8350203279d350c35b4f9772 100644 (file)
@@ -1,38 +1,38 @@
-@ECHO off
-REM 
-REM  This script dumps your Bacula catalog in ASCII format
-REM  It works for MySQL, SQLite, and PostgreSQL
-REM 
-REM   %1 is the name of the database to be backed up and the name
-REM      of the output file (default = bacula
-REM   %2 is the user name with which to access the database
-REM      (default = bacula).
-REM   %3 is the password with which to access the database or "" if no password
-REM      (default "")
-REM 
-REM 
-@ECHO on
-
-DEL /f "@working_dir_cmd@\%1.sql" 2>nul
-
-ECHO .dump | "@bin_dir_cmd@\sqlite3" "@working_dir_cmd@\%1.db" > "@working_dir_cmd@\%1.sql"
-
-@ECHO off
-REM 
-REM   To read back a MySQL database use: 
-REM      cd @working_dir_cmd@
-REM      rd /s /q @SQL_BINDIR@\..\data\bacula
-REM      mysql < bacula.sql
-REM 
-REM   To read back a SQLite database use:
-REM      cd @working_dir_cmd@
-REM      del /f bacula.db
-REM      sqlite bacula.db < bacula.sql
-REM 
-REM   To read back a PostgreSQL database use:
-REM      cd @working_dir_cmd@
-REM      dropdb bacula
-REM      createdb bacula
-REM      psql bacula < bacula.sql
-REM 
-EXIT /b 0
+@ECHO off\r
+REM \r
+REM  This script dumps your Bacula catalog in ASCII format\r
+REM  It works for MySQL, SQLite, and PostgreSQL\r
+REM \r
+REM   %1 is the name of the database to be backed up and the name\r
+REM      of the output file (default = bacula\r
+REM   %2 is the user name with which to access the database\r
+REM      (default = bacula).\r
+REM   %3 is the password with which to access the database or "" if no password\r
+REM      (default "")\r
+REM \r
+REM \r
+@ECHO on\r
+\r
+DEL /f "@working_dir_cmd@\%1.sql" 2>nul\r
+\r
+ECHO .dump | "@bin_dir_cmd@\sqlite3" "@working_dir_cmd@\%1.db" > "@working_dir_cmd@\%1.sql"\r
+\r
+@ECHO off\r
+REM \r
+REM   To read back a MySQL database use: \r
+REM      cd @working_dir_cmd@\r
+REM      rd /s /q @SQL_BINDIR@\..\data\bacula\r
+REM      mysql < bacula.sql\r
+REM \r
+REM   To read back a SQLite database use:\r
+REM      cd @working_dir_cmd@\r
+REM      del /f bacula.db\r
+REM      sqlite bacula.db < bacula.sql\r
+REM \r
+REM   To read back a PostgreSQL database use:\r
+REM      cd @working_dir_cmd@\r
+REM      dropdb bacula\r
+REM      createdb bacula\r
+REM      psql bacula < bacula.sql\r
+REM \r
+EXIT /b 0\r
index 1aed7233971550aa59eae8b1e0eb41ab86ea3377..aa739806362fc9d2603fdd7a2af454b9e5e1cccf 100644 (file)
@@ -1,7 +1,7 @@
-@ECHO off
-REM
-REM Script to create Bacula SQLite tables
-
-"@bin_dir_cmd@\sqlite3" %* "@working_dir_cmd@\bacula.db" < "@bin_dir_cmd@\make_sqlite3_tables.sql"
-
-EXIT /b 0
+@ECHO off\r
+REM\r
+REM Script to create Bacula SQLite tables\r
+\r
+"@bin_dir_cmd@\sqlite3" %* "@working_dir_cmd@\bacula.db" < "@bin_dir_cmd@\make_sqlite3_tables.sql"\r
+\r
+EXIT /b 0\r
index bab40f436a9fe1a558fe67f98553d14ab42a15ec..89f6f8959aa9ef1b3e4f68b2eee217f42078f554 100644 (file)
-CREATE TABLE Filename (
-  FilenameId INTEGER,
-  Name TEXT DEFAULT "",
-  PRIMARY KEY(FilenameId) 
-  );
-
-CREATE INDEX inx1 ON Filename (Name);
-
-CREATE TABLE Path (
-   PathId INTEGER,
-   Path TEXT DEFAULT "",
-   PRIMARY KEY(PathId) 
-   );
-
-CREATE INDEX inx2 ON Path (Path);
-
-
-CREATE TABLE File (
-   FileId INTEGER,
-   FileIndex INTEGER UNSIGNED NOT NULL,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,
-   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,
-   MarkId INTEGER UNSIGNED DEFAULT 0,
-   LStat VARCHAR(255) NOT NULL,
-   MD5 VARCHAR(255) NOT NULL,
-   PRIMARY KEY(FileId) 
-   );
-
-CREATE INDEX inx3 ON File (JobId);
-CREATE INDEX inx4 ON File (FilenameId, PathId);
---
--- Possibly add one or more of the following indexes
---  if your Verifies are too slow.
---
--- CREATE INDEX inx4 ON File (PathId);
--- CREATE INDEX inx5 ON File (FileNameId);
--- CREATE INDEX inx9 ON File (JobId, PathId, FilenameId);
-
-CREATE TABLE Job (
-   JobId INTEGER,
-   Job VARCHAR(128) NOT NULL,
-   Name VARCHAR(128) NOT NULL,
-   Type CHAR NOT NULL,
-   Level CHAR NOT NULL,
-   ClientId INTEGER REFERENCES Client DEFAULT 0,
-   JobStatus CHAR NOT NULL,
-   SchedTime DATETIME NOT NULL,
-   StartTime DATETIME DEFAULT 0,
-   EndTime DATETIME DEFAULT 0,
-   RealEndTime DATETIME DEFAULT 0,
-   JobTDate BIGINT UNSIGNED DEFAULT 0,
-   VolSessionId INTEGER UNSIGNED DEFAULT 0,
-   VolSessionTime INTEGER UNSIGNED DEFAULT 0,
-   JobFiles INTEGER UNSIGNED DEFAULT 0,
-   JobBytes BIGINT UNSIGNED DEFAULT 0,
-   JobErrors INTEGER UNSIGNED DEFAULT 0,
-   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   FileSetId INTEGER UNSIGNED REFERENCES FileSet DEFAULT 0,
-   PriorJobId INTEGER UNSIGNED REFERENCES Job DEFAULT 0,
-   PurgedFiles TINYINT DEFAULT 0,
-   HasBase TINYINT DEFAULT 0,
-   PRIMARY KEY(JobId) 
-   );
-CREATE INDEX inx6 ON Job (Name);
-
-CREATE TABLE Location (
-   LocationId INTEGER,
-   Location TEXT NOT NULL,
-   Cost INTEGER DEFAULT 0,
-   Enabled TINYINT,
-   PRIMARY KEY(LocationId)
-   );
-
-CREATE TABLE LocationLog (
-   LocLogId INTEGER,
-   Date DATETIME NOT NULL,
-   Comment TEXT NOT NULL,
-   MediaId INTEGER UNSIGNED REFERENCES Media DEFAULT 0,
-   LocationId INTEGER UNSIGNED REFERENCES LocationId DEFAULT 0,
-   NewVolStatus VARCHAR(20) NOT NULL,
-   NewEnabled TINYINT NOT NULL,
-   PRIMARY KEY(LocLogId)
-);
-
-
-CREATE TABLE Log (
-   LogId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   Time DATETIME NOT NULL,
-   LogText TEXT NOT NULL,
-   PRIMARY KEY(LogId) 
-   );
-CREATE INDEX LogInx1 ON File (JobId);
-
-
-CREATE TABLE FileSet (
-   FileSetId INTEGER,
-   FileSet VARCHAR(128) NOT NULL,
-   MD5 VARCHAR(25) NOT NULL,
-   CreateTime DATETIME DEFAULT 0,
-   PRIMARY KEY(FileSetId)
-   );
-
-CREATE TABLE JobMedia (
-   JobMediaId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   MediaId INTEGER UNSIGNED REFERENCES Media NOT NULL,
-   FirstIndex INTEGER UNSIGNED NOT NULL,
-   LastIndex INTEGER UNSIGNED NOT NULL,
-   StartFile INTEGER UNSIGNED DEFAULT 0,
-   EndFile INTEGER UNSIGNED DEFAULT 0,
-   StartBlock INTEGER UNSIGNED DEFAULT 0,
-   EndBlock INTEGER UNSIGNED DEFAULT 0,
-   VolIndex INTEGER UNSIGNED DEFAULT 0,
-   Copy     INTEGER UNSIGNED DEFAULT 0,
-   PRIMARY KEY(JobMediaId) 
-   );
-
-CREATE INDEX inx7 ON JobMedia (JobId, MediaId);
-
-
-CREATE TABLE Media (
-   MediaId INTEGER,
-   VolumeName VARCHAR(128) NOT NULL,
-   Slot INTEGER DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MediaType VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0,
-   LabelType TINYINT DEFAULT 0,
-   FirstWritten DATETIME DEFAULT 0,
-   LastWritten DATETIME DEFAULT 0,
-   LabelDate DATETIME DEFAULT 0,
-   VolJobs INTEGER UNSIGNED DEFAULT 0,
-   VolFiles INTEGER UNSIGNED DEFAULT 0,
-   VolBlocks INTEGER UNSIGNED DEFAULT 0,
-   VolMounts INTEGER UNSIGNED DEFAULT 0,
-   VolBytes BIGINT UNSIGNED DEFAULT 0,
-   VolParts INTEGER UNSIGNED DEFAULT 0,
-   VolErrors INTEGER UNSIGNED DEFAULT 0,
-   VolWrites INTEGER UNSIGNED DEFAULT 0,
-   VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-   VolStatus VARCHAR(20) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   Recycle TINYINT DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   InChanger TINYINT DEFAULT 0,
-   StorageId INTEGER UNSIGNED REFERENCES Storage DEFAULT 0,
-   DeviceId INTEGER UNSIGNED REFERENCES Device DEFAULT 0,
-   MediaAddressing TINYINT DEFAULT 0,
-   VolReadTime BIGINT UNSIGNED DEFAULT 0,
-   VolWriteTime BIGINT UNSIGNED DEFAULT 0,
-   EndFile INTEGER UNSIGNED DEFAULT 0,
-   EndBlock INTEGER UNSIGNED DEFAULT 0,
-   LocationId INTEGER UNSIGNED REFERENCES Location DEFAULT 0,
-   RecycleCount INTEGER UNSIGNED DEFAULT 0,
-   InitialWrite DATETIME DEFAULT 0,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   Comment TEXT,
-   PRIMARY KEY(MediaId)
-   );
-
-CREATE INDEX inx8 ON Media (PoolId);
-
-CREATE TABLE MediaType (
-   MediaTypeId INTEGER,
-   MediaType VARCHAR(128) NOT NULL,
-   ReadOnly TINYINT DEFAULT 0,
-   PRIMARY KEY(MediaTypeId)
-   );
-
-CREATE TABLE Storage (
-   StorageId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   AutoChanger TINYINT DEFAULT 0,
-   PRIMARY KEY(StorageId)
-   );
-
-CREATE TABLE Device (
-   DeviceId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL,
-   StorageId INTEGER UNSIGNED REFERENCES Storage,
-   DevMounts INTEGER UNSIGNED DEFAULT 0,
-   DevReadBytes BIGINT UNSIGNED DEFAULT 0,
-   DevWriteBytes BIGINT UNSIGNED DEFAULT 0,
-   DevReadBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevWriteBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevReadTime BIGINT UNSIGNED DEFAULT 0,
-   DevWriteTime BIGINT UNSIGNED DEFAULT 0,
-   DevReadTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   CleaningDate DATETIME DEFAULT 0,
-   CleaningPeriod BIGINT UNSIGNED DEFAULT 0,
-   PRIMARY KEY(DeviceId)
-   );
-
-
-CREATE TABLE Pool (
-   PoolId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   NumVols INTEGER UNSIGNED DEFAULT 0,
-   MaxVols INTEGER UNSIGNED DEFAULT 0,
-   UseOnce TINYINT DEFAULT 0,
-   UseCatalog TINYINT DEFAULT 1,
-   AcceptAnyVolume TINYINT DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   AutoPrune TINYINT DEFAULT 0,
-   Recycle TINYINT DEFAULT 0,
-   PoolType VARCHAR(20) NOT NULL,
-   LabelType TINYINT DEFAULT 0,
-   LabelFormat VARCHAR(128) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   NextPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MigrationHighBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationLowBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationTime BIGINT UNSIGNED DEFAULT 0,
-   UNIQUE (Name),
-   PRIMARY KEY (PoolId)
-   );
-
-
-CREATE TABLE Client (
-   ClientId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   Uname VARCHAR(255) NOT NULL,   -- uname -a field
-   AutoPrune TINYINT DEFAULT 0,
-   FileRetention BIGINT UNSIGNED DEFAULT 0,
-   JobRetention  BIGINT UNSIGNED DEFAULT 0,
-   UNIQUE (Name),
-   PRIMARY KEY(ClientId)
-   );
-
-CREATE TABLE BaseFiles (
-   BaseId INTEGER,
-   BaseJobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   FileId INTEGER UNSIGNED REFERENCES File NOT NULL,
-   FileIndex INTEGER UNSIGNED,
-   PRIMARY KEY(BaseId)
-   );
-
-CREATE TABLE UnsavedFiles (
-   UnsavedId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,
-   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,
-   PRIMARY KEY (UnsavedId)
-   );
-
-
-CREATE TABLE NextId (
-   id INTEGER UNSIGNED DEFAULT 0,
-   TableName TEXT NOT NULL,
-   PRIMARY KEY (TableName)
-   );
-
-
-
--- Initialize JobId to start at 1
-INSERT INTO NextId (id, TableName) VALUES (1, "Job");
-
-CREATE TABLE Version (
-   VersionId INTEGER UNSIGNED NOT NULL 
-   );
-
-
-CREATE TABLE Counters (
-   Counter TEXT NOT NULL,     
-   MinValue INTEGER DEFAULT 0, 
-   MaxValue INTEGER DEFAULT 0,
-   CurrentValue INTEGER DEFAULT 0,
-   WrapCounter TEXT NOT NULL,
-   PRIMARY KEY (Counter)
-   );
-
-CREATE TABLE CDImages (
-   MediaId INTEGER UNSIGNED NOT NULL,
-   LastBurn DATETIME NOT NULL,
-   PRIMARY KEY (MediaId)
-   );
-
-
-CREATE TABLE Status (
-   JobStatus CHAR(1) NOT NULL,
-   JobStatusLong BLOB, 
-   PRIMARY KEY (JobStatus)
-   );
-
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('C', 'Created, not yet running');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('R', 'Running');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('B', 'Blocked');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('T', 'Completed successfully');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('E', 'Terminated with errors');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('e', 'Non-fatal error');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('f', 'Fatal error');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('D', 'Verify found differences');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('A', 'Canceled by user');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('F', 'Waiting for Client');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('S', 'Waiting for Storage daemon');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('m', 'Waiting for new media');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('M', 'Waiting for media mount');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('s', 'Waiting for storage resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('j', 'Waiting for job resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('c', 'Waiting for client resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('d', 'Waiting on maximum jobs');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('t', 'Waiting on start time');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('p', 'Waiting on higher priority jobs');
-
-
--- Initialize Version
-INSERT INTO Version (VersionId) VALUES (10);
-
-
-PRAGMA default_synchronous = OFF;
-PRAGMA default_cache_size = 10000;
+CREATE TABLE Filename (\r
+  FilenameId INTEGER,\r
+  Name TEXT DEFAULT "",\r
+  PRIMARY KEY(FilenameId) \r
+  );\r
+\r
+CREATE INDEX inx1 ON Filename (Name);\r
+\r
+CREATE TABLE Path (\r
+   PathId INTEGER,\r
+   Path TEXT DEFAULT "",\r
+   PRIMARY KEY(PathId) \r
+   );\r
+\r
+CREATE INDEX inx2 ON Path (Path);\r
+\r
+\r
+CREATE TABLE File (\r
+   FileId INTEGER,\r
+   FileIndex INTEGER UNSIGNED NOT NULL,\r
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,\r
+   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,\r
+   MarkId INTEGER UNSIGNED DEFAULT 0,\r
+   LStat VARCHAR(255) NOT NULL,\r
+   MD5 VARCHAR(255) NOT NULL,\r
+   PRIMARY KEY(FileId) \r
+   );\r
+\r
+CREATE INDEX inx3 ON File (JobId);\r
+CREATE INDEX inx4 ON File (FilenameId, PathId);\r
+--\r
+-- Possibly add one or more of the following indexes\r
+--  if your Verifies are too slow.\r
+--\r
+-- CREATE INDEX inx4 ON File (PathId);\r
+-- CREATE INDEX inx5 ON File (FileNameId);\r
+-- CREATE INDEX inx9 ON File (JobId, PathId, FilenameId);\r
+\r
+CREATE TABLE Job (\r
+   JobId INTEGER,\r
+   Job VARCHAR(128) NOT NULL,\r
+   Name VARCHAR(128) NOT NULL,\r
+   Type CHAR NOT NULL,\r
+   Level CHAR NOT NULL,\r
+   ClientId INTEGER REFERENCES Client DEFAULT 0,\r
+   JobStatus CHAR NOT NULL,\r
+   SchedTime DATETIME NOT NULL,\r
+   StartTime DATETIME DEFAULT 0,\r
+   EndTime DATETIME DEFAULT 0,\r
+   RealEndTime DATETIME DEFAULT 0,\r
+   JobTDate BIGINT UNSIGNED DEFAULT 0,\r
+   VolSessionId INTEGER UNSIGNED DEFAULT 0,\r
+   VolSessionTime INTEGER UNSIGNED DEFAULT 0,\r
+   JobFiles INTEGER UNSIGNED DEFAULT 0,\r
+   JobBytes BIGINT UNSIGNED DEFAULT 0,\r
+   JobErrors INTEGER UNSIGNED DEFAULT 0,\r
+   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,\r
+   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   FileSetId INTEGER UNSIGNED REFERENCES FileSet DEFAULT 0,\r
+   PriorJobId INTEGER UNSIGNED REFERENCES Job DEFAULT 0,\r
+   PurgedFiles TINYINT DEFAULT 0,\r
+   HasBase TINYINT DEFAULT 0,\r
+   PRIMARY KEY(JobId) \r
+   );\r
+CREATE INDEX inx6 ON Job (Name);\r
+\r
+CREATE TABLE Location (\r
+   LocationId INTEGER,\r
+   Location TEXT NOT NULL,\r
+   Cost INTEGER DEFAULT 0,\r
+   Enabled TINYINT,\r
+   PRIMARY KEY(LocationId)\r
+   );\r
+\r
+CREATE TABLE LocationLog (\r
+   LocLogId INTEGER,\r
+   Date DATETIME NOT NULL,\r
+   Comment TEXT NOT NULL,\r
+   MediaId INTEGER UNSIGNED REFERENCES Media DEFAULT 0,\r
+   LocationId INTEGER UNSIGNED REFERENCES LocationId DEFAULT 0,\r
+   NewVolStatus VARCHAR(20) NOT NULL,\r
+   NewEnabled TINYINT NOT NULL,\r
+   PRIMARY KEY(LocLogId)\r
+);\r
+\r
+\r
+CREATE TABLE Log (\r
+   LogId INTEGER,\r
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   Time DATETIME NOT NULL,\r
+   LogText TEXT NOT NULL,\r
+   PRIMARY KEY(LogId) \r
+   );\r
+CREATE INDEX LogInx1 ON File (JobId);\r
+\r
+\r
+CREATE TABLE FileSet (\r
+   FileSetId INTEGER,\r
+   FileSet VARCHAR(128) NOT NULL,\r
+   MD5 VARCHAR(25) NOT NULL,\r
+   CreateTime DATETIME DEFAULT 0,\r
+   PRIMARY KEY(FileSetId)\r
+   );\r
+\r
+CREATE TABLE JobMedia (\r
+   JobMediaId INTEGER,\r
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   MediaId INTEGER UNSIGNED REFERENCES Media NOT NULL,\r
+   FirstIndex INTEGER UNSIGNED NOT NULL,\r
+   LastIndex INTEGER UNSIGNED NOT NULL,\r
+   StartFile INTEGER UNSIGNED DEFAULT 0,\r
+   EndFile INTEGER UNSIGNED DEFAULT 0,\r
+   StartBlock INTEGER UNSIGNED DEFAULT 0,\r
+   EndBlock INTEGER UNSIGNED DEFAULT 0,\r
+   VolIndex INTEGER UNSIGNED DEFAULT 0,\r
+   Copy     INTEGER UNSIGNED DEFAULT 0,\r
+   PRIMARY KEY(JobMediaId) \r
+   );\r
+\r
+CREATE INDEX inx7 ON JobMedia (JobId, MediaId);\r
+\r
+\r
+CREATE TABLE Media (\r
+   MediaId INTEGER,\r
+   VolumeName VARCHAR(128) NOT NULL,\r
+   Slot INTEGER DEFAULT 0,\r
+   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   MediaType VARCHAR(128) NOT NULL,\r
+   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0,\r
+   LabelType TINYINT DEFAULT 0,\r
+   FirstWritten DATETIME DEFAULT 0,\r
+   LastWritten DATETIME DEFAULT 0,\r
+   LabelDate DATETIME DEFAULT 0,\r
+   VolJobs INTEGER UNSIGNED DEFAULT 0,\r
+   VolFiles INTEGER UNSIGNED DEFAULT 0,\r
+   VolBlocks INTEGER UNSIGNED DEFAULT 0,\r
+   VolMounts INTEGER UNSIGNED DEFAULT 0,\r
+   VolBytes BIGINT UNSIGNED DEFAULT 0,\r
+   VolParts INTEGER UNSIGNED DEFAULT 0,\r
+   VolErrors INTEGER UNSIGNED DEFAULT 0,\r
+   VolWrites INTEGER UNSIGNED DEFAULT 0,\r
+   VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,\r
+   VolStatus VARCHAR(20) NOT NULL,\r
+   Enabled TINYINT DEFAULT 1,\r
+   Recycle TINYINT DEFAULT 0,\r
+   VolRetention BIGINT UNSIGNED DEFAULT 0,\r
+   VolUseDuration BIGINT UNSIGNED DEFAULT 0,\r
+   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,\r
+   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,\r
+   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,\r
+   InChanger TINYINT DEFAULT 0,\r
+   StorageId INTEGER UNSIGNED REFERENCES Storage DEFAULT 0,\r
+   DeviceId INTEGER UNSIGNED REFERENCES Device DEFAULT 0,\r
+   MediaAddressing TINYINT DEFAULT 0,\r
+   VolReadTime BIGINT UNSIGNED DEFAULT 0,\r
+   VolWriteTime BIGINT UNSIGNED DEFAULT 0,\r
+   EndFile INTEGER UNSIGNED DEFAULT 0,\r
+   EndBlock INTEGER UNSIGNED DEFAULT 0,\r
+   LocationId INTEGER UNSIGNED REFERENCES Location DEFAULT 0,\r
+   RecycleCount INTEGER UNSIGNED DEFAULT 0,\r
+   InitialWrite DATETIME DEFAULT 0,\r
+   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   Comment TEXT,\r
+   PRIMARY KEY(MediaId)\r
+   );\r
+\r
+CREATE INDEX inx8 ON Media (PoolId);\r
+\r
+CREATE TABLE MediaType (\r
+   MediaTypeId INTEGER,\r
+   MediaType VARCHAR(128) NOT NULL,\r
+   ReadOnly TINYINT DEFAULT 0,\r
+   PRIMARY KEY(MediaTypeId)\r
+   );\r
+\r
+CREATE TABLE Storage (\r
+   StorageId INTEGER,\r
+   Name VARCHAR(128) NOT NULL,\r
+   AutoChanger TINYINT DEFAULT 0,\r
+   PRIMARY KEY(StorageId)\r
+   );\r
+\r
+CREATE TABLE Device (\r
+   DeviceId INTEGER,\r
+   Name VARCHAR(128) NOT NULL,\r
+   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL,\r
+   StorageId INTEGER UNSIGNED REFERENCES Storage,\r
+   DevMounts INTEGER UNSIGNED DEFAULT 0,\r
+   DevReadBytes BIGINT UNSIGNED DEFAULT 0,\r
+   DevWriteBytes BIGINT UNSIGNED DEFAULT 0,\r
+   DevReadBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,\r
+   DevWriteBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,\r
+   DevReadTime BIGINT UNSIGNED DEFAULT 0,\r
+   DevWriteTime BIGINT UNSIGNED DEFAULT 0,\r
+   DevReadTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,\r
+   DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,\r
+   CleaningDate DATETIME DEFAULT 0,\r
+   CleaningPeriod BIGINT UNSIGNED DEFAULT 0,\r
+   PRIMARY KEY(DeviceId)\r
+   );\r
+\r
+\r
+CREATE TABLE Pool (\r
+   PoolId INTEGER,\r
+   Name VARCHAR(128) NOT NULL,\r
+   NumVols INTEGER UNSIGNED DEFAULT 0,\r
+   MaxVols INTEGER UNSIGNED DEFAULT 0,\r
+   UseOnce TINYINT DEFAULT 0,\r
+   UseCatalog TINYINT DEFAULT 1,\r
+   AcceptAnyVolume TINYINT DEFAULT 0,\r
+   VolRetention BIGINT UNSIGNED DEFAULT 0,\r
+   VolUseDuration BIGINT UNSIGNED DEFAULT 0,\r
+   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,\r
+   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,\r
+   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,\r
+   AutoPrune TINYINT DEFAULT 0,\r
+   Recycle TINYINT DEFAULT 0,\r
+   PoolType VARCHAR(20) NOT NULL,\r
+   LabelType TINYINT DEFAULT 0,\r
+   LabelFormat VARCHAR(128) NOT NULL,\r
+   Enabled TINYINT DEFAULT 1,\r
+   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   NextPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,\r
+   MigrationHighBytes BIGINT UNSIGNED DEFAULT 0,\r
+   MigrationLowBytes BIGINT UNSIGNED DEFAULT 0,\r
+   MigrationTime BIGINT UNSIGNED DEFAULT 0,\r
+   UNIQUE (Name),\r
+   PRIMARY KEY (PoolId)\r
+   );\r
+\r
+\r
+CREATE TABLE Client (\r
+   ClientId INTEGER,\r
+   Name VARCHAR(128) NOT NULL,\r
+   Uname VARCHAR(255) NOT NULL,   -- uname -a field\r
+   AutoPrune TINYINT DEFAULT 0,\r
+   FileRetention BIGINT UNSIGNED DEFAULT 0,\r
+   JobRetention  BIGINT UNSIGNED DEFAULT 0,\r
+   UNIQUE (Name),\r
+   PRIMARY KEY(ClientId)\r
+   );\r
+\r
+CREATE TABLE BaseFiles (\r
+   BaseId INTEGER,\r
+   BaseJobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   FileId INTEGER UNSIGNED REFERENCES File NOT NULL,\r
+   FileIndex INTEGER UNSIGNED,\r
+   PRIMARY KEY(BaseId)\r
+   );\r
+\r
+CREATE TABLE UnsavedFiles (\r
+   UnsavedId INTEGER,\r
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,\r
+   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,\r
+   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,\r
+   PRIMARY KEY (UnsavedId)\r
+   );\r
+\r
+\r
+CREATE TABLE NextId (\r
+   id INTEGER UNSIGNED DEFAULT 0,\r
+   TableName TEXT NOT NULL,\r
+   PRIMARY KEY (TableName)\r
+   );\r
+\r
+\r
+\r
+-- Initialize JobId to start at 1\r
+INSERT INTO NextId (id, TableName) VALUES (1, "Job");\r
+\r
+CREATE TABLE Version (\r
+   VersionId INTEGER UNSIGNED NOT NULL \r
+   );\r
+\r
+\r
+CREATE TABLE Counters (\r
+   Counter TEXT NOT NULL,     \r
+   MinValue INTEGER DEFAULT 0, \r
+   MaxValue INTEGER DEFAULT 0,\r
+   CurrentValue INTEGER DEFAULT 0,\r
+   WrapCounter TEXT NOT NULL,\r
+   PRIMARY KEY (Counter)\r
+   );\r
+\r
+CREATE TABLE CDImages (\r
+   MediaId INTEGER UNSIGNED NOT NULL,\r
+   LastBurn DATETIME NOT NULL,\r
+   PRIMARY KEY (MediaId)\r
+   );\r
+\r
+\r
+CREATE TABLE Status (\r
+   JobStatus CHAR(1) NOT NULL,\r
+   JobStatusLong BLOB, \r
+   PRIMARY KEY (JobStatus)\r
+   );\r
+\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('C', 'Created, not yet running');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('R', 'Running');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('B', 'Blocked');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('T', 'Completed successfully');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('E', 'Terminated with errors');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('e', 'Non-fatal error');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('f', 'Fatal error');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('D', 'Verify found differences');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('A', 'Canceled by user');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('F', 'Waiting for Client');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('S', 'Waiting for Storage daemon');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('m', 'Waiting for new media');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('M', 'Waiting for media mount');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('s', 'Waiting for storage resource');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('j', 'Waiting for job resource');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('c', 'Waiting for client resource');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('d', 'Waiting on maximum jobs');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('t', 'Waiting on start time');\r
+INSERT INTO Status (JobStatus,JobStatusLong) VALUES\r
+   ('p', 'Waiting on higher priority jobs');\r
+\r
+\r
+-- Initialize Version\r
+INSERT INTO Version (VersionId) VALUES (10);\r
+\r
+\r
+PRAGMA default_synchronous = OFF;\r
+PRAGMA default_cache_size = 10000;\r
index 95deb2f34fd2cb135840ee6bbc3eca510b573776..bf1c6746ffc5af7515b93701d256a751bc7737e7 100644 (file)
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity 
-    version="1.0.0.0" 
-    processorArchitecture="X86" 
-    name="Bacula.Bacula-fd" 
-    type="win32" /> 
-  <description>Bacula File daemon for Win32</description> 
-  <dependency> 
-    <dependentAssembly> 
-      <assemblyIdentity 
-        type="win32" 
-        name="Microsoft.Windows.Common-Controls" 
-        version="6.0.0.0" 
-        processorArchitecture="X86" 
-        publicKeyToken="6595b64144ccf1df" 
-        language="*" /> 
-    </dependentAssembly> 
-  </dependency> 
-</assembly> 
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> \r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> \r
+  <assemblyIdentity \r
+    version="1.0.0.0" \r
+    processorArchitecture="X86" \r
+    name="Bacula.Bacula-fd" \r
+    type="win32" /> \r
+  <description>Bacula File daemon for Win32</description> \r
+  <dependency> \r
+    <dependentAssembly> \r
+      <assemblyIdentity \r
+        type="win32" \r
+        name="Microsoft.Windows.Common-Controls" \r
+        version="6.0.0.0" \r
+        processorArchitecture="X86" \r
+        publicKeyToken="6595b64144ccf1df" \r
+        language="*" /> \r
+    </dependentAssembly> \r
+  </dependency> \r
+</assembly> \r
+\r
index 2a16fb55fe83cf171a4d6634f07af63f25b309a0..71965a2a38ef67f64533bfcbca8009139cb44ddb 100644 (file)
-Function EnterConfigPage1
-  ${If} $AutomaticInstall = 1
-    Abort
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
-
-  ${If} $R0 = 0
-    Abort
-  ${EndIf}
-
-  FileOpen $R5 "$PLUGINSDIR\ConfigPage1.ini" w
-
-  StrCpy $R6 1  ; Field Number
-  StrCpy $R7 0  ; Top
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    IntOp $R8 $R7 + 52
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Client"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
-
-    IntOp $R8 $R7 + 10
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    IntOp $R8 $R7 + 52
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Storage"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-    
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStorageName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStoragePort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStorageMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStoragePassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
-
-    IntOp $R8 $R7 + 10
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-  ${Endif}
-
-  IntOp $R6 $R6 - 1
-
-  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"
-
-  FileClose $R5
-
-  !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage1.ini"
-  Pop $HDLG ;HWND of dialog
-
-  ; Initialize Controls
-
-  StrCpy $R6 1  ; Field Number
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 2
-
-    ; Client Name
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Client Port Number
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Max Jobs
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-    IntOp $R6 $R6 + 5
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 2
-
-    ; Storage Name
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Storage Port Number
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Max Jobs
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-    IntOp $R6 $R6 + 5
-  ${Endif}
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process results
-
-  StrCpy $R6 3
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientName "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPort "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientMaxJobs "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPassword "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientInstallService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientStartService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 3
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageName "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePort "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageMaxJobs "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePassword "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageInstallService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageStartService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 3
-  ${Endif}
-FunctionEnd
-
-Function LeaveConfigPage1
-  StrCpy $R6 5
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1024
-    ${OrIf} $R0 > 65535
-      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1
-    ${OrIf} $R0 > 99
-      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 9
-  ${Endif}
-  
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1024
-    ${OrIf} $R0 > 65535
-      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1
-    ${OrIf} $R0 > 99
-      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 9
-  ${Endif}
-FunctionEnd
+Function EnterConfigPage1\r
+  ${If} $AutomaticInstall = 1\r
+    Abort\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}\r
+\r
+  ${If} $R0 = 0\r
+    Abort\r
+  ${EndIf}\r
+\r
+  FileOpen $R5 "$PLUGINSDIR\ConfigPage1.ini" w\r
+\r
+  StrCpy $R6 1  ; Field Number\r
+  StrCpy $R7 0  ; Top\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentFile}\r
+  ${If} $R0 <> 0\r
+    IntOp $R8 $R7 + 52\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Client"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 12\r
+\r
+    IntOp $R8 $R7 + 8\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 2\r
+\r
+    IntOp $R8 $R8 - 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 2\r
+\r
+    IntOp $R8 $R8 - 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+\r
+    IntOp $R8 $R7 + 8\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 14\r
+\r
+    IntOp $R8 $R7 + 10\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+  ${Endif}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentStorage}\r
+  ${If} $R0 <> 0\r
+    IntOp $R8 $R7 + 52\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Storage"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 12\r
+    \r
+    IntOp $R8 $R7 + 8\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStorageName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 2\r
+\r
+    IntOp $R8 $R8 - 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStoragePort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 2\r
+\r
+    IntOp $R8 $R8 - 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStorageMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+\r
+    IntOp $R8 $R7 + 8\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStoragePassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 14\r
+\r
+    IntOp $R8 $R7 + 10\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+  ${Endif}\r
+\r
+  IntOp $R6 $R6 - 1\r
+\r
+  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"\r
+\r
+  FileClose $R5\r
+\r
+  !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"\r
+  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage1.ini"\r
+  Pop $HDLG ;HWND of dialog\r
+\r
+  ; Initialize Controls\r
+\r
+  StrCpy $R6 1  ; Field Number\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentFile}\r
+  ${If} $R0 <> 0\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Client Name\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 30 0\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Client Port Number\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 5 0\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Max Jobs\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 3 0\r
+\r
+    IntOp $R6 $R6 + 5\r
+  ${Endif}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentStorage}\r
+  ${If} $R0 <> 0\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Storage Name\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 30 0\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Storage Port Number\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 5 0\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    ; Max Jobs\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 3 0\r
+\r
+    IntOp $R6 $R6 + 5\r
+  ${Endif}\r
+\r
+  !insertmacro MUI_INSTALLOPTIONS_SHOW\r
+\r
+  ; Process results\r
+\r
+  StrCpy $R6 3\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentFile}\r
+  ${If} $R0 <> 0\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientName "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPort "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientMaxJobs "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPassword "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientInstallService "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientStartService "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 3\r
+  ${Endif}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentStorage}\r
+  ${If} $R0 <> 0\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageName "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePort "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageMaxJobs "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePassword "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageInstallService "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageStartService "ConfigPage1.ini" "Field $R6" "State"\r
+\r
+    IntOp $R6 $R6 + 3\r
+  ${Endif}\r
+FunctionEnd\r
+\r
+Function LeaveConfigPage1\r
+  StrCpy $R6 5\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentFile}\r
+  ${If} $R0 <> 0\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"\r
+    ${If} $R0 < 1024\r
+    ${OrIf} $R0 > 65535\r
+      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."\r
+      Abort\r
+    ${EndIf}\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"\r
+    ${If} $R0 < 1\r
+    ${OrIf} $R0 > 99\r
+      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."\r
+      Abort\r
+    ${EndIf}\r
+\r
+    IntOp $R6 $R6 + 9\r
+  ${Endif}\r
+  \r
+  IntOp $R0 $NewComponents & ${ComponentStorage}\r
+  ${If} $R0 <> 0\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"\r
+    ${If} $R0 < 1024\r
+    ${OrIf} $R0 > 65535\r
+      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."\r
+      Abort\r
+    ${EndIf}\r
+\r
+    IntOp $R6 $R6 + 2\r
+\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"\r
+    ${If} $R0 < 1\r
+    ${OrIf} $R0 > 99\r
+      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."\r
+      Abort\r
+    ${EndIf}\r
+\r
+    IntOp $R6 $R6 + 9\r
+  ${Endif}\r
+FunctionEnd\r
index e4b72bfe49eb62b742cd29e4d790da7c55039f6f..321d7b98cce3298dd7dae4aaa5b0838d78ebf2ae 100644 (file)
-Function EnterConfigPage2
-  IntOp $R0 $NewComponents & ${ComponentsRequiringUserConfig}
-
-  ${If} $R0 = 0
-    Abort
-  ${EndIf}
-
-  FileOpen $R5 "$PLUGINSDIR\ConfigPage2.ini" w
-
-  StrCpy $R6 1  ; Field Number
-  StrCpy $R7 0  ; Top
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    ${If} $AutomaticInstall = 1
-      IntOp $R8 $R7 + 54
-    ${Else}
-      IntOp $R8 $R7 + 92
-    ${EndIf}
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R8 $R7 + 54
-    ${Else}
-      IntOp $R8 $R7 + 26
-    ${EndIf}
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Remote Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-  ${EndIf}
-
-  IntOp $R6 $R6 + 1
-  IntOp $R7 $R7 + 12
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    ${If} "$ConfigDirectorName" == ""
-      StrCpy $ConfigDirectorName "$HostName-dir"
-    ${EndIf}
-    ${If} "$ConfigDirectorPassword" == ""
-      StrCpy $ConfigDirectorPassword "$LocalDirectorPassword"
-    ${EndIf}
-  ${Else}
-    ${If} "$ConfigDirectorName" == "$HostName-dir"
-      StrCpy $ConfigDirectorName ""
-    ${EndIf}
-    ${If} "$ConfigDirectorPassword" == "$LocalDirectorPassword"
-      StrCpy $ConfigDirectorPassword ""
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R7 $R7 + 2
-        IntOp $R8 $R8 - 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-        IntOp $R7 $R7 - 2
-
-        IntOp $R8 $R8 + 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R7 $R7 + 2
-        IntOp $R8 $R8 - 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-        IntOp $R7 $R7 - 2
-
-        IntOp $R8 $R8 + 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-
-    IntOp $R7 $R7 + 14
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R7 $R7 + 2
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 14
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Server"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailServer$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Database"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    ${If} $ConfigDirectorDB = 0
-      ${If} $MySQLPath != ""
-        StrCpy $ConfigDirectorDB 1
-      ${ElseIf} $PostgreSQLPath != ""
-        StrCpy $ConfigDirectorDB 2
-      ${Else}
-        StrCpy $ConfigDirectorDB 3
-      ${EndIf}
-    ${EndIf}
-
-    ${If} $ConfigDirectorDB = 1
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="MySQL"$\r$\nFlags="GROUP"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=90$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-
-    ${If} $ConfigDirectorDB = 2
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="PostgreSQL"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=94$\r$\nTop=$R7$\r$\nRight=146$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-
-    ${If} $ConfigDirectorDB = 3
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="Sqlite"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=150$\r$\nTop=$R7$\r$\nRight=182$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R8 $R7 + 10
-      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 12
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R7 $R7 + 2
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 14
-      IntOp $R8 $R7 + 8
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R7 $R7 + 4
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R8 $R7 + 42
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Monitor"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 12
-
-      IntOp $R8 $R7 + 8
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-
-      IntOp $R8 $R8 + 2
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=150$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 16
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 20
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R6 $R6 - 1
-  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"
-
-  FileClose $R5
-
-  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 1
-    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"
-  ${Else}
-    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage2)" "$(SUBTITLE_ConfigPage2)"
-  ${EndIf}
-
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage2.ini"
-  Pop $HDLG ;HWND of dialog
-
-  ; Initialize Controls
-  StrCpy $R6 2  ; Field Number
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    ; Name
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        ; Port Number
-        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-        SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        ; Max Jobs
-        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-        SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 9
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-      SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process results
-
-  StrCpy $R6 2
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorName "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPort "ConfigPage2.ini" "Field $R6" "State"
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMaxJobs "ConfigPage2.ini" "Field $R6" "State"
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPassword "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailServer "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailAddress "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 1
-    ${Endif}
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 2
-    ${Endif}
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 3
-    ${Endif}
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorInstallService "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorStartService "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorAddress "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorName "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorPassword "ConfigPage2.ini" "Field $R6" "State"
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function LeaveConfigPage2
-  ${If} $AutomaticInstall = 0
-    StrCpy $R6 4
-
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-      ${If} $R0 < 1024
-      ${OrIf} $R0 > 65535
-        MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-        Abort
-      ${EndIf}
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-
-    IntOp $R0 $NewComponents & ${ComponentDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-      ${If} $R0 < 1
-      ${OrIf} $R0 > 99
-        MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-        Abort
-      ${EndIf}
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
+Function EnterConfigPage2\r
+  IntOp $R0 $NewComponents & ${ComponentsRequiringUserConfig}\r
+\r
+  ${If} $R0 = 0\r
+    Abort\r
+  ${EndIf}\r
+\r
+  FileOpen $R5 "$PLUGINSDIR\ConfigPage2.ini" w\r
+\r
+  StrCpy $R6 1  ; Field Number\r
+  StrCpy $R7 0  ; Top\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 <> 0\r
+    ${If} $AutomaticInstall = 1\r
+      IntOp $R8 $R7 + 54\r
+    ${Else}\r
+      IntOp $R8 $R7 + 92\r
+    ${EndIf}\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+  ${Else}\r
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R8 $R7 + 54\r
+    ${Else}\r
+      IntOp $R8 $R7 + 26\r
+    ${EndIf}\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Remote Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+  ${EndIf}\r
+\r
+  IntOp $R6 $R6 + 1\r
+  IntOp $R7 $R7 + 12\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 <> 0\r
+    ${If} "$ConfigDirectorName" == ""\r
+      StrCpy $ConfigDirectorName "$HostName-dir"\r
+    ${EndIf}\r
+    ${If} "$ConfigDirectorPassword" == ""\r
+      StrCpy $ConfigDirectorPassword "$LocalDirectorPassword"\r
+    ${EndIf}\r
+  ${Else}\r
+    ${If} "$ConfigDirectorName" == "$HostName-dir"\r
+      StrCpy $ConfigDirectorName ""\r
+    ${EndIf}\r
+    ${If} "$ConfigDirectorPassword" == "$LocalDirectorPassword"\r
+      StrCpy $ConfigDirectorPassword ""\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 = 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    IntOp $R8 $R7 + 8\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+\r
+    IntOp $R8 $R8 + 2\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+      ${If} $R0 <> 0\r
+        IntOp $R7 $R7 + 2\r
+        IntOp $R8 $R8 - 2\r
+        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+        IntOp $R6 $R6 + 1\r
+        IntOp $R7 $R7 - 2\r
+\r
+        IntOp $R8 $R8 + 2\r
+        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+\r
+      IntOp $R0 $NewComponents & ${ComponentDirector}\r
+      ${If} $R0 <> 0\r
+        IntOp $R7 $R7 + 2\r
+        IntOp $R8 $R8 - 2\r
+        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+        IntOp $R6 $R6 + 1\r
+        IntOp $R7 $R7 - 2\r
+\r
+        IntOp $R8 $R8 + 2\r
+        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+    ${EndIf}\r
+\r
+    IntOp $R7 $R7 + 14\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+  ${If} $R0 <> 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R7 $R7 + 2\r
+      IntOp $R8 $R7 + 8\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 - 2\r
+      IntOp $R8 $R8 + 2\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 14\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 <> 0\r
+    IntOp $R7 $R7 + 2\r
+    IntOp $R8 $R7 + 8\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Server"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+    IntOp $R8 $R8 + 2\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailServer$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+    IntOp $R8 $R7 + 8\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+    IntOp $R8 $R8 + 2\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 16\r
+    IntOp $R8 $R7 + 8\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Database"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 - 2\r
+    IntOp $R8 $R8 + 2\r
+\r
+    ${If} $ConfigDirectorDB = 0\r
+      ${If} $MySQLPath != ""\r
+        StrCpy $ConfigDirectorDB 1\r
+      ${ElseIf} $PostgreSQLPath != ""\r
+        StrCpy $ConfigDirectorDB 2\r
+      ${Else}\r
+        StrCpy $ConfigDirectorDB 3\r
+      ${EndIf}\r
+    ${EndIf}\r
+\r
+    ${If} $ConfigDirectorDB = 1\r
+      StrCpy $R9 1\r
+    ${Else}\r
+      StrCpy $R9 0\r
+    ${EndIf}\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="MySQL"$\r$\nFlags="GROUP"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=90$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $ConfigDirectorDB = 2\r
+      StrCpy $R9 1\r
+    ${Else}\r
+      StrCpy $R9 0\r
+    ${EndIf}\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="PostgreSQL"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=94$\r$\nTop=$R7$\r$\nRight=146$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $ConfigDirectorDB = 3\r
+      StrCpy $R9 1\r
+    ${Else}\r
+      StrCpy $R9 0\r
+    ${EndIf}\r
+\r
+    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="Sqlite"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=150$\r$\nTop=$R7$\r$\nRight=182$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+    IntOp $R6 $R6 + 1\r
+    IntOp $R7 $R7 + 12\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      IntOp $R8 $R7 + 10\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+      IntOp $R6 $R6 + 1\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 12\r
+    ${EndIf}\r
+  ${Else}\r
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R7 $R7 + 2\r
+      IntOp $R8 $R7 + 8\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 - 2\r
+      IntOp $R8 $R8 + 2\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 14\r
+      IntOp $R8 $R7 + 8\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R7 $R7 + 4\r
+\r
+  ${If} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}\r
+    ${If} $R0 <> 0\r
+      IntOp $R8 $R7 + 42\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Monitor"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 12\r
+\r
+      IntOp $R8 $R7 + 8\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 - 2\r
+\r
+      IntOp $R8 $R8 + 2\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=150$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 16\r
+      IntOp $R8 $R7 + 8\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 - 2\r
+      IntOp $R8 $R8 + 2\r
+\r
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'\r
+\r
+      IntOp $R6 $R6 + 1\r
+      IntOp $R7 $R7 + 20\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R6 $R6 - 1\r
+  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"\r
+\r
+  FileClose $R5\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}\r
+  ${If} $R0 = 0\r
+  ${OrIf} $AutomaticInstall = 1\r
+    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"\r
+  ${Else}\r
+    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage2)" "$(SUBTITLE_ConfigPage2)"\r
+  ${EndIf}\r
+\r
+  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage2.ini"\r
+  Pop $HDLG ;HWND of dialog\r
+\r
+  ; Initialize Controls\r
+  StrCpy $R6 2  ; Field Number\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 = 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    ; Name\r
+    IntOp $R6 $R6 + 1\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"\r
+    SendMessage $HCTL ${EM_LIMITTEXT} 30 0\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+      ${If} $R0 <> 0\r
+        IntOp $R6 $R6 + 1\r
+        ; Port Number\r
+        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"\r
+        SendMessage $HCTL ${EM_LIMITTEXT} 5 0\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+\r
+      IntOp $R0 $NewComponents & ${ComponentDirector}\r
+      ${If} $R0 <> 0\r
+        IntOp $R6 $R6 + 1\r
+        ; Max Jobs\r
+        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"\r
+        SendMessage $HCTL ${EM_LIMITTEXT} 3 0\r
+\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+  ${If} $R0 <> 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 2\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 <> 0\r
+    IntOp $R6 $R6 + 9\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      IntOp $R6 $R6 + 2\r
+    ${EndIf}\r
+  ${Else}\r
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 2\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  ${If} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 2\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"\r
+      SendMessage $HCTL ${EM_LIMITTEXT} 30 0\r
+      IntOp $R6 $R6 + 2\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  !insertmacro MUI_INSTALLOPTIONS_SHOW\r
+\r
+  ; Process results\r
+\r
+  StrCpy $R6 2\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 = 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    IntOp $R6 $R6 + 1\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorName "ConfigPage2.ini" "Field $R6" "State"\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+      ${If} $R0 <> 0\r
+        IntOp $R6 $R6 + 1\r
+        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPort "ConfigPage2.ini" "Field $R6" "State"\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+\r
+      IntOp $R0 $NewComponents & ${ComponentDirector}\r
+      ${If} $R0 <> 0\r
+        IntOp $R6 $R6 + 1\r
+        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMaxJobs "ConfigPage2.ini" "Field $R6" "State"\r
+        IntOp $R6 $R6 + 1\r
+      ${EndIf}\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+  ${If} $R0 <> 0\r
+  ${OrIf} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 1\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPassword "ConfigPage2.ini" "Field $R6" "State"\r
+      IntOp $R6 $R6 + 1\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentDirector}\r
+  ${If} $R0 <> 0\r
+    IntOp $R6 $R6 + 1\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailServer "ConfigPage2.ini" "Field $R6" "State"\r
+    IntOp $R6 $R6 + 2\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailAddress "ConfigPage2.ini" "Field $R6" "State"\r
+    IntOp $R6 $R6 + 2\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"\r
+    ${If} $R5 = 1\r
+      StrCpy $ConfigDirectorDB 1\r
+    ${Endif}\r
+    IntOp $R6 $R6 + 1\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"\r
+    ${If} $R5 = 1\r
+      StrCpy $ConfigDirectorDB 2\r
+    ${Endif}\r
+    IntOp $R6 $R6 + 1\r
+    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"\r
+    ${If} $R5 = 1\r
+      StrCpy $ConfigDirectorDB 3\r
+    ${Endif}\r
+    IntOp $R6 $R6 + 1\r
+\r
+    ${If} $AutomaticInstall = 0\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorInstallService "ConfigPage2.ini" "Field $R6" "State"\r
+      IntOp $R6 $R6 + 1\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorStartService "ConfigPage2.ini" "Field $R6" "State"\r
+      IntOp $R6 $R6 + 1\r
+    ${EndIf}\r
+  ${Else}\r
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 1\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorAddress "ConfigPage2.ini" "Field $R6" "State"\r
+      IntOp $R6 $R6 + 1\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  ${If} $AutomaticInstall = 0\r
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 2\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorName "ConfigPage2.ini" "Field $R6" "State"\r
+      IntOp $R6 $R6 + 2\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorPassword "ConfigPage2.ini" "Field $R6" "State"\r
+    ${EndIf}\r
+  ${EndIf}\r
+FunctionEnd\r
+\r
+Function LeaveConfigPage2\r
+  ${If} $AutomaticInstall = 0\r
+    StrCpy $R6 4\r
+\r
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 1\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"\r
+      ${If} $R0 < 1024\r
+      ${OrIf} $R0 > 65535\r
+        MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."\r
+        Abort\r
+      ${EndIf}\r
+      IntOp $R6 $R6 + 1\r
+    ${EndIf}\r
+\r
+    IntOp $R0 $NewComponents & ${ComponentDirector}\r
+    ${If} $R0 <> 0\r
+      IntOp $R6 $R6 + 1\r
+      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"\r
+      ${If} $R0 < 1\r
+      ${OrIf} $R0 > 99\r
+        MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."\r
+        Abort\r
+      ${EndIf}\r
+      IntOp $R6 $R6 + 1\r
+    ${EndIf}\r
+  ${EndIf}\r
+FunctionEnd\r
index 33ac4c782cc532ce0b3e655b806bde8187e40ddd..c450044a802e66e7b5fd2b60c9ba6c281fbccb57 100644 (file)
@@ -1,46 +1,46 @@
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
-
-Function DumpLog
-  Exch $5
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $6
-
-  FindWindow $0 "#32770" "" $HWNDPARENT
-  GetDlgItem $0 $0 1016
-  StrCmp $0 0 error
-  FileOpen $5 $5 "w"
-  StrCmp $5 0 error
-    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
-    System::Alloc ${NSIS_MAX_STRLEN}
-    Pop $3
-    StrCpy $2 0
-    System::Call "*(i, i, i, i, i, i, i, i, i) i \
-      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
-    loop: StrCmp $2 $6 done
-      System::Call "User32::SendMessageA(i, i, i, i) i \
-        ($0, ${LVM_GETITEMTEXT}, $2, r1)"
-      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
-      FileWrite $5 "$4$\r$\n"
-      IntOp $2 $2 + 1
-      Goto loop
-    done:
-      FileClose $5
-      System::Free $1
-      System::Free $3
-      Goto exit
-  error:
-    MessageBox MB_OK error
-  exit:
-    Pop $6
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-    Exch $5
-FunctionEnd
+!define LVM_GETITEMCOUNT 0x1004\r
+!define LVM_GETITEMTEXT 0x102D\r
+\r
+Function DumpLog\r
+  Exch $5\r
+  Push $0\r
+  Push $1\r
+  Push $2\r
+  Push $3\r
+  Push $4\r
+  Push $6\r
+\r
+  FindWindow $0 "#32770" "" $HWNDPARENT\r
+  GetDlgItem $0 $0 1016\r
+  StrCmp $0 0 error\r
+  FileOpen $5 $5 "w"\r
+  StrCmp $5 0 error\r
+    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6\r
+    System::Alloc ${NSIS_MAX_STRLEN}\r
+    Pop $3\r
+    StrCpy $2 0\r
+    System::Call "*(i, i, i, i, i, i, i, i, i) i \\r
+      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"\r
+    loop: StrCmp $2 $6 done\r
+      System::Call "User32::SendMessageA(i, i, i, i) i \\r
+        ($0, ${LVM_GETITEMTEXT}, $2, r1)"\r
+      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"\r
+      FileWrite $5 "$4$\r$\n"\r
+      IntOp $2 $2 + 1\r
+      Goto loop\r
+    done:\r
+      FileClose $5\r
+      System::Free $1\r
+      System::Free $3\r
+      Goto exit\r
+  error:\r
+    MessageBox MB_OK error\r
+  exit:\r
+    Pop $6\r
+    Pop $4\r
+    Pop $3\r
+    Pop $2\r
+    Pop $1\r
+    Pop $0\r
+    Exch $5\r
+FunctionEnd\r
index 2993a3ac4588a8d7d757f284d6f48fc0c60d3d09..62c88cf6da423ab47b950797cdc87494c557aa21 100644 (file)
@@ -1,51 +1,51 @@
-[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
-Left=6
-Right=44
-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 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.
-Left=17
-Right=295
-Top=104
-Bottom=132
+[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
index 1c7f5bbf4aab9b061842f23e398fb7a38ca6c3c3..0a0f902532d850b529097eb0211f93b9c2ef98bd 100644 (file)
@@ -1,98 +1,98 @@
-Function EnterInstallType
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ; Check if this is an upgrade by looking for an uninstaller configured 
-  ; in the registry.
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString"
-
-  ${If} "$R0" != ""
-    ; Check registry for new installer
-    ReadRegStr $R1 HKLM "Software\Bacula" "InstallLocation"
-    ${If} "$R1" != ""
-      ; New Installer 
-      StrCpy $OldInstallDir $R1
-      StrCpy $InstallType ${UpgradeInstall}
-
-      SetShellVarContext all
-
-      StrCpy $R1 "$APPDATA\Bacula"
-      StrCpy $R2 "$INSTDIR\Doc"
-
-      ReadRegDWORD $PreviousComponents HKLM "Software\Bacula" "Components"
-
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "A previous installation has been found in $OldInstallDir.  Please choose the installation type for any additional components you select."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The configuration files for additional components will be generated using defaults applicable to most installations."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "The configuration defaults for additional components will be displayed and you will be given the chance to make changes before the configuration files are written."
-
-      ReadRegDWORD $ConfigDirectorDB HKLM Software\Bacula Database
-
-      ${If} $ConfigDirectorDB = 0
-        IntOp $R0 $PreviousComponents & ${ComponentDirector}
-        ${If} $R0 <> 0
-          StrCpy $ConfigDirectorDB 1
-        ${EndIf}
-      ${EndIf}
-    ${Else}
-      ; Processing Upgrade - Get Install Directory
-      ${StrRep} $R0 $R0 '"' ''
-      ${GetParent} $R0 $OldInstallDir
-
-      ; Old Installer 
-      StrCpy $InstallType ${MigrateInstall}
-      StrCpy $R1 "$OldInstallDir\bin"
-      StrCpy $R2 "$OldInstallDir\Doc"
-
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "An old installation has been found in $OldInstallDir.  The Configuration will be migrated.  Please choose the installation type for any additional components you select."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files for additional components will be generated using defaults applicable to most installations."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "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."
-    ${EndIf}
-  ${Else}
-    ; New Install
-    StrCpy $InstallType ${NewInstall}
-    WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files will be generated using defaults applicable to most installations."
-  ${EndIf}
-
-  ${If} $InstallType <> ${NewInstall}
-  ${AndIf} $PreviousComponents = 0
-    ${If} ${FileExists} "$R1\bacula-fd.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentFile}
-    ${EndIf}
-    ${If} ${FileExists} "$R1\bconsole.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentTextConsole}
-    ${EndIf}
-    ${If} ${FileExists} "$R1\wx-console.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentGUIConsole}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula.pdf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentPDFDocs}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula\bacula.html"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula.html"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
-    ${EndIf}
-  ${EndIf}
-
-  !InsertMacro MUI_HEADER_TEXT "$(TITLE_InstallType)" "$(SUBTITLE_InstallType)"
-  !InsertMacro MUI_INSTALLOPTIONS_INITDIALOG "InstallType.ini"
-  Pop $HDLG ;HWND of dialog
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process Results
-
-  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "InstallType.ini" "Field 3" "State"
-
-  ${If} $R0 = 1
-    StrCpy $AutomaticInstall 1
-  ${Else}
-    StrCpy $AutomaticInstall 0
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Pop $R0
-FunctionEnd
+Function EnterInstallType\r
+  Push $R0\r
+  Push $R1\r
+  Push $R2\r
+\r
+  ; Check if this is an upgrade by looking for an uninstaller configured \r
+  ; in the registry.\r
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString"\r
+\r
+  ${If} "$R0" != ""\r
+    ; Check registry for new installer\r
+    ReadRegStr $R1 HKLM "Software\Bacula" "InstallLocation"\r
+    ${If} "$R1" != ""\r
+      ; New Installer \r
+      StrCpy $OldInstallDir $R1\r
+      StrCpy $InstallType ${UpgradeInstall}\r
+\r
+      SetShellVarContext all\r
+\r
+      StrCpy $R1 "$APPDATA\Bacula"\r
+      StrCpy $R2 "$INSTDIR\Doc"\r
+\r
+      ReadRegDWORD $PreviousComponents HKLM "Software\Bacula" "Components"\r
+\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "A previous installation has been found in $OldInstallDir.  Please choose the installation type for any additional components you select."\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The configuration files for additional components will be generated using defaults applicable to most installations."\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "The configuration defaults for additional components will be displayed and you will be given the chance to make changes before the configuration files are written."\r
+\r
+      ReadRegDWORD $ConfigDirectorDB HKLM Software\Bacula Database\r
+\r
+      ${If} $ConfigDirectorDB = 0\r
+        IntOp $R0 $PreviousComponents & ${ComponentDirector}\r
+        ${If} $R0 <> 0\r
+          StrCpy $ConfigDirectorDB 1\r
+        ${EndIf}\r
+      ${EndIf}\r
+    ${Else}\r
+      ; Processing Upgrade - Get Install Directory\r
+      ${StrRep} $R0 $R0 '"' ''\r
+      ${GetParent} $R0 $OldInstallDir\r
+\r
+      ; Old Installer \r
+      StrCpy $InstallType ${MigrateInstall}\r
+      StrCpy $R1 "$OldInstallDir\bin"\r
+      StrCpy $R2 "$OldInstallDir\Doc"\r
+\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "An old installation has been found in $OldInstallDir.  The Configuration will be migrated.  Please choose the installation type for any additional components you select."\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files for additional components will be generated using defaults applicable to most installations."\r
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "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
+    ${EndIf}\r
+  ${Else}\r
+    ; New Install\r
+    StrCpy $InstallType ${NewInstall}\r
+    WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files will be generated using defaults applicable to most installations."\r
+  ${EndIf}\r
+\r
+  ${If} $InstallType <> ${NewInstall}\r
+  ${AndIf} $PreviousComponents = 0\r
+    ${If} ${FileExists} "$R1\bacula-fd.conf"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentFile}\r
+    ${EndIf}\r
+    ${If} ${FileExists} "$R1\bconsole.conf"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentTextConsole}\r
+    ${EndIf}\r
+    ${If} ${FileExists} "$R1\wx-console.conf"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentGUIConsole}\r
+    ${EndIf}\r
+    ${If} ${FileExists} "$R2\bacula.pdf"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentPDFDocs}\r
+    ${EndIf}\r
+    ${If} ${FileExists} "$R2\bacula\bacula.html"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}\r
+    ${EndIf}\r
+    ${If} ${FileExists} "$R2\bacula.html"\r
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  !InsertMacro MUI_HEADER_TEXT "$(TITLE_InstallType)" "$(SUBTITLE_InstallType)"\r
+  !InsertMacro MUI_INSTALLOPTIONS_INITDIALOG "InstallType.ini"\r
+  Pop $HDLG ;HWND of dialog\r
+\r
+  !insertmacro MUI_INSTALLOPTIONS_SHOW\r
+\r
+  ; Process Results\r
+\r
+  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "InstallType.ini" "Field 3" "State"\r
+\r
+  ${If} $R0 = 1\r
+    StrCpy $AutomaticInstall 1\r
+  ${Else}\r
+    StrCpy $AutomaticInstall 0\r
+  ${EndIf}\r
+\r
+  Pop $R2\r
+  Pop $R1\r
+  Pop $R0\r
+FunctionEnd\r
index 848470b1ef9269bb920c064d7a399f540e38d525..0b61f7ec1de3347e4c606005cdc356bc2638ec8a 100644 (file)
@@ -1,5 +1,5 @@
-rem
-rem Bacula start file for Win95/98/Me
-rem
-cd c:\bacula\bin
-c:\bacula\bin\bacula-fd.exe /service -c c:\bacula\bin\bacula-fd.conf
+rem\r
+rem Bacula start file for Win95/98/Me\r
+rem\r
+cd c:\bacula\bin\r
+c:\bacula\bin\bacula-fd.exe /service -c c:\bacula\bin\bacula-fd.conf\r
index 4071e9d3ed943b27f693037576ee8df03c741574..3b1d0e5b9184136938076a4c9ccc8064a4fa1cd8 100644 (file)
@@ -1,5 +1,5 @@
-rem
-rem Bacula stop file for Win95/98/Me
-rem
-cd c:\bacula\bin
-c:\bacula\bin\bacula-fd.exe /kill
+rem\r
+rem Bacula stop file for Win95/98/Me\r
+rem\r
+cd c:\bacula\bin\r
+c:\bacula\bin\bacula-fd.exe /kill\r
index da921be2a733a03bc6fb73ccffb420be8067df5d..c3c0aad8c66ed42d986d63ba0c17f203242e738c 100644 (file)
@@ -1,48 +1,48 @@
-[Settings]
-NumFields=5
-CancelEnabled=0
-BackEnabled=0
-
-[Field 1]
-Type="Label"
-Text="Templates of the Client and Storage resources can be generated that are customized with the information about this system.  These templates can then be copied to the Director computer and included in the Director's configuration file."
-Left=7
-Right=293
-Top=6
-Bottom=32
-
-[Field 2]
-Type="CheckBox"
-Text="Client"
-Left=6
-Right=40
-Top=38
-Bottom=48
-
-[Field 3]
-Type="FileRequest"
-State="Client.conf"
-Flags=
-Filter=Configuration Files|*.conf|All Files|*.*
-Left=16
-Right=288
-Top=50
-Bottom=62
-
-[Field 4]
-Type="CheckBox"
-Text="Storage"
-Left=6
-Right=48
-Top=70
-Bottom=80
-
-[Field 5]
-Type="FileRequest"
-State="Storage.conf"
-Flags=REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST
-Filter=Configuration Files|*.conf|All Files|*.*
-Left=16
-Right=288
-Top=82
-Bottom=94
+[Settings]\r
+NumFields=5\r
+CancelEnabled=0\r
+BackEnabled=0\r
+\r
+[Field 1]\r
+Type="Label"\r
+Text="Templates of the Client and Storage resources can be generated that are customized with the information about this system.  These templates can then be copied to the Director computer and included in the Director's configuration file."\r
+Left=7\r
+Right=293\r
+Top=6\r
+Bottom=32\r
+\r
+[Field 2]\r
+Type="CheckBox"\r
+Text="Client"\r
+Left=6\r
+Right=40\r
+Top=38\r
+Bottom=48\r
+\r
+[Field 3]\r
+Type="FileRequest"\r
+State="Client.conf"\r
+Flags=\r
+Filter=Configuration Files|*.conf|All Files|*.*\r
+Left=16\r
+Right=288\r
+Top=50\r
+Bottom=62\r
+\r
+[Field 4]\r
+Type="CheckBox"\r
+Text="Storage"\r
+Left=6\r
+Right=48\r
+Top=70\r
+Bottom=80\r
+\r
+[Field 5]\r
+Type="FileRequest"\r
+State="Storage.conf"\r
+Flags=REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST\r
+Filter=Configuration Files|*.conf|All Files|*.*\r
+Left=16\r
+Right=288\r
+Top=82\r
+Bottom=94\r
index 91bfe65fe756f2d5645972e7fc104efe0862808c..cc809edfd2b9c77d045d99215fb3306ec813c8d8 100644 (file)
-#
-# Default Bacula Director Configuration file
-#
-#  The only thing that MUST be changed is to add one or more
-#   file or directory names in the Include directive of the
-#   FileSet resource.
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-#  You might also want to change the default email address
-#   from root to your address.  See the "mail" and "operator"
-#   directives in the Messages resource.
-#
-
-Director {                            # define myself
-  Name = @director_name@
-  DIRport = @director_port@                # where we listen for UA connections
-  QueryFile = "@bin_dir@\\query.sql"
-  WorkingDirectory = "@working_dir@"
-  PidDirectory = "@working_dir@"
-  Maximum Concurrent Jobs = @director_maxjobs@
-  Password = "@director_password@"         # Console password
-  Messages = Daemon
-}
-
-JobDefs {
-  Name = "DefaultJob"
-  Type = Backup
-  Level = Incremental
-  Client = @client_name@
-  FileSet = "Test Set"
-  Schedule = "WeeklyCycle"
-  Storage = File
-  Messages = Standard
-  Pool = Default
-  Priority = 10
-}
-
-
-#
-# Define the main nightly save backup job
-#   By default, this job will back up to disk in C:/tmp
-Job {
-  Name = "Client1"
-  JobDefs = "DefaultJob"
-  Write Bootstrap = "@working_dir@\\Client1.bsr"
-}
-
-#Job {
-#  Name = "Client2"
-#  Client = @client_name@2
-#  JobDefs = "DefaultJob"
-#  Write Bootstrap = "@working_dir@\\Client2.bsr"
-#}
-
-# Backup the catalog database (after the nightly save)
-Job {
-  Name = "BackupCatalog"
-  JobDefs = "DefaultJob"
-  Level = Full
-  FileSet="Catalog"
-  Schedule = "WeeklyCycleAfterBackup"
-  # This creates an ASCII copy of the catalog
-  RunBeforeJob = "\"@bin_dir@\\make_catalog_backup\" bacula bacula"
-  # This deletes the copy of the catalog
-  RunAfterJob  = "\"@bin_dir@\\delete_catalog_backup\""
-  Write Bootstrap = "@working_dir@\\BackupCatalog.bsr"
-  Priority = 11                   # run after main backup
-}
-
-#
-# Standard Restore template, to be changed by Console program
-#  Only one such job is needed for all Jobs/Clients/Storage ...
-#
-Job {
-  Name = "RestoreFiles"
-  Type = Restore
-  Client=@client_name@
-  FileSet="Test Set"
-  Storage = File
-  Pool = Default
-  Messages = Standard
-  Where = "C:\\tmp\\bacula-restores"
-}
-
-#
-# Note: Windows path separators do NOT work correctly in FileSets.
-#
-# List of files to be backed up
-FileSet {
-  Name = "Test Set"
-  Include {
-    Options {
-      signature = MD5
-      ignore case = yes
-    }
-#    
-#  Put your list of files here, preceded by 'File =', one per line
-#    or include an external list with:
-#
-#    File = <file-name
-#
-#  Note: C:/ backs up everything on drive C.
-#    if you have other drives such as D:/
-#    you will probably want to add them too.
-#
-#  By default this is defined to point to the Bacula 
-#    directory to give a reasonable FileSet to backup to
-#    disk storage during initial testing.
-#
-    File = "@BUILD_DIR@"
-  }
-
-#
-# If you backup the root directory, the following excluded
-#   files can be useful
-#
-  Exclude {
-    Options {
-      signature = MD5
-      ignore case = yes
-    }
-    File = C:/Temp
-    File = C:/tmp
-  }
-}
-
-#
-# This is an example which will backup all the hard drives of a Windows System.
-#
-FileSet {
-  Name = "Windows Full Set"
-  Enable VSS = yes
-  Include {
-    Options {
-      Signature = MD5
-      Exclude = yes
-      IgnoreCase = yes
-      EnhancedWild = yes
-      DriveType = fixed
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/Documents and Settings/*/Cookies"
-      WildDir = "[A-Z]:/Documents and Settings/*/Recent"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Cookies"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Recent"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Cookies"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Recent"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Some random bits of Windows we want to ignore
-      WildDir = "[A-Z]:/{WINNT,Windows}/Prefetch"
-      WildDir = "[A-Z]:/{WINNT,Windows}/msdownld.tmp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Internet Logs"
-      WildDir = "[A-Z]:/{WINNT,Windows}/$Nt*Uninstall*"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Downloaded Installations"
-
-      # Temporary directories & files
-      WildDir = "[A-Z]:/{WINNT,Windows}/Temp"
-      WildDir = "[A-Z]:/Temp"
-      WildFile = "*.tmp"
-      WildDir = "[A-Z]:/tmp"
-
-      # Fast Find
-      WildFile = "[A-Z]:/ffastun*"
-
-      # System Restore
-      WildDir = "[A-Z]:/System Volume Information"
-
-      # Windows Update
-      WildDir = "[A-Z]:/WUTemp"
-
-      # Recycle bins
-      WildDir = "[A-Z]:/RECYCLE[DR]"
-
-      # Swap files
-      WildFile = "[A-Z]:/pagefile.sys"
-      WildFile = "[A-Z]:/hiberfil.sys"
-
-      # These are programs and are easier to reinstall than restore from
-      # backup
-      WildDir = "[A-Z]:/cygwin"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java Web Start"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/JavaSoft"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Microsoft Office"
-    }
-
-    File = "C:/"
-    File = "D:/"
-    File = "E:/"
-    File = "F:/"
-    File = "G:/"
-    File = "H:/"
-    File = "I:/"
-    File = "J:/"
-    File = "K:/"
-    File = "L:/"
-    File = "M:/"
-    File = "N:/"
-    File = "O:/"
-    File = "P:/"
-    File = "Q:/"
-    File = "R:/"
-    File = "S:/"
-    File = "T:/"
-    File = "U:/"
-    File = "V:/"
-    File = "W:/"
-    File = "X:/"
-    File = "Y:/"
-    File = "Z:/"
-  }
-}
-
-#
-# When to do the backups, full backup on first sunday of the month,
-#  differential (i.e. incremental since full) every other sunday,
-#  and incremental backups other days
-Schedule {
-  Name = "WeeklyCycle"
-  Run = Full 1st sun at 23:05
-  Run = Differential 2nd-5th sun at 23:05
-  Run = Incremental mon-sat at 23:05
-}
-
-# This schedule does the catalog. It starts after the WeeklyCycle
-Schedule {
-  Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 23:10
-}
-
-# This is the backup of the catalog
-FileSet {
-  Name = "Catalog"
-  Include {
-    Options {
-      signature = MD5
-    }
-    File = "@working_dir@\\bacula.sql"
-  }
-}
-
-# Client (File Services) to backup
-Client {
-  Name = @client_name@
-  Address = @client_address@
-  FDPort = @client_port@
-  Catalog = MyCatalog
-  Password = "@client_password@"      # password for FileDaemon
-  File Retention = 30 days            # 30 days
-  Job Retention = 6 months            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-}
-
-#
-# Second Client (File Services) to backup
-#  You should change Name, Address, and Password before using
-#
-#Client {
-#  Name = @client_name@2
-#  Address = @client_address@2
-#  FDPort = @client_port@
-#  Catalog = MyCatalog
-#  Password = "@client_password@2"     # password for FileDaemon 2
-#  File Retention = 30 days            # 30 days
-#  Job Retention = 6 months            # six months
-#  AutoPrune = yes                     # Prune expired Jobs/Files
-#}
-
-
-# Definition of file storage device
-Storage {
-  Name = File
-# Do not use "localhost" here
-  Address = @storage_address@                # N.B. Use a fully qualified name here
-  SDPort = @storage_port@
-  Password = "@storage_password@"
-  Device = FileStorage
-  Media Type = File
-}
-
-
-
-# Definition of DDS tape storage device
-#Storage {
-#  Name = DDS-4    
-#  Do not use "localhost" here
-#  Address = @storage_address@                # N.B. Use a fully qualified name here
-#  SDPort = @storage_port@
-#  Password = "@storage_password@"          # password for Storage daemon
-#  Device = DDS-4                      # must be same as Device in Storage daemon
-#  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
-#  Autochanger = yes                   # enable for autochanger device
-#}
-
-# Definition of 8mm tape storage device
-#Storage {
-#  Name = "8mmDrive"
-#  Do not use "localhost" here
-#  Address = @storage_address@                # N.B. Use a fully qualified name here
-#  SDPort = @storage_port@
-#  Password = "@storage_password@"
-#  Device = "Exabyte 8mm"
-#  MediaType = "8mm"
-#}
-
-
-# Generic catalog service
-Catalog {
-  Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
-}
-
-# Reasonable message delivery -- send most everything to email address
-#  and to the console
-Messages {
-  Name = Standard
-#
-# NOTE! If you send to two email or more email addresses, you will need
-#  to replace the %r in the from field (-f part) with a single valid
-#  email address in both the mailcommand and the operatorcommand.
-#
-  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  mail = @job_email@ = all, !skipped            
-  operator = @job_email@ = mount
-  console = all, !skipped, !saved
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if they scroll off the console.
-#
-  append = "@working_dir@\\log" = all, !skipped
-}
-
-
-#
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped            
-  console = all, !skipped, !saved
-  append = "@working_dir@\\log" = all, !skipped
-}
-
-
-
-# Default pool definition
-Pool {
-  Name = Default
-  Pool Type = Backup
-  Recycle = yes                       # Bacula can automatically recycle Volumes
-  AutoPrune = yes                     # Prune expired volumes
-  Volume Retention = 365 days         # one year
-}
-
-#
-# Restricted console used by tray-monitor to get the status of the director
-#
-Console {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  CommandACL = status, .status
-}
+#\r
+# Default Bacula Director Configuration file\r
+#\r
+#  The only thing that MUST be changed is to add one or more\r
+#   file or directory names in the Include directive of the\r
+#   FileSet resource.\r
+#\r
+#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@\r
+#\r
+#  You might also want to change the default email address\r
+#   from root to your address.  See the "mail" and "operator"\r
+#   directives in the Messages resource.\r
+#\r
+\r
+Director {                            # define myself\r
+  Name = @director_name@\r
+  DIRport = @director_port@                # where we listen for UA connections\r
+  QueryFile = "@bin_dir@\\query.sql"\r
+  WorkingDirectory = "@working_dir@"\r
+  PidDirectory = "@working_dir@"\r
+  Maximum Concurrent Jobs = @director_maxjobs@\r
+  Password = "@director_password@"         # Console password\r
+  Messages = Daemon\r
+}\r
+\r
+JobDefs {\r
+  Name = "DefaultJob"\r
+  Type = Backup\r
+  Level = Incremental\r
+  Client = @client_name@\r
+  FileSet = "Test Set"\r
+  Schedule = "WeeklyCycle"\r
+  Storage = File\r
+  Messages = Standard\r
+  Pool = Default\r
+  Priority = 10\r
+}\r
+\r
+\r
+#\r
+# Define the main nightly save backup job\r
+#   By default, this job will back up to disk in C:/tmp\r
+Job {\r
+  Name = "Client1"\r
+  JobDefs = "DefaultJob"\r
+  Write Bootstrap = "@working_dir@\\Client1.bsr"\r
+}\r
+\r
+#Job {\r
+#  Name = "Client2"\r
+#  Client = @client_name@2\r
+#  JobDefs = "DefaultJob"\r
+#  Write Bootstrap = "@working_dir@\\Client2.bsr"\r
+#}\r
+\r
+# Backup the catalog database (after the nightly save)\r
+Job {\r
+  Name = "BackupCatalog"\r
+  JobDefs = "DefaultJob"\r
+  Level = Full\r
+  FileSet="Catalog"\r
+  Schedule = "WeeklyCycleAfterBackup"\r
+  # This creates an ASCII copy of the catalog\r
+  RunBeforeJob = "\"@bin_dir@\\make_catalog_backup\" bacula bacula"\r
+  # This deletes the copy of the catalog\r
+  RunAfterJob  = "\"@bin_dir@\\delete_catalog_backup\""\r
+  Write Bootstrap = "@working_dir@\\BackupCatalog.bsr"\r
+  Priority = 11                   # run after main backup\r
+}\r
+\r
+#\r
+# Standard Restore template, to be changed by Console program\r
+#  Only one such job is needed for all Jobs/Clients/Storage ...\r
+#\r
+Job {\r
+  Name = "RestoreFiles"\r
+  Type = Restore\r
+  Client=@client_name@\r
+  FileSet="Test Set"\r
+  Storage = File\r
+  Pool = Default\r
+  Messages = Standard\r
+  Where = "C:\\tmp\\bacula-restores"\r
+}\r
+\r
+#\r
+# Note: Windows path separators do NOT work correctly in FileSets.\r
+#\r
+# List of files to be backed up\r
+FileSet {\r
+  Name = "Test Set"\r
+  Include {\r
+    Options {\r
+      signature = MD5\r
+      ignore case = yes\r
+    }\r
+#    \r
+#  Put your list of files here, preceded by 'File =', one per line\r
+#    or include an external list with:\r
+#\r
+#    File = <file-name\r
+#\r
+#  Note: C:/ backs up everything on drive C.\r
+#    if you have other drives such as D:/\r
+#    you will probably want to add them too.\r
+#\r
+#  By default this is defined to point to the Bacula \r
+#    directory to give a reasonable FileSet to backup to\r
+#    disk storage during initial testing.\r
+#\r
+    File = "@BUILD_DIR@"\r
+  }\r
+\r
+#\r
+# If you backup the root directory, the following excluded\r
+#   files can be useful\r
+#\r
+  Exclude {\r
+    Options {\r
+      signature = MD5\r
+      ignore case = yes\r
+    }\r
+    File = C:/Temp\r
+    File = C:/tmp\r
+  }\r
+}\r
+\r
+#\r
+# This is an example which will backup all the hard drives of a Windows System.\r
+#\r
+FileSet {\r
+  Name = "Windows Full Set"\r
+  Enable VSS = yes\r
+  Include {\r
+    Options {\r
+      Signature = MD5\r
+      Exclude = yes\r
+      IgnoreCase = yes\r
+      EnhancedWild = yes\r
+      DriveType = fixed\r
+\r
+      # Exclude directories full of lots and lots of useless little files\r
+      WildDir = "[A-Z]:/Documents and Settings/*/Cookies"\r
+      WildDir = "[A-Z]:/Documents and Settings/*/Recent"\r
+      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/History"\r
+      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temp"\r
+      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temporary Internet Files"\r
+\r
+      # Exclude directories full of lots and lots of useless little files\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Cookies"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Recent"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/History"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temp"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temporary Internet Files"\r
+\r
+      # Exclude directories full of lots and lots of useless little files\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Cookies"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Recent"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/History"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temp"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temporary Internet Files"\r
+\r
+      # Some random bits of Windows we want to ignore\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Prefetch"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/msdownld.tmp"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Internet Logs"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/$Nt*Uninstall*"\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Downloaded Installations"\r
+\r
+      # Temporary directories & files\r
+      WildDir = "[A-Z]:/{WINNT,Windows}/Temp"\r
+      WildDir = "[A-Z]:/Temp"\r
+      WildFile = "*.tmp"\r
+      WildDir = "[A-Z]:/tmp"\r
+\r
+      # Fast Find\r
+      WildFile = "[A-Z]:/ffastun*"\r
+\r
+      # System Restore\r
+      WildDir = "[A-Z]:/System Volume Information"\r
+\r
+      # Windows Update\r
+      WildDir = "[A-Z]:/WUTemp"\r
+\r
+      # Recycle bins\r
+      WildDir = "[A-Z]:/RECYCLE[DR]"\r
+\r
+      # Swap files\r
+      WildFile = "[A-Z]:/pagefile.sys"\r
+      WildFile = "[A-Z]:/hiberfil.sys"\r
+\r
+      # These are programs and are easier to reinstall than restore from\r
+      # backup\r
+      WildDir = "[A-Z]:/cygwin"\r
+      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java"\r
+      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java Web Start"\r
+      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/JavaSoft"\r
+      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Microsoft Office"\r
+    }\r
+\r
+    File = "C:/"\r
+    File = "D:/"\r
+    File = "E:/"\r
+    File = "F:/"\r
+    File = "G:/"\r
+    File = "H:/"\r
+    File = "I:/"\r
+    File = "J:/"\r
+    File = "K:/"\r
+    File = "L:/"\r
+    File = "M:/"\r
+    File = "N:/"\r
+    File = "O:/"\r
+    File = "P:/"\r
+    File = "Q:/"\r
+    File = "R:/"\r
+    File = "S:/"\r
+    File = "T:/"\r
+    File = "U:/"\r
+    File = "V:/"\r
+    File = "W:/"\r
+    File = "X:/"\r
+    File = "Y:/"\r
+    File = "Z:/"\r
+  }\r
+}\r
+\r
+#\r
+# When to do the backups, full backup on first sunday of the month,\r
+#  differential (i.e. incremental since full) every other sunday,\r
+#  and incremental backups other days\r
+Schedule {\r
+  Name = "WeeklyCycle"\r
+  Run = Full 1st sun at 23:05\r
+  Run = Differential 2nd-5th sun at 23:05\r
+  Run = Incremental mon-sat at 23:05\r
+}\r
+\r
+# This schedule does the catalog. It starts after the WeeklyCycle\r
+Schedule {\r
+  Name = "WeeklyCycleAfterBackup"\r
+  Run = Full sun-sat at 23:10\r
+}\r
+\r
+# This is the backup of the catalog\r
+FileSet {\r
+  Name = "Catalog"\r
+  Include {\r
+    Options {\r
+      signature = MD5\r
+    }\r
+    File = "@working_dir@\\bacula.sql"\r
+  }\r
+}\r
+\r
+# Client (File Services) to backup\r
+Client {\r
+  Name = @client_name@\r
+  Address = @client_address@\r
+  FDPort = @client_port@\r
+  Catalog = MyCatalog\r
+  Password = "@client_password@"      # password for FileDaemon\r
+  File Retention = 30 days            # 30 days\r
+  Job Retention = 6 months            # six months\r
+  AutoPrune = yes                     # Prune expired Jobs/Files\r
+}\r
+\r
+#\r
+# Second Client (File Services) to backup\r
+#  You should change Name, Address, and Password before using\r
+#\r
+#Client {\r
+#  Name = @client_name@2\r
+#  Address = @client_address@2\r
+#  FDPort = @client_port@\r
+#  Catalog = MyCatalog\r
+#  Password = "@client_password@2"     # password for FileDaemon 2\r
+#  File Retention = 30 days            # 30 days\r
+#  Job Retention = 6 months            # six months\r
+#  AutoPrune = yes                     # Prune expired Jobs/Files\r
+#}\r
+\r
+\r
+# Definition of file storage device\r
+Storage {\r
+  Name = File\r
+# Do not use "localhost" here\r
+  Address = @storage_address@                # N.B. Use a fully qualified name here\r
+  SDPort = @storage_port@\r
+  Password = "@storage_password@"\r
+  Device = FileStorage\r
+  Media Type = File\r
+}\r
+\r
+\r
+\r
+# Definition of DDS tape storage device\r
+#Storage {\r
+#  Name = DDS-4    \r
+#  Do not use "localhost" here\r
+#  Address = @storage_address@                # N.B. Use a fully qualified name here\r
+#  SDPort = @storage_port@\r
+#  Password = "@storage_password@"          # password for Storage daemon\r
+#  Device = DDS-4                      # must be same as Device in Storage daemon\r
+#  Media Type = DDS-4                  # must be same as MediaType in Storage daemon\r
+#  Autochanger = yes                   # enable for autochanger device\r
+#}\r
+\r
+# Definition of 8mm tape storage device\r
+#Storage {\r
+#  Name = "8mmDrive"\r
+#  Do not use "localhost" here\r
+#  Address = @storage_address@                # N.B. Use a fully qualified name here\r
+#  SDPort = @storage_port@\r
+#  Password = "@storage_password@"\r
+#  Device = "Exabyte 8mm"\r
+#  MediaType = "8mm"\r
+#}\r
+\r
+\r
+# Generic catalog service\r
+Catalog {\r
+  Name = MyCatalog\r
+  dbname = bacula; user = bacula; password = ""\r
+}\r
+\r
+# Reasonable message delivery -- send most everything to email address\r
+#  and to the console\r
+Messages {\r
+  Name = Standard\r
+#\r
+# NOTE! If you send to two email or more email addresses, you will need\r
+#  to replace the %r in the from field (-f part) with a single valid\r
+#  email address in both the mailcommand and the operatorcommand.\r
+#\r
+  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"\r
+  operatorcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"\r
+  mail = @job_email@ = all, !skipped            \r
+  operator = @job_email@ = mount\r
+  console = all, !skipped, !saved\r
+#\r
+# WARNING! the following will create a file that you must cycle from\r
+#          time to time as it will grow indefinitely. However, it will\r
+#          also keep all your messages if they scroll off the console.\r
+#\r
+  append = "@working_dir@\\log" = all, !skipped\r
+}\r
+\r
+\r
+#\r
+# Message delivery for daemon messages (no job).\r
+Messages {\r
+  Name = Daemon\r
+  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"\r
+  mail = @job_email@ = all, !skipped            \r
+  console = all, !skipped, !saved\r
+  append = "@working_dir@\\log" = all, !skipped\r
+}\r
+\r
+\r
+\r
+# Default pool definition\r
+Pool {\r
+  Name = Default\r
+  Pool Type = Backup\r
+  Recycle = yes                       # Bacula can automatically recycle Volumes\r
+  AutoPrune = yes                     # Prune expired volumes\r
+  Volume Retention = 365 days         # one year\r
+}\r
+\r
+#\r
+# Restricted console used by tray-monitor to get the status of the director\r
+#\r
+Console {\r
+  Name = @monitor_name@\r
+  Password = "@monitor_password@"\r
+  CommandACL = status, .status\r
+}\r
index 52a17df504033df0265939755009b2a40233c266..bdaa4126094a87916512af4603292a27af447d14 100644 (file)
@@ -1,43 +1,43 @@
-#
-# Default  Bacula File Daemon Configuration file
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-# There is not much to change here except perhaps the
-# File daemon Name
-#
-
-#
-# "Global" File daemon configuration specifications
-#
-FileDaemon {                            # this is me
-  Name = @client_name@
-  FDport = @client_port@                # where we listen for the director
-  WorkingDirectory = "@working_dir@"
-  Pid Directory = "@working_dir@"
-  Maximum Concurrent Jobs = @client_maxjobs@
-}
-
-#
-# List Directors who are permitted to contact this File daemon
-#
-Director {
-  Name = @director_name@
-  Password = "@client_password@"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the file daemon
-#
-Director {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  Monitor = yes
-}
-
-# Send all messages except skipped files back to Director
-Messages {
-  Name = Standard
-  director = @director_name@ = all, !skipped, !restored
-}
+#\r
+# Default  Bacula File Daemon Configuration file\r
+#\r
+#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@\r
+#\r
+# There is not much to change here except perhaps the\r
+# File daemon Name\r
+#\r
+\r
+#\r
+# "Global" File daemon configuration specifications\r
+#\r
+FileDaemon {                            # this is me\r
+  Name = @client_name@\r
+  FDport = @client_port@                # where we listen for the director\r
+  WorkingDirectory = "@working_dir@"\r
+  Pid Directory = "@working_dir@"\r
+  Maximum Concurrent Jobs = @client_maxjobs@\r
+}\r
+\r
+#\r
+# List Directors who are permitted to contact this File daemon\r
+#\r
+Director {\r
+  Name = @director_name@\r
+  Password = "@client_password@"\r
+}\r
+\r
+#\r
+# Restricted Director, used by tray-monitor to get the\r
+#   status of the file daemon\r
+#\r
+Director {\r
+  Name = @monitor_name@\r
+  Password = "@monitor_password@"\r
+  Monitor = yes\r
+}\r
+\r
+# Send all messages except skipped files back to Director\r
+Messages {\r
+  Name = Standard\r
+  director = @director_name@ = all, !skipped, !restored\r
+}\r
index 3a09eb4198440830acaa2b1c7e05aa1efa937f97..9e662129c143e6eba5eb1bc27ba56b981856402d 100644 (file)
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that bacula-dir.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = @storage_name@
-  SDPort = @storage_port@                  # Director's port      
-  WorkingDirectory = "@working_dir@"
-  Pid Directory = "@working_dir@"
-  Maximum Concurrent Jobs = @storage_maxjobs@
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = @director_name@
-  Password = "@storage_password@"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the storage daemon
-#
-Director {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  Monitor = yes
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-
-Device {
-  Name = FileStorage
-  Media Type = File
-  Archive Device = "C:\\Tmp"
-  LabelMedia = yes                   # lets Bacula label unlabeled media
-  Random Access = Yes
-  AutomaticMount = yes               # when device opened, read it
-  RemovableMedia = no
-  AlwaysOpen = no
-}
-
-#
-# An autochanger device with two drives
-#
-#Autochanger {
-#  Name = Autochanger
-#  Device = Drive-1
-#  Device = Drive-2
-#  Changer Command = "mtx-changer %c %o %S %a %d"
-#  Changer Device = Changer0
-#}
-
-#Device {
-#  Name = Drive-1                      #
-#  Drive Index = 0
-#  Media Type = DLT-8000
-#  Device Type = Tape
-#  Archive Device = Tape0
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  AutoChanger = yes
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-#Device {
-#  Name = Drive-2                      #
-#  Drive Index = 1
-#  Media Type = DLT-8000
-#  Device Type = Tape
-#  Archive Device = Tape1
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  AutoChanger = yes
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-#
-#Device {
-#  Name = DDS-4                        # 
-#  Media Type = DDS-4
-#  Device Type = Tape
-#  Archive Device = Tape0
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = @director_name@ = all
-}
+#\r
+# Default Bacula Storage Daemon Configuration file\r
+#\r
+#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@\r
+#\r
+# You may need to change the name of your tape drive\r
+#   on the "Archive Device" directive in the Device\r
+#   resource.  If you change the Name and/or the \r
+#   "Media Type" in the Device resource, please ensure\r
+#   that bacula-dir.conf has corresponding changes.\r
+#\r
+\r
+Storage {                             # definition of myself\r
+  Name = @storage_name@\r
+  SDPort = @storage_port@                  # Director's port      \r
+  WorkingDirectory = "@working_dir@"\r
+  Pid Directory = "@working_dir@"\r
+  Maximum Concurrent Jobs = @storage_maxjobs@\r
+}\r
+\r
+#\r
+# List Directors who are permitted to contact Storage daemon\r
+#\r
+Director {\r
+  Name = @director_name@\r
+  Password = "@storage_password@"\r
+}\r
+\r
+#\r
+# Restricted Director, used by tray-monitor to get the\r
+#   status of the storage daemon\r
+#\r
+Director {\r
+  Name = @monitor_name@\r
+  Password = "@monitor_password@"\r
+  Monitor = yes\r
+}\r
+\r
+#\r
+# Devices supported by this Storage daemon\r
+# To connect, the Director's bacula-dir.conf must have the\r
+#  same Name and MediaType. \r
+#\r
+\r
+Device {\r
+  Name = FileStorage\r
+  Media Type = File\r
+  Archive Device = "C:\\Tmp"\r
+  LabelMedia = yes                   # lets Bacula label unlabeled media\r
+  Random Access = Yes\r
+  AutomaticMount = yes               # when device opened, read it\r
+  RemovableMedia = no\r
+  AlwaysOpen = no\r
+}\r
+\r
+#\r
+# An autochanger device with two drives\r
+#\r
+#Autochanger {\r
+#  Name = Autochanger\r
+#  Device = Drive-1\r
+#  Device = Drive-2\r
+#  Changer Command = "mtx-changer %c %o %S %a %d"\r
+#  Changer Device = Changer0\r
+#}\r
+\r
+#Device {\r
+#  Name = Drive-1                      #\r
+#  Drive Index = 0\r
+#  Media Type = DLT-8000\r
+#  Device Type = Tape\r
+#  Archive Device = Tape0\r
+#  AutomaticMount = yes               # when device opened, read it\r
+#  AlwaysOpen = yes\r
+#  RemovableMedia = yes\r
+#  RandomAccess = no\r
+#  AutoChanger = yes\r
+#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"\r
+#}\r
+\r
+#Device {\r
+#  Name = Drive-2                      #\r
+#  Drive Index = 1\r
+#  Media Type = DLT-8000\r
+#  Device Type = Tape\r
+#  Archive Device = Tape1\r
+#  AutomaticMount = yes               # when device opened, read it\r
+#  AlwaysOpen = yes\r
+#  RemovableMedia = yes\r
+#  RandomAccess = no\r
+#  AutoChanger = yes\r
+#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"\r
+#}\r
+\r
+#\r
+#Device {\r
+#  Name = DDS-4                        # \r
+#  Media Type = DDS-4\r
+#  Device Type = Tape\r
+#  Archive Device = Tape0\r
+#  AutomaticMount = yes               # when device opened, read it\r
+#  AlwaysOpen = yes\r
+#  RemovableMedia = yes\r
+#  RandomAccess = no\r
+#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"\r
+#}\r
+\r
+# \r
+# Send all messages to the Director, \r
+# mount messages also are sent to the email address\r
+#\r
+Messages {\r
+  Name = Standard\r
+  director = @director_name@ = all\r
+}\r
index 3013fa2c7e41797311a5234b58df9efdbffa39d2..4f60389ea471f092f5a6d5734f0e40a2ad0be448 100644 (file)
@@ -1,10 +1,10 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @director_name@
-  DIRport = @director_port@
-  address = @director_address@
-  Password = "@director_password@"
-}
+#\r
+# Bacula User Agent (or Console) Configuration File\r
+#\r
+\r
+Director {\r
+  Name = @director_name@\r
+  DIRport = @director_port@\r
+  address = @director_address@\r
+  Password = "@director_password@"\r
+}\r
index afa868088788787cacd1616307f104e6d237892b..b4faacddfe12a3a776e567ee204ebac6d5621ff4 100644 (file)
@@ -1,70 +1,70 @@
-@ECHO OFF
-SETLOCAL
-
-SET CWD=%CD%
-CD %1..\..\..
-SET TOP_DIR=%CD%
-CD %CWD%
-SET DEPKG_DIR=%TOP_DIR%\depkgs-msvc
-SET DOCS_DIR=%TOP_DIR%\docs\manual
-
-SET BACULA_DLLS=bacula.dll cats_mysql.dll cats_postgresql.dll cats_sqlite3.dll
-SET BACULA_EXES=bacula-dir.exe bacula-fd.exe bacula-sd.exe bconsole.exe wx-console.exe
-SET BACULA_TOOLS=bcopy.exe bextract.exe bls.exe bscan.exe bsleep.exe bsmtp.exe btape.exe dbcheck.exe scsilist.exe
-
-SET DEP_DLLS=libeay32.dll pthreadVCE.dll ssleay32.dll zlib1.dll zlib1.dll.manifest wxbase270_vc_bacula.dll wxmsw270_core_vc_bacula.dll libmysql.dll libpq.dll comerr32.dll libintl-2.dll libiconv-2.dll krb5_32.dll
-SET DEP_EXES=openssl.exe loaderinfo.exe mt.exe mtx.exe scsitape.exe sed.exe tapeinfo.exe sqlite3.exe sqlite3.exe.manifest expr64.exe snooze.exe mkisofs.exe growisofs.exe dvd-ram-control.exe dvd+rw-booktype.exe dvd+rw-format.exe dvd+rw-mediainfo.exe
-
-SET SCRIPTS=mtx-changer.cmd disk-changer.cmd dvd-handler.cmd
-
-SET CATS_MYSQL_CMD=create_mysql_database.cmd drop_mysql_database.cmd make_mysql_tables.cmd drop_mysql_tables.cmd grant_mysql_privileges.cmd
-SET CATS_MYSQL_SQL=make_mysql_tables.sql drop_mysql_tables.sql grant_mysql_privileges.sql
-SET CATS_PGSQL_CMD=create_postgresql_database.cmd drop_postgresql_database.cmd make_postgresql_tables.cmd drop_postgresql_tables.cmd grant_postgresql_privileges.cmd
-SET CATS_PGSQL_SQL=make_postgresql_tables.sql drop_postgresql_tables.sql grant_postgresql_privileges.sql
-SET CATS_SQLITE_CMD=create_sqlite3_database.cmd drop_sqlite3_database.cmd make_sqlite3_tables.cmd drop_sqlite3_tables.cmd grant_sqlite3_privileges.cmd
-SET CATS_SQLITE_SQL=make_sqlite3_tables.sql
-SET CATS_CATALOG=make_mysql_catalog_backup.cmd make_postgresql_catalog_backup.cmd make_sqlite3_catalog_backup.cmd delete_catalog_backup.cmd
-SET DIRD_FILES=query.sql
-SET SSL_FILES=openssl.cnf
-
-SET DOC_PDF_FILES=%DOCS_DIR%\bacula.pdf %DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css
-SET DOC_HTML_FILES=%DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css
-
-FOR %%i in ( %BACULA_DLLS% )     DO XCOPY %1%2\%%i %1installer\%2\ /y
-FOR %%i in ( %BACULA_EXES% )     DO XCOPY %1%2\%%i %1installer\%2\ /y
-FOR %%i in ( %BACULA_TOOLS% )    DO XCOPY %1%2\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DEP_DLLS% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y
-FOR %%i in ( %DEP_EXES% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y
-
-FOR %%i in ( %SCRIPTS% )         DO XCOPY %1scripts\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_MYSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_MYSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_PGSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_PGSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_SQLITE_CMD% ) DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_SQLITE_SQL% ) DO XCOPY %1cats\%%i %1installer\%2\ /y
-
-FOR %%i in ( %CATS_CATALOG% )    DO XCOPY %1cats\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DIRD_FILES% )      DO XCOPY %1..\dird\%%i %1installer\%2\ /y
-FOR %%i in ( %SSL_FILES% )       DO XCOPY %DEPKG_DIR%\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DOC_PDF_FILES% )   DO XCOPY %%i %1installer\%2\manual\ /y
-
-FOR %%i in ( %DOC_HTML_FILES% )  DO XCOPY %%i %1installer\%2\manual\bacula\ /y
-
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcm80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcp80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcr80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcm80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcp80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcr80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\Microsoft.VC80.DebugCRT.manifest %1installer\%2\ /y
-
-PATH %DEPKG_DIR%\nsis;%DEPKG_DIR%\tools;%PATH%
-
-FOR /F %%i IN ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\..\version.h' ) DO @SET VERSION=%%i 
-makensis /V3 /DVERSION=%VERSION% /DSRC_DIR=%1installer\%2 /DOUT_DIR=%1%2 /DBUILD_TOOLS=%3 winbacula.nsi
-EXIT /B %ERRORLEVEL%
+@ECHO OFF\r
+SETLOCAL\r
+\r
+SET CWD=%CD%\r
+CD %1..\..\..\r
+SET TOP_DIR=%CD%\r
+CD %CWD%\r
+SET DEPKG_DIR=%TOP_DIR%\depkgs-msvc\r
+SET DOCS_DIR=%TOP_DIR%\docs\manual\r
+\r
+SET BACULA_DLLS=bacula.dll cats_mysql.dll cats_postgresql.dll cats_sqlite3.dll\r
+SET BACULA_EXES=bacula-dir.exe bacula-fd.exe bacula-sd.exe bconsole.exe wx-console.exe\r
+SET BACULA_TOOLS=bcopy.exe bextract.exe bls.exe bscan.exe bsleep.exe bsmtp.exe btape.exe dbcheck.exe scsilist.exe\r
+\r
+SET DEP_DLLS=libeay32.dll pthreadVCE.dll ssleay32.dll zlib1.dll zlib1.dll.manifest wxbase270_vc_bacula.dll wxmsw270_core_vc_bacula.dll libmysql.dll libpq.dll comerr32.dll libintl-2.dll libiconv-2.dll krb5_32.dll\r
+SET DEP_EXES=openssl.exe loaderinfo.exe mt.exe mtx.exe scsitape.exe sed.exe tapeinfo.exe sqlite3.exe sqlite3.exe.manifest expr64.exe snooze.exe mkisofs.exe growisofs.exe dvd-ram-control.exe dvd+rw-booktype.exe dvd+rw-format.exe dvd+rw-mediainfo.exe\r
+\r
+SET SCRIPTS=mtx-changer.cmd disk-changer.cmd dvd-handler.cmd\r
+\r
+SET CATS_MYSQL_CMD=create_mysql_database.cmd drop_mysql_database.cmd make_mysql_tables.cmd drop_mysql_tables.cmd grant_mysql_privileges.cmd\r
+SET CATS_MYSQL_SQL=make_mysql_tables.sql drop_mysql_tables.sql grant_mysql_privileges.sql\r
+SET CATS_PGSQL_CMD=create_postgresql_database.cmd drop_postgresql_database.cmd make_postgresql_tables.cmd drop_postgresql_tables.cmd grant_postgresql_privileges.cmd\r
+SET CATS_PGSQL_SQL=make_postgresql_tables.sql drop_postgresql_tables.sql grant_postgresql_privileges.sql\r
+SET CATS_SQLITE_CMD=create_sqlite3_database.cmd drop_sqlite3_database.cmd make_sqlite3_tables.cmd drop_sqlite3_tables.cmd grant_sqlite3_privileges.cmd\r
+SET CATS_SQLITE_SQL=make_sqlite3_tables.sql\r
+SET CATS_CATALOG=make_mysql_catalog_backup.cmd make_postgresql_catalog_backup.cmd make_sqlite3_catalog_backup.cmd delete_catalog_backup.cmd\r
+SET DIRD_FILES=query.sql\r
+SET SSL_FILES=openssl.cnf\r
+\r
+SET DOC_PDF_FILES=%DOCS_DIR%\bacula.pdf %DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css\r
+SET DOC_HTML_FILES=%DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css\r
+\r
+FOR %%i in ( %BACULA_DLLS% )     DO XCOPY %1%2\%%i %1installer\%2\ /y\r
+FOR %%i in ( %BACULA_EXES% )     DO XCOPY %1%2\%%i %1installer\%2\ /y\r
+FOR %%i in ( %BACULA_TOOLS% )    DO XCOPY %1%2\%%i %1installer\%2\ /y\r
+\r
+FOR %%i in ( %DEP_DLLS% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y\r
+FOR %%i in ( %DEP_EXES% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y\r
+\r
+FOR %%i in ( %SCRIPTS% )         DO XCOPY %1scripts\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_MYSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_MYSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_PGSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_PGSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_SQLITE_CMD% ) DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+FOR %%i in ( %CATS_SQLITE_SQL% ) DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+\r
+FOR %%i in ( %CATS_CATALOG% )    DO XCOPY %1cats\%%i %1installer\%2\ /y\r
+\r
+FOR %%i in ( %DIRD_FILES% )      DO XCOPY %1..\dird\%%i %1installer\%2\ /y\r
+FOR %%i in ( %SSL_FILES% )       DO XCOPY %DEPKG_DIR%\%%i %1installer\%2\ /y\r
+\r
+FOR %%i in ( %DOC_PDF_FILES% )   DO XCOPY %%i %1installer\%2\manual\ /y\r
+\r
+FOR %%i in ( %DOC_HTML_FILES% )  DO XCOPY %%i %1installer\%2\manual\bacula\ /y\r
+\r
+XCOPY %4\x86\Microsoft.VC80.CRT\msvcm80.dll %1installer\%2\ /y\r
+XCOPY %4\x86\Microsoft.VC80.CRT\msvcp80.dll %1installer\%2\ /y\r
+XCOPY %4\x86\Microsoft.VC80.CRT\msvcr80.dll %1installer\%2\ /y\r
+XCOPY %4\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest %1installer\%2\ /y\r
+XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcm80d.dll %1installer\%2\ /y\r
+XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcp80d.dll %1installer\%2\ /y\r
+XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcr80d.dll %1installer\%2\ /y\r
+XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\Microsoft.VC80.DebugCRT.manifest %1installer\%2\ /y\r
+\r
+PATH %DEPKG_DIR%\nsis;%DEPKG_DIR%\tools;%PATH%\r
+\r
+FOR /F %%i IN ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\..\version.h' ) DO @SET VERSION=%%i \r
+makensis /V3 /DVERSION=%VERSION% /DSRC_DIR=%1installer\%2 /DOUT_DIR=%1%2 /DBUILD_TOOLS=%3 winbacula.nsi\r
+EXIT /B %ERRORLEVEL%\r
index 3fd9d52f5f1c7bcb63d4009d915708d349a6aafe..5f2abe47e45632c1357ec9f06f22209e54a83ed8 100644 (file)
@@ -1,11 +1,11 @@
-# Client (File Services) to backup
-Client {
-  Name = @client_name@
-  Address = @client_address@
-  FDPort = @client_port@
-  Catalog = MyCatalog
-  Password = "@client_password@"      # password for FileDaemon
-  File Retention = 30 days            # 30 days
-  Job Retention = 6 months            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-}
+# Client (File Services) to backup\r
+Client {\r
+  Name = @client_name@\r
+  Address = @client_address@\r
+  FDPort = @client_port@\r
+  Catalog = MyCatalog\r
+  Password = "@client_password@"      # password for FileDaemon\r
+  File Retention = 30 days            # 30 days\r
+  Job Retention = 6 months            # six months\r
+  AutoPrune = yes                     # Prune expired Jobs/Files\r
+}\r
index de949301d638edfc329ba66c05179260d7d50cd3..18ddc6e0374d22aecb7399eb11d5bf30d207db9d 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="installer"
-       ProjectGUID="{6D1B0964-FB32-4916-A61C-49D7F715EAD8}"
-       RootNamespace="installer"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="0"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
-                               Output=""
-                               PreprocessorDefinitions="VERSION=$(VERSION);DOC_DIR=..\..\..\..\docs;BUILD_TOOLS=VC8_DEBUG;VC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT;DEPKGS_BIN=..\..\..\..\depkgs-msvc\bin;BACULA_BIN=..\$(ConfigurationName);CATS_DIR=..\cats;SCRIPT_DIR=..\scripts"
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="0"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
-                               Output=""
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath=".\resource.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath=".\Dialogs.rc"
-                               >
-                       </File>
-               </Filter>
-               <File
-                       RelativePath=".\bacula-dir.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\bacula-fd.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\bacula-sd.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\bconsole.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\build-installer.cmd"
-                       >
-               </File>
-               <File
-                       RelativePath=".\client.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\ConfigPage1.nsh"
-                       >
-               </File>
-               <File
-                       RelativePath=".\ConfigPage2.nsh"
-                       >
-               </File>
-               <File
-                       RelativePath=".\DumpLog.nsh"
-                       >
-               </File>
-               <File
-                       RelativePath=".\InstallType.ini"
-                       >
-               </File>
-               <File
-                       RelativePath=".\InstallType.nsh"
-                       >
-               </File>
-               <File
-                       RelativePath=".\Readme.txt"
-                       >
-               </File>
-               <File
-                       RelativePath=".\storage.conf.in"
-                       >
-               </File>
-               <File
-                       RelativePath=".\winbacula.nsi"
-                       >
-               </File>
-               <File
-                       RelativePath=".\WriteTemplates.ini"
-                       >
-               </File>
-               <File
-                       RelativePath=".\wx-console.conf.in"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="installer"\r
+       ProjectGUID="{6D1B0964-FB32-4916-A61C-49D7F715EAD8}"\r
+       RootNamespace="installer"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"\r
+                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"\r
+                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"\r
+                               Output=""\r
+                               PreprocessorDefinitions="VERSION=$(VERSION);DOC_DIR=..\..\..\..\docs;BUILD_TOOLS=VC8_DEBUG;VC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT;DEPKGS_BIN=..\..\..\..\depkgs-msvc\bin;BACULA_BIN=..\$(ConfigurationName);CATS_DIR=..\cats;SCRIPT_DIR=..\scripts"\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"\r
+                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"\r
+                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"\r
+                               Output=""\r
+                               PreprocessorDefinitions=""\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\resource.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\Dialogs.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath=".\bacula-dir.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\bacula-fd.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\bacula-sd.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\bconsole.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\build-installer.cmd"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\client.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\ConfigPage1.nsh"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\ConfigPage2.nsh"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\DumpLog.nsh"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\InstallType.ini"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\InstallType.nsh"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\Readme.txt"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\storage.conf.in"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\winbacula.nsi"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\WriteTemplates.ini"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath=".\wx-console.conf.in"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index a1490b117028251b2df628d311d7c156578d04da..5928815c5c5d1838b541c9abbb7591b836d68f2d 100644 (file)
@@ -1,10 +1,10 @@
-# Definition of file storage device
-Storage {
-  Name = File
-# Do not use "localhost" here    
-  Address = @storage_address@                # N.B. Use a fully qualified name here
-  SDPort = @storage_port@
-  Password = "@storage_password@"
-  Device = FileStorage
-  Media Type = File
-}
+# Definition of file storage device\r
+Storage {\r
+  Name = File\r
+# Do not use "localhost" here    \r
+  Address = @storage_address@                # N.B. Use a fully qualified name here\r
+  SDPort = @storage_port@\r
+  Password = "@storage_password@"\r
+  Device = FileStorage\r
+  Media Type = File\r
+}\r
index b71984c50680b3721fe394779c61d35473241011..7d1179c05da5dc33f350cd0d5992df3d791a40f1 100644 (file)
-; winbacula.nsi
-;
-; Began as a version written by Michel Meyers (michel@tcnnet.dyndns.org)
-;
-; Adapted by Kern Sibbald for native Win32 Bacula
-;    added a number of elements from Christopher Hull's installer
-;
-; D. Scott Barninger Nov 13 2004
-; added configuration editing for bconsole.conf and wx-console.conf
-; better explanation in dialog boxes for editing config files
-; added Start Menu items
-; fix uninstall of config files to do all not just bacula-fd.conf
-;
-; D. Scott Barninger Dec 05 2004
-; added specification of default permissions for bacula-fd.conf
-;   - thanks to Jamie Ffolliott for pointing me at cacls
-; added removal of working-dir files if user selects to remove config
-; uninstall is now 100% clean
-;
-; D. Scott Barninger Apr 17 2005
-; 1.36.3 release docs update
-; add pdf manual and menu shortcut
-;
-; Robert Nelson May 15 2006
-; Pretty much rewritten
-; Use LogicLib.nsh
-; Added Bacula-SD and Bacula-DIR
-; Replaced ParameterGiven with standard GetOptions
-
-;
-; Command line options:
-;
-; /service    - 
-; /start
-
-!define PRODUCT "Bacula"
-
-;
-; Include the Modern UI
-;
-
-!include "MUI.nsh"
-!include "LogicLib.nsh"
-!include "FileFunc.nsh"
-!include "Sections.nsh"
-!include "StrFunc.nsh"
-!include "WinMessages.nsh"
-;
-; Basics
-;
-Name "Bacula"
-OutFile "${OUT_DIR}\winbacula-${VERSION}.exe"
-SetCompressor lzma
-InstallDir "$PROGRAMFILES\Bacula"
-InstallDirRegKey HKLM "Software\Bacula" "InstallLocation"
-
-InstType "Client"
-InstType "Server"
-InstType "Full"
-
-!insertmacro GetParent
-
-${StrCase}
-${StrRep}
-${StrTok}
-${StrTrimNewLines}
-
-;
-; Pull in pages
-;
-
-!define      MUI_COMPONENTSPAGE_SMALLDESC
-
-!define      MUI_HEADERIMAGE
-!define      MUI_BGCOLOR                739AB9
-!define      MUI_HEADERIMAGE_BITMAP     "bacula-logo.bmp"
-
-!InsertMacro MUI_PAGE_WELCOME
-;  !InsertMacro MUI_PAGE_LICENSE "..\..\LICENSE"
-Page custom EnterInstallType
-!define      MUI_PAGE_CUSTOMFUNCTION_SHOW PageComponentsShow
-!InsertMacro MUI_PAGE_COMPONENTS
-!define      MUI_PAGE_CUSTOMFUNCTION_PRE PageDirectoryPre
-!InsertMacro MUI_PAGE_DIRECTORY
-Page custom EnterConfigPage1 LeaveConfigPage1
-Page custom EnterConfigPage2 LeaveConfigPage2
-!Define      MUI_PAGE_CUSTOMFUNCTION_LEAVE LeaveInstallPage
-!InsertMacro MUI_PAGE_INSTFILES
-Page custom EnterWriteTemplates
-!Define      MUI_FINISHPAGE_SHOWREADME $INSTDIR\Readme.txt
-!InsertMacro MUI_PAGE_FINISH
-
-!InsertMacro MUI_UNPAGE_WELCOME
-!InsertMacro MUI_UNPAGE_CONFIRM
-!InsertMacro MUI_UNPAGE_INSTFILES
-!InsertMacro MUI_UNPAGE_FINISH
-
-!define      MUI_ABORTWARNING
-
-!InsertMacro MUI_LANGUAGE "English"
-
-!InsertMacro GetParameters
-!InsertMacro GetOptions
-
-DirText "Setup will install Bacula ${VERSION} to the directory specified below. To install in a different folder, click Browse and select another folder."
-
-!InsertMacro MUI_RESERVEFILE_INSTALLOPTIONS
-;
-; Global Variables
-;
-Var OptService
-Var OptStart
-Var OptSilent
-
-Var CommonFilesDone
-
-Var OsIsNT
-
-Var HostName
-
-Var ConfigClientName
-Var ConfigClientPort
-Var ConfigClientMaxJobs
-Var ConfigClientPassword
-Var ConfigClientInstallService
-Var ConfigClientStartService
-
-Var ConfigStorageName
-Var ConfigStoragePort
-Var ConfigStorageMaxJobs
-Var ConfigStoragePassword
-Var ConfigStorageInstallService
-Var ConfigStorageStartService
-
-Var ConfigDirectorName
-Var ConfigDirectorPort
-Var ConfigDirectorMaxJobs
-Var ConfigDirectorPassword
-Var ConfigDirectorAddress
-Var ConfigDirectorMailServer
-Var ConfigDirectorMailAddress
-Var ConfigDirectorDB
-Var ConfigDirectorInstallService
-Var ConfigDirectorStartService
-
-Var ConfigMonitorName
-Var ConfigMonitorPassword
-
-Var LocalDirectorPassword
-Var LocalHostAddress
-
-Var MySQLPath
-Var MySQLVersion
-Var PostgreSQLPath
-Var PostgreSQLVersion
-
-Var AutomaticInstall
-Var InstallType
-!define NewInstall      0
-!define UpgradeInstall  1
-!define MigrateInstall  2
-
-Var OldInstallDir
-Var PreviousComponents
-Var NewComponents
-
-; Bit 0 = File Service
-;     1 = Storage Service
-;     2 = Director Service
-;     3 = Command Console
-;     4 = Graphical Console
-;     5 = Documentation (PDF)
-;     6 = Documentation (HTML)
-
-!define ComponentFile                   1
-!define ComponentStorage                2
-!define ComponentDirector               4
-!define ComponentTextConsole            8
-!define ComponentGUIConsole             16
-!define ComponentPDFDocs                32
-!define ComponentHTMLDocs               64
-
-!define ComponentsRequiringUserConfig           31
-!define ComponentsFileAndStorage                3
-!define ComponentsFileAndStorageAndDirector     7
-!define ComponentsDirectorAndTextGuiConsoles    28
-!define ComponentsTextAndGuiConsoles            24
-
-Var HDLG
-Var HCTL
-
-Function .onInit
-  Push $R0
-  Push $R1
-
-  ; Process Command Line Options
-  StrCpy $OptService 1
-  StrCpy $OptStart 1
-  StrCpy $OptSilent 0
-  StrCpy $CommonFilesDone 0
-  StrCpy $OsIsNT 0
-  StrCpy $AutomaticInstall 0
-  StrCpy $InstallType ${NewInstall}
-  StrCpy $OldInstallDir ""
-  StrCpy $PreviousComponents 0
-  StrCpy $NewComponents 0
-  StrCpy $MySQLPath ""
-  StrCpy $MySQLVersion ""
-  StrCpy $PostgreSQLPath ""
-  StrCpy $PostgreSQLVersion ""
-
-  ${GetParameters} $R0
-
-  ClearErrors
-  ${GetOptions} $R0 "/noservice" $R1
-  IfErrors +2
-    StrCpy $OptService 0
-
-  ClearErrors
-  ${GetOptions} $R0 "/nostart" $R1
-  IfErrors +2
-    StrCpy $OptStart 0
-
-  IfSilent 0 +2
-    StrCpy $OptSilent 1
-
-  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  ${If} $R0 != ""
-    StrCpy $OsIsNT 1
-  ${EndIf}
-
-  Call GetComputerName
-  Pop $HostName
-
-  Call GetHostName
-  Pop $LocalHostAddress
-
-  Call GetUserName
-  Pop $ConfigDirectorMailAddress
-
-  Call FindDatabaseApps
-
-  ; Configuration Defaults
-
-  StrCpy $ConfigClientName               "$HostName-fd"
-  StrCpy $ConfigClientPort               9102
-  StrCpy $ConfigClientMaxJobs            2
-  ;StrCpy $ConfigClientPassword
-  StrCpy $ConfigClientInstallService     "$OptService"
-  StrCpy $ConfigClientStartService       "$OptStart"
-
-  StrCpy $ConfigStorageName              "$HostName-sd"
-  StrCpy $ConfigStoragePort              9103
-  StrCpy $ConfigStorageMaxJobs           10
-  ;StrCpy $ConfigStoragePassword
-  StrCpy $ConfigStorageInstallService    "$OptService"
-  StrCpy $ConfigStorageStartService      "$OptStart"
-
-  ;StrCpy $ConfigDirectorName            "$HostName-dir"
-  StrCpy $ConfigDirectorPort             9101
-  StrCpy $ConfigDirectorMaxJobs          1
-  ;StrCpy $ConfigDirectorPassword
-  StrCpy $ConfigDirectorDB               0
-  StrCpy $ConfigDirectorInstallService   "$OptService"
-  StrCpy $ConfigDirectorStartService     "$OptStart"
-
-  StrCpy $ConfigMonitorName              "$HostName-mon"
-  ;StrCpy $ConfigMonitorPassword
-
-  InitPluginsDir
-  File "/oname=$PLUGINSDIR\openssl.exe"  "${SRC_DIR}\openssl.exe"
-  File "/oname=$PLUGINSDIR\libeay32.dll" "${SRC_DIR}\libeay32.dll"
-  File "/oname=$PLUGINSDIR\ssleay32.dll" "${SRC_DIR}\ssleay32.dll"
-  File "/oname=$PLUGINSDIR\sed.exe"      "${SRC_DIR}\sed.exe"
-
-  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "InstallType.ini"
-  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "WriteTemplates.ini"
-
-  SetPluginUnload alwaysoff
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $ConfigClientPassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $ConfigStoragePassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $LocalDirectorPassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  SetPluginUnload manual
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $ConfigMonitorPassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function .onSelChange
-  Call UpdateComponentUI
-FunctionEnd
-
-Function InstallCommonFiles
-  ${If} $CommonFilesDone = 0
-    SetOutPath "$INSTDIR"
-    File "Readme.txt"
-
-    SetOutPath "$INSTDIR\bin"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\msvcm80.dll"
-    File "${SRC_DIR}\msvcp80.dll"
-    File "${SRC_DIR}\msvcr80.dll"
-    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"
-    File "${SRC_DIR}\pthreadVCE.dll"
-!endif
-!if "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\msvcm80.dll"
-    File "${SRC_DIR}\msvcp80.dll"
-    File "${SRC_DIR}\msvcr80.dll"
-    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"
-    File "${SRC_DIR}\msvcm80d.dll"
-    File "${SRC_DIR}\msvcp80d.dll"
-    File "${SRC_DIR}\msvcr80d.dll"
-    File "${SRC_DIR}\Microsoft.VC80.DebugCRT.manifest"
-    File "${SRC_DIR}\pthreadVCE.dll"
-!endif
-!if "${BUILD_TOOLS}" == "MinGW"
-    File "${SRC_DIR}\mingwm10.dll"
-    File "${SRC_DIR}\pthreadGCE.dll"
-!endif
-    File "${SRC_DIR}\libeay32.dll"
-    File "${SRC_DIR}\ssleay32.dll"
-    File "${SRC_DIR}\zlib1.dll"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\zlib1.dll.manifest"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\zlib1.dll.manifest"
-!endif
-    File "/oname=$INSTDIR\openssl.cnf" "${SRC_DIR}\openssl.cnf"
-    File "${SRC_DIR}\openssl.exe"
-    File "${SRC_DIR}\bsleep.exe"
-    File "${SRC_DIR}\bsmtp.exe"
-    File "${SRC_DIR}\bacula.dll"
-    File "${SRC_DIR}\expr64.exe"
-    File "${SRC_DIR}\snooze.exe"
-
-    CreateShortCut "$SMPROGRAMS\Bacula\Documentation\View Readme.lnk" "write.exe" '"$INSTDIR\Readme.txt"'
-
-    StrCpy $CommonFilesDone 1
-  ${EndIf}
-FunctionEnd
-
-Section "-Initialize"
-  ${If} $MySQLPath != ""
-    DetailPrint "Found MySQL (version $MySQLVersion)"
-  ${EndIf}
-  ${If} $PostgreSQLPath != ""
-    DetailPrint "Found PostgreSQL (version $PostgreSQLVersion)"
-  ${EndIf}
-
-  WriteRegStr   HKLM Software\Bacula InstallLocation "$INSTDIR"
-
-  Call GetSelectedComponents
-  Pop $R2
-  WriteRegDWORD HKLM Software\Bacula Components $R2
-
-  WriteRegDWORD HKLM Software\Bacula Database $ConfigDirectorDB
-
-  ; remove start menu items
-  SetShellVarContext all
-
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Configuration\*"
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Documentation\*"
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"
-  RMDir "$SMPROGRAMS\Bacula\Configuration"
-  RMDir "$SMPROGRAMS\Bacula\Documentation"
-  RMDir "$SMPROGRAMS\Bacula"
-  CreateDirectory "$SMPROGRAMS\Bacula"
-  CreateDirectory "$SMPROGRAMS\Bacula\Configuration"
-  CreateDirectory "$SMPROGRAMS\Bacula\Documentation"
-
-  CreateDirectory "$INSTDIR"
-  CreateDirectory "$INSTDIR\bin"
-  CreateDirectory "$APPDATA\Bacula"
-  CreateDirectory "$APPDATA\Bacula\Work"
-  CreateDirectory "$APPDATA\Bacula\Spool"
-
-  File "..\..\..\LICENSE"
-  Delete /REBOOTOK "$INSTDIR\bin\License.txt"
-
-  FileOpen $R1 $PLUGINSDIR\config.sed w
-  FileWrite $R1 "s;@VERSION@;${VERSION};g$\r$\n"
-  FileWrite $R1 "s;@DATE@;${__DATE__};g$\r$\n"
-  FileWrite $R1 "s;@DISTNAME@;Windows;g$\r$\n"
-
-!If "$BUILD_TOOLS" == "MinGW"
-  StrCpy $R2 "MinGW32"
-!Else
-  StrCpy $R2 "MVS"
-!EndIf
-
-  Call GetHostName
-  Exch $R3
-  Pop $R3
-
-  FileWrite $R1 "s;@DISTVER@;$R2;g$\r$\n"
-
-  ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\\\"
-  FileWrite $R1 's;@working_dir@;$R2;g$\r$\n'
-  ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\"
-  FileWrite $R1 's;@working_dir_cmd@;$R2;g$\r$\n'
-
-  ${StrRep} $R2 "$INSTDIR\bin" "\" "\\\\"
-  FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'
-  ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"
-  FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
-
-  ${StrRep} $R2 "$INSTDIR" "\" "/"
-  FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"
-
-  Call IsDirectorSelected
-  Pop $R2
-  ${If} $R2 = 1
-    FileWrite $R1 "s;@director_address@;$LocalHostAddress;g$\r$\n"
-  ${Else}
-    ${If} "$ConfigDirectorAddress" != ""
-      FileWrite $R1 "s;@director_address@;$ConfigDirectorAddress;g$\r$\n"
-    ${EndIf}
-  ${EndIf}
-
-  FileWrite $R1 "s;@client_address@;$LocalHostAddress;g$\r$\n"
-  FileWrite $R1 "s;@storage_address@;$LocalHostAddress;g$\r$\n"
-
-  ${If} "$ConfigClientName" != ""
-    FileWrite $R1 "s;@client_name@;$ConfigClientName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientPort" != ""
-    FileWrite $R1 "s;@client_port@;$ConfigClientPort;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientMaxJobs" != ""
-    FileWrite $R1 "s;@client_maxjobs@;$ConfigClientMaxJobs;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientPassword" != ""
-    FileWrite $R1 "s;@client_password@;$ConfigClientPassword;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigStorageName" != ""
-    FileWrite $R1 "s;@storage_name@;$ConfigStorageName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigStoragePort" != ""
-    FileWrite $R1 "s;@storage_port@;$ConfigStoragePort;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigStorageMaxJobs" != ""
-    FileWrite $R1 "s;@storage_maxjobs@;$ConfigStorageMaxJobs;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigStoragePassword" != ""
-    FileWrite $R1 "s;@storage_password@;$ConfigStoragePassword;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorName" != ""
-    FileWrite $R1 "s;@director_name@;$ConfigDirectorName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorPort" != ""
-    FileWrite $R1 "s;@director_port@;$ConfigDirectorPort;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorMaxJobs" != ""
-    FileWrite $R1 "s;@director_maxjobs@;$ConfigDirectorMaxJobs;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorPassword" != ""
-    FileWrite $R1 "s;@director_password@;$ConfigDirectorPassword;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorMailServer" != ""
-    FileWrite $R1 "s;@smtp_host@;$ConfigDirectorMailServer;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigDirectorMailAddress" != ""
-    FileWrite $R1 "s;@job_email@;$ConfigDirectorMailAddress;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigMonitorName" != ""
-    FileWrite $R1 "s;@monitor_name@;$ConfigMonitorName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigMonitorPassword" != ""
-    FileWrite $R1 "s;@monitor_password@;$ConfigMonitorPassword;g$\r$\n"
-  ${EndIf}
-
-  ${If} $ConfigDirectorDB = 1
-    ${If} $MySQLPath != ""
-      ${StrRep} $R2 "$MySQLPath\bin" "\" "\\"
-      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"
-    ${EndIf}
-  ${ElseIf} $ConfigDirectorDB = 2
-    ${If} $PostgreSQLPath != ""
-      ${StrRep} $R2 "$PostgreSQLPath\bin" "\" "\\"
-      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"
-    ${EndIf}
-  ${EndIf}
-
-  FileClose $R1
-
-  ${If} $InstallType = ${MigrateInstall}
-    FileOpen $R1 $PLUGINSDIR\migrate.sed w
-    ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\\\"
-    FileWrite $R1 's;\(Working *Directory *= *\)[^ ][^ ]*.*$$;\1"$R2";$\r$\n'
-    FileWrite $R1 's;\(Pid *Directory *= *\)[^ ][^ ]*.*$$;\1"$R2";$\r$\n'
-    FileClose $R1
-  ${EndIf}
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-fd.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-sd.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-dir.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-SectionEnd
-
-SectionGroup "Client" SecGroupClient
-
-Section "File Service" SecFileDaemon
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR\bin"
-
-  File "${SRC_DIR}\bacula-fd.exe"
-
-  ${If} $InstallType = ${MigrateInstall}
-  ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"
-    CopyFiles "$OldInstallDir\bin\bacula-fd.conf" "$APPDATA\Bacula"
-    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\migrate.sed" -i.bak "$APPDATA\Bacula\bacula-fd.conf"'
-  ${Else}
-    File "/oname=$PLUGINSDIR\bacula-fd.conf" "bacula-fd.conf.in"
-
-    StrCpy $0 "$APPDATA\Bacula"
-    StrCpy $1 bacula-fd.conf
-    Call ConfigEditAndCopy
-  ${EndIf}
-
-  StrCpy $0 bacula-fd
-  StrCpy $1 "File Service"
-  StrCpy $2 $ConfigClientInstallService
-  StrCpy $3 $ConfigClientStartService
-
-  Call InstallDaemon
-
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Client Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-fd.conf"'
-SectionEnd
-
-SectionGroupEnd
-
-SectionGroup "Server" SecGroupServer
-
-Section "Storage Service" SecStorageDaemon
-  SectionIn 2 3
-
-  SetOutPath "$INSTDIR\bin"
-
-  File "${SRC_DIR}\loaderinfo.exe"
-  File "${SRC_DIR}\mt.exe"
-  File "${SRC_DIR}\mtx.exe"
-  File "${SRC_DIR}\scsitape.exe"
-  File "${SRC_DIR}\tapeinfo.exe"
-  File "${SRC_DIR}\bacula-sd.exe"
-  File "${SRC_DIR}\bcopy.exe"
-  File "${SRC_DIR}\bextract.exe"
-  File "${SRC_DIR}\bls.exe"
-  File "${SRC_DIR}\bscan.exe"
-  File "${SRC_DIR}\btape.exe"
-  File "${SRC_DIR}\scsilist.exe"
-  File "${SRC_DIR}\mkisofs.exe"
-  File "${SRC_DIR}\growisofs.exe"
-  File "${SRC_DIR}\dvd-ram-control.exe"
-  File "${SRC_DIR}\dvd+rw-booktype.exe"
-  File "${SRC_DIR}\dvd+rw-format.exe"
-  File "${SRC_DIR}\dvd+rw-mediainfo.exe"
-
-  File "/oname=$PLUGINSDIR\mtx-changer.cmd" "${SRC_DIR}\mtx-changer.cmd"
-
-  StrCpy $0 "$INSTDIR\bin"
-  StrCpy $1 mtx-changer.cmd
-  Call ConfigEditAndCopy
-
-  File "/oname=$PLUGINSDIR\disk-changer.cmd" "${SRC_DIR}\disk-changer.cmd"
-
-  StrCpy $0 "$INSTDIR\bin"
-  StrCpy $1 disk-changer.cmd
-  Call ConfigEditAndCopy
-
-  File "/oname=$PLUGINSDIR\dvd-handler.cmd" "${SRC_DIR}\dvd-handler.cmd"
-
-  StrCpy $0 "$INSTDIR\bin"
-  StrCpy $1 dvd-handler.cmd
-  Call ConfigEditAndCopy
-
-  File "/oname=$PLUGINSDIR\bacula-sd.conf" "bacula-sd.conf.in"
-
-  StrCpy $0 "$APPDATA\Bacula"
-  StrCpy $1 bacula-sd.conf
-  Call ConfigEditAndCopy
-
-  StrCpy $0 bacula-sd
-  StrCpy $1 "Storage Service"
-  StrCpy $2 $ConfigStorageInstallService
-  StrCpy $3 $ConfigStorageStartService
-  Call InstallDaemon
-
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\List Devices.lnk" "$INSTDIR\bin\scsilist.exe" "/pause"
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Storage Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-sd.conf"'
-SectionEnd
-
-Section "Director Service" SecDirectorDaemon
-  SectionIn 2 3
-
-  SetOutPath "$INSTDIR\bin"
-
-  ${If} $ConfigDirectorDB = 1
-    File /oname=bacula_cats.dll "${SRC_DIR}\cats_mysql.dll"
-    File "${SRC_DIR}\libmysql.dll"
-    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_mysql_database.cmd
-    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_mysql_database.cmd
-    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_mysql_tables.cmd
-    File ${SRC_DIR}\make_mysql_tables.sql
-    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_mysql_tables.cmd
-    File ${SRC_DIR}\drop_mysql_tables.sql
-    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_mysql_privileges.cmd
-    File ${SRC_DIR}\grant_mysql_privileges.sql
-    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_mysql_catalog_backup.cmd
-  ${ElseIf} $ConfigDirectorDB = 2
-    File /oname=bacula_cats.dll "${SRC_DIR}\cats_postgresql.dll"
-    File "${SRC_DIR}\libpq.dll"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\comerr32.dll"
-    File "${SRC_DIR}\libintl-2.dll"
-    File "${SRC_DIR}\libiconv-2.dll"
-    File "${SRC_DIR}\krb5_32.dll"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\comerr32.dll"
-    File "${SRC_DIR}\libintl-2.dll"
-    File "${SRC_DIR}\libiconv-2.dll"
-    File "${SRC_DIR}\krb5_32.dll"
-!endif
-    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_postgresql_database.cmd
-    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_postgresql_database.cmd
-    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_postgresql_tables.cmd
-    File ${SRC_DIR}\make_postgresql_tables.sql
-    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_postgresql_tables.cmd
-    File ${SRC_DIR}\drop_postgresql_tables.sql
-    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_postgresql_privileges.cmd
-    File ${SRC_DIR}\grant_postgresql_privileges.sql
-    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_postgresql_catalog_backup.cmd
-  ${ElseIf} $ConfigDirectorDB = 3
-    File "${SRC_DIR}\sqlite3.exe"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\sqlite3.exe.manifest"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\sqlite3.exe.manifest"
-!endif
-    File /oname=bacula_cats.dll "${SRC_DIR}\cats_sqlite3.dll"
-    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_sqlite3_database.cmd
-    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_sqlite3_database.cmd
-    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_sqlite3_tables.cmd
-    File ${SRC_DIR}\make_sqlite3_tables.sql
-    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_sqlite3_tables.cmd
-    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_sqlite3_privileges.cmd
-    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_sqlite3_catalog_backup.cmd
-  ${EndIf}
-
-  File "${SRC_DIR}\bacula-dir.exe"
-  File "${SRC_DIR}\dbcheck.exe"
-
-  File "/oname=$PLUGINSDIR\delete_catalog_backup.cmd" "${SRC_DIR}\delete_catalog_backup.cmd"
-
-  StrCpy $0 "$INSTDIR\bin"
-  
-  StrCpy $1 create_database.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 drop_database.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 make_tables.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 drop_tables.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 grant_privileges.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 make_catalog_backup.cmd
-  Call ConfigEditAndCopy
-
-  StrCpy $1 delete_catalog_backup.cmd
-  Call ConfigEditAndCopy
-
-  File "${SRC_DIR}\query.sql"
-
-  File "/oname=$PLUGINSDIR\bacula-dir.conf" "bacula-dir.conf.in"
-
-  StrCpy $0 "$APPDATA\Bacula"
-  StrCpy $1 bacula-dir.conf
-  Call ConfigEditAndCopy
-
-  StrCpy $0 bacula-dir
-  StrCpy $1 "Director Service"
-  StrCpy $2 $ConfigDirectorInstallService
-  StrCpy $3 $ConfigDirectorStartService
-  Call InstallDaemon
-
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Director Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-dir.conf"'
-SectionEnd
-
-SectionGroupEnd
-
-SectionGroup "Consoles" SecGroupConsoles
-
-Section "Command Console" SecConsole
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR\bin"
-
-  File "${SRC_DIR}\bconsole.exe"
-  Call InstallCommonFiles
-
-  ${If} $InstallType = ${MigrateInstall}
-  ${AndIf} ${FileExists} "$OldInstallDir\bin\bconsole.conf"
-    CopyFiles "$OldInstallDir\bin\bconsole.conf" "$APPDATA\Bacula"
-  ${Else}
-    File "/oname=$PLUGINSDIR\bconsole.conf" "bconsole.conf.in"
-    StrCpy $0 "$APPDATA\Bacula"
-    StrCpy $1 bconsole.conf
-    Call ConfigEditAndCopy
-  ${EndIf}
-
-  CreateShortCut "$SMPROGRAMS\Bacula\bconsole.lnk" "$INSTDIR\bin\bconsole.exe" '-c "$APPDATA\Bacula\bconsole.conf"' "$INSTDIR\bin\bconsole.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Command Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bconsole.conf"'
-
-SectionEnd
-
-Section "Graphical Console" SecWxConsole
-  SectionIn 1 2 3
-  
-  SetOutPath "$INSTDIR\bin"
-
-  Call InstallCommonFiles
-!if "${BUILD_TOOLS}" == "VC8"
-  File "${SRC_DIR}\wxbase270_vc_bacula.dll"
-  File "${SRC_DIR}\wxmsw270_core_vc_bacula.dll"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-  File "${SRC_DIR}\wxbase270_vc_bacula.dll"
-  File "${SRC_DIR}\wxmsw270_core_vc_bacula.dll"
-!endif
-!if "${BUILD_TOOLS}" == "MinGW"
-  File "${SRC_DIR}\wxbase270_gcc_bacula.dll"
-  File "${SRC_DIR}\wxmsw270_core_gcc_bacula.dll"
-!endif
-
-  File "${SRC_DIR}\wx-console.exe"
-
-  ${If} $InstallType = ${MigrateInstall}
-  ${AndIf} ${FileExists} "$OldInstallDir\bin\wx-console.conf"
-    CopyFiles "$OldInstallDir\bin\wx-console.conf" "$APPDATA\Bacula"
-  ${Else}
-    File "/oname=$PLUGINSDIR\wx-console.conf" "wx-console.conf.in"
-    StrCpy $0 "$APPDATA\Bacula"
-    StrCpy $1 wx-console.conf
-    Call ConfigEditAndCopy
-  ${EndIf}
-
-  ; Create Start Menu entry
-  CreateShortCut "$SMPROGRAMS\Bacula\wx-console.lnk" "$INSTDIR\bin\wx-console.exe" '-c "$APPDATA\Bacula\wx-console.conf"' "$INSTDIR\bin\wx-console.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\wx-console.conf"'
-SectionEnd
-
-SectionGroupEnd
-
-SectionGroup "Documentation" SecGroupDocumentation
-
-Section "Documentation (Acrobat Format)" SecDocPdf
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR\doc"
-  CreateDirectory "$INSTDIR\doc"
-
-  File "${SRC_DIR}\manual\bacula.pdf"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual.lnk" '"$INSTDIR\doc\bacula.pdf"'
-SectionEnd
-
-Section "Documentation (HTML Format)" SecDocHtml
-  SectionIn 3
-
-  SetOutPath "$INSTDIR\doc"
-  CreateDirectory "$INSTDIR\doc"
-
-  File "${SRC_DIR}\manual\bacula\*.html"
-  File "${SRC_DIR}\manual\bacula\*.png"
-  File "${SRC_DIR}\manual\bacula\*.css"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
-SectionEnd
-
-SectionGroupEnd
-
-Section "-Finish"
-  Push $R0
-
-  ${If} $OsIsNT = 1
-    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$INSTDIR" /T /G SYSTEM:F Administrators:F'
-    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$APPDATA\Bacula" /T /G SYSTEM:F Administrators:F'
-  ${EndIf}
-
-  ; Write the uninstall keys for Windows & create Start Menu entry
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "InstallLocation" "$INSTDIR"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayVersion" "${VERSION}"
-  ${StrTok} $R0 "${VERSION}" "." 0 0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMajor" $R0
-  ${StrTok} $R0 "${VERSION}" "." 1 0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMinor" $R0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoRepair" 1
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://sourceforge.net/project/showfiles.php?group_id=50727"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.bacula.org"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.bacula.org/?page=support"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\Bacula\Uninstall Bacula.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-  Pop $R0
-SectionEnd
-
-; Extra Page descriptions
-
-LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
-LangString DESC_SecStorageDaemon ${LANG_ENGLISH} "Install Bacula Storage Daemon on this system."
-LangString DESC_SecDirectorDaemon ${LANG_ENGLISH} "Install Bacula Director 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."
-
-LangString TITLE_ConfigPage2 ${LANG_ENGLISH} "Configuration (continued)"
-LangString SUBTITLE_ConfigPage2 ${LANG_ENGLISH} "Set installation configuration."
-
-LangString TITLE_InstallType ${LANG_ENGLISH} "Installation Type"
-LangString SUBTITLE_InstallType ${LANG_ENGLISH} "Choose installation type."
-
-LangString TITLE_WriteTemplates ${LANG_ENGLISH} "Create Templates"
-LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create resource templates for inclusion in the Director's configuration file."
-
-!InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecStorageDaemon} $(DESC_SecStorageDaemon)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDirectorDaemon} $(DESC_SecDirectorDaemon)
-  !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
-
-UninstallText "This will uninstall Bacula. Hit next to continue."
-
-Section "Uninstall"
-  ; Shutdown any baculum that could be running
-  nsExec::ExecToLog '"$INSTDIR\bin\bacula-fd.exe" /kill'
-  nsExec::ExecToLog '"$INSTDIR\bin\bacula-sd.exe" /kill'
-  nsExec::ExecToLog '"$INSTDIR\bin\bacula-dir.exe" /kill'
-  Sleep 3000
-
-  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-fd"
-  ${If} $R0 = 1
-    ; Remove bacula service
-    nsExec::ExecToLog '"$INSTDIR\bin\bacula-fd.exe" /remove'
-  ${EndIf}
-  
-  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-sd"
-  ${If} $R0 = 1
-    ; Remove bacula service
-    nsExec::ExecToLog '"$INSTDIR\bin\bacula-sd.exe" /remove'
-  ${EndIf}
-  
-  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-dir"
-  ${If} $R0 = 1
-    ; Remove bacula service
-    nsExec::ExecToLog '"$INSTDIR\bin\bacula-dir.exe" /remove'
-  ${EndIf}
-  
-  ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula"
-  DeleteRegKey HKLM "Software\Bacula"
-
-  ; remove start menu items
-  SetShellVarContext all
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"
-  RMDir "$SMPROGRAMS\Bacula"
-
-  ; remove files and uninstaller (preserving config for now)
-  Delete /REBOOTOK "$INSTDIR\bin\*"
-  Delete /REBOOTOK "$INSTDIR\doc\*"
-  Delete /REBOOTOK "$INSTDIR\*"
-
-  ; Check for existing installation
-  MessageBox MB_YESNO|MB_ICONQUESTION \
-  "Would you like to delete the current configuration files and the working state file?" IDNO +7
-    Delete /REBOOTOK "$APPDATA\Bacula\*"
-    Delete /REBOOTOK "$APPDATA\Bacula\Work\*"
-    Delete /REBOOTOK "$APPDATA\Bacula\Spool\*"
-    RMDir "$APPDATA\Bacula\Work"
-    RMDir "$APPDATA\Bacula\Spool"
-    RMDir "$APPDATA\Bacula"
-
-  ; remove directories used
-  RMDir "$INSTDIR\bin"
-  RMDir "$INSTDIR\doc"
-  RMDir "$INSTDIR"
-SectionEnd
-
-;
-; $0 - Service Name (ie Bacula-FD)
-; $1 - Service Description (ie Bacula File Daemon)
-; $2 - Install as Service
-; $3 - Start Service now
-;
-Function InstallDaemon
-  Call InstallCommonFiles
-
-  WriteRegDWORD HKLM "Software\Bacula" "Service_$0" $2
-  
-  ${If} $2 = 1
-    nsExec::ExecToLog '"$INSTDIR\bin\$0.exe" /install -c "$APPDATA\Bacula\$0.conf"'
-
-    ${If} $OsIsNT <> 1
-      File "Start.bat"
-      File "Stop.bat"
-    ${EndIf}
-
-    ; Start the service?
-
-    ${If} $3 = 1  
-      ${If} $OsIsNT = 1
-        nsExec::ExecToLog 'net start $0'
-      ${Else}
-        Exec '"$INSTDIR\bin\$0.exe" -c "$APPDATA\Bacula\$0.conf"'
-      ${EndIf}
-    ${EndIf}
-  ${Else}
-    CreateShortCut "$SMPROGRAMS\Bacula\Start $1.lnk" "$INSTDIR\bin\$0.exe" '-c "$APPDATA\Bacula\$0.conf"' "$INSTDIR\bin\$0.exe" 0
-  ${EndIf}
-FunctionEnd
-
-Function GetComputerName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  System::Call "kernel32::GetComputerNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2"
-
-  ${StrCase} $R0 $R0 "L"
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-!define ComputerNameDnsFullyQualified   3
-
-Function GetHostName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ${If} $OsIsNT = 1
-    System::Call "kernel32::GetComputerNameExA(i ${ComputerNameDnsFullyQualified}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetComputerNameExA failed - LastError = $R2"
-      Call GetComputerName
-      Pop $R0
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${Else}
-    Call GetComputerName
-    Pop $R0
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-!define NameUserPrincipal 8
-
-Function GetUserName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ${If} $OsIsNT = 1
-    System::Call "secur32::GetUserNameExA(i ${NameUserPrincipal}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetUserNameExA failed - LastError = $R2"
-      Pop $R0
-      StrCpy $R0 ""
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${Else}
-      StrCpy $R0 ""
-  ${EndIf}
-
-  ${If} $R0 == ""
-    System::Call "advapi32::GetUserNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetUserNameA failed - LastError = $R2"
-      StrCpy $R0 ""
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-Function ConfigEditAndCopy
-  Push $R1
-
-  ${If} ${FileExists} "$0\$1"
-    StrCpy $R1 ".new"
-  ${Else}
-    StrCpy $R1 ""
-  ${EndIf}
-
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\$1"'
-  CopyFiles "$PLUGINSDIR\$1" "$0\$1$R1"
-
-  Pop $R1
-FunctionEnd
-
-Function FindDatabaseApps
-  Push $R1
-
-  ReadRegStr $0 HKLM "Software\MySQL AB\MySQL Server 5.0" "Location"
-
-  ${If} $0 != ""
-    Call RemoveTrailingSlash
-    StrCpy $MySQLPath $0
-    ReadRegStr $0 HKLM "Software\MySQL AB\MySQL Server 5.0" "Version"
-    StrCpy $MySQLVersion $0
-  ${EndIf}
-
-  EnumRegKey $R1 HKLM "Software\PostgreSQL\Installations" 0
-  ${If} $R1 != ""
-    ReadRegStr $0 HKLM "Software\PostgreSQL\Installations\$R1" "Base Directory"
-    Call RemoveTrailingSlash
-    StrCpy $PostgreSQLPath $0
-    ReadRegStr $0 HKLM "Software\PostgreSQL\Installations\$R1" "Version"
-    StrCpy $PostgreSQLVersion $0
-  ${EndIf}
-
-  Pop $R1
-FunctionEnd
-
-Function RemoveTrailingSlash
-  Push $R1
-  StrCpy $R1 $0 "" -1
-  ${If} $R1 == "\"
-    StrCpy $0 $0 -1
-  ${EndIf}
-  Pop $R1
-FunctionEnd
-
-Function IsDirectorSelected
-  Push $R0
-  SectionGetFlags ${SecDirectorDaemon} $R0
-  IntOp $R0 $R0 & ${SF_SELECTED}
-  Exch $R0
-FunctionEnd
-
-Function GetSelectedComponents
-  Push $R0
-  StrCpy $R0 0
-  ${If} ${SectionIsSelected} ${SecFileDaemon}
-    IntOp $R0 $R0 | ${ComponentFile}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecStorageDaemon}
-    IntOp $R0 $R0 | ${ComponentStorage}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecDirectorDaemon}
-    IntOp $R0 $R0 | ${ComponentDirector}
-  ${EndIf}
-  ${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
-
-Function PageComponentsShow
-  ${If} $OsIsNT <> 1
-    Call DisableServerSections
-  ${EndIf}
-
-  Call SelectPreviousComponents
-  Call UpdateComponentUI
-FunctionEnd
-
-Function PageDirectoryPre
-  ${If} $AutomaticInstall = 1
-  ${OrIf} $InstallType = ${UpgradeInstall}
-    Abort
-  ${EndIf}
-FunctionEnd
-
-Function LeaveInstallPage
-  Push "$INSTDIR\install.log"
-  Call DumpLog
-FunctionEnd
-
-Function EnterWriteTemplates
-  Push $R0
-  Push $R1
-
-  Call GetSelectedComponents
-  Pop $R0
-
-  IntOp $R0 $R0 & ${ComponentDirector}
-  IntOp $R1 $NewComponents & ${ComponentsFileAndStorage}
-
-  ${If} $R0 <> 0
-  ${OrIf} $R1 = 0
-    Pop $R1
-    Pop $R0
-    Abort
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 = 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags DISABLED
-    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST|DISABLED
-  ${Else}
-    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}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 = 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" State 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" Flags DISABLED
-    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" State
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST|DISABLED
-  ${Else}
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" State 1
-    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" Flags
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" State "C:\$ConfigStorageName.conf"
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST
-  ${EndIf}
-
-  !InsertMacro MUI_HEADER_TEXT "$(TITLE_WriteTemplates)" "$(SUBTITLE_WriteTemplates)"
-  !InsertMacro MUI_INSTALLOPTIONS_DISPLAY "WriteTemplates.ini"
-
-  !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 2" State
-  ${If} $R0 <> 0
-    File "/oname=$PLUGINSDIR\client.conf.in" "client.conf.in"
-
-    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\client.conf.in"'
-    !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 3" State
-    ${If} $R0 != ""
-      CopyFiles "$PLUGINSDIR\client.conf.in" "$R0"
-    ${EndIf}
-  ${EndIf}
-
-  !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 4" State
-  ${If} $R0 <> 0
-    File "/oname=$PLUGINSDIR\storage.conf.in" "storage.conf.in"
-
-    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\storage.conf.in"'
-    !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 5" State
-    ${If} $R0 != ""
-      CopyFiles "$PLUGINSDIR\storage.conf.in" "$R0"
-    ${EndIf}
-  ${EndIf}
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function SelectPreviousComponents
-  ${If} $InstallType <> ${NewInstall}
-    IntOp $R1 $PreviousComponents & ${ComponentFile}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecFileDaemon}
-      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecFileDaemon}
-      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentStorage}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecStorageDaemon}
-      !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecStorageDaemon}
-      !InsertMacro ClearSectionFlag ${SecStorageDaemon} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentDirector}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecDirectorDaemon}
-      !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecDirectorDaemon}
-      !InsertMacro ClearSectionFlag ${SecDirectorDaemon} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentTextConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecConsole}
-      !InsertMacro SetSectionFlag ${SecConsole} ${SF_RO}
-    ${Else}
-      !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
-
-Function DisableServerSections
-  !InsertMacro UnselectSection ${SecGroupServer}
-  !InsertMacro SetSectionFlag  ${SecGroupServer} ${SF_RO}
-  !InsertMacro UnselectSection ${SecStorageDaemon}
-  !InsertMacro SetSectionFlag  ${SecStorageDaemon} ${SF_RO}
-  !InsertMacro UnselectSection ${SecDirectorDaemon}
-  !InsertMacro SetSectionFlag  ${SecDirectorDaemon} ${SF_RO}
-FunctionEnd
-
-Function UpdateComponentUI
-  Push $R0
-  Push $R1
-
-  Call GetSelectedComponents
-  Pop $R0
-
-  IntOp $R1 $R0 ^ $PreviousComponents
-  IntOp $NewComponents $R0 & $R1
-
-  ${If} $InstallType <> ${NewInstall}
-    IntOp $R1 $NewComponents & ${ComponentFile}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentStorage}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecStorageDaemon} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentDirector}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecDirectorDaemon} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentTextConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecConsole} ${SF_BOLD}
-    ${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
-
-  IntOp $R1 $NewComponents & ${ComponentsRequiringUserConfig}
-  ${If} $R1 = 0
-    SendMessage $R0 ${WM_SETTEXT} 0 "STR:Install"
-  ${Else}
-    SendMessage $R0 ${WM_SETTEXT} 0 "STR:&Next >"
-  ${EndIf}
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-!include "InstallType.nsh"
-!include "ConfigPage1.nsh"
-!include "ConfigPage2.nsh"
-!include "DumpLog.nsh"
+; winbacula.nsi\r
+;\r
+; Began as a version written by Michel Meyers (michel@tcnnet.dyndns.org)\r
+;\r
+; Adapted by Kern Sibbald for native Win32 Bacula\r
+;    added a number of elements from Christopher Hull's installer\r
+;\r
+; D. Scott Barninger Nov 13 2004\r
+; added configuration editing for bconsole.conf and wx-console.conf\r
+; better explanation in dialog boxes for editing config files\r
+; added Start Menu items\r
+; fix uninstall of config files to do all not just bacula-fd.conf\r
+;\r
+; D. Scott Barninger Dec 05 2004\r
+; added specification of default permissions for bacula-fd.conf\r
+;   - thanks to Jamie Ffolliott for pointing me at cacls\r
+; added removal of working-dir files if user selects to remove config\r
+; uninstall is now 100% clean\r
+;\r
+; D. Scott Barninger Apr 17 2005\r
+; 1.36.3 release docs update\r
+; add pdf manual and menu shortcut\r
+;\r
+; Robert Nelson May 15 2006\r
+; Pretty much rewritten\r
+; Use LogicLib.nsh\r
+; Added Bacula-SD and Bacula-DIR\r
+; Replaced ParameterGiven with standard GetOptions\r
+\r
+;\r
+; Command line options:\r
+;\r
+; /service    - \r
+; /start\r
+\r
+!define PRODUCT "Bacula"\r
+\r
+;\r
+; Include the Modern UI\r
+;\r
+\r
+!include "MUI.nsh"\r
+!include "LogicLib.nsh"\r
+!include "FileFunc.nsh"\r
+!include "Sections.nsh"\r
+!include "StrFunc.nsh"\r
+!include "WinMessages.nsh"\r
+;\r
+; Basics\r
+;\r
+Name "Bacula"\r
+OutFile "${OUT_DIR}\winbacula-${VERSION}.exe"\r
+SetCompressor lzma\r
+InstallDir "$PROGRAMFILES\Bacula"\r
+InstallDirRegKey HKLM "Software\Bacula" "InstallLocation"\r
+\r
+InstType "Client"\r
+InstType "Server"\r
+InstType "Full"\r
+\r
+!insertmacro GetParent\r
+\r
+${StrCase}\r
+${StrRep}\r
+${StrTok}\r
+${StrTrimNewLines}\r
+\r
+;\r
+; Pull in pages\r
+;\r
+\r
+!define      MUI_COMPONENTSPAGE_SMALLDESC\r
+\r
+!define      MUI_HEADERIMAGE\r
+!define      MUI_BGCOLOR                739AB9\r
+!define      MUI_HEADERIMAGE_BITMAP     "bacula-logo.bmp"\r
+\r
+!InsertMacro MUI_PAGE_WELCOME\r
+;  !InsertMacro MUI_PAGE_LICENSE "..\..\LICENSE"\r
+Page custom EnterInstallType\r
+!define      MUI_PAGE_CUSTOMFUNCTION_SHOW PageComponentsShow\r
+!InsertMacro MUI_PAGE_COMPONENTS\r
+!define      MUI_PAGE_CUSTOMFUNCTION_PRE PageDirectoryPre\r
+!InsertMacro MUI_PAGE_DIRECTORY\r
+Page custom EnterConfigPage1 LeaveConfigPage1\r
+Page custom EnterConfigPage2 LeaveConfigPage2\r
+!Define      MUI_PAGE_CUSTOMFUNCTION_LEAVE LeaveInstallPage\r
+!InsertMacro MUI_PAGE_INSTFILES\r
+Page custom EnterWriteTemplates\r
+!Define      MUI_FINISHPAGE_SHOWREADME $INSTDIR\Readme.txt\r
+!InsertMacro MUI_PAGE_FINISH\r
+\r
+!InsertMacro MUI_UNPAGE_WELCOME\r
+!InsertMacro MUI_UNPAGE_CONFIRM\r
+!InsertMacro MUI_UNPAGE_INSTFILES\r
+!InsertMacro MUI_UNPAGE_FINISH\r
+\r
+!define      MUI_ABORTWARNING\r
+\r
+!InsertMacro MUI_LANGUAGE "English"\r
+\r
+!InsertMacro GetParameters\r
+!InsertMacro GetOptions\r
+\r
+DirText "Setup will install Bacula ${VERSION} to the directory specified below. To install in a different folder, click Browse and select another folder."\r
+\r
+!InsertMacro MUI_RESERVEFILE_INSTALLOPTIONS\r
+;\r
+; Global Variables\r
+;\r
+Var OptService\r
+Var OptStart\r
+Var OptSilent\r
+\r
+Var CommonFilesDone\r
+\r
+Var OsIsNT\r
+\r
+Var HostName\r
+\r
+Var ConfigClientName\r
+Var ConfigClientPort\r
+Var ConfigClientMaxJobs\r
+Var ConfigClientPassword\r
+Var ConfigClientInstallService\r
+Var ConfigClientStartService\r
+\r
+Var ConfigStorageName\r
+Var ConfigStoragePort\r
+Var ConfigStorageMaxJobs\r
+Var ConfigStoragePassword\r
+Var ConfigStorageInstallService\r
+Var ConfigStorageStartService\r
+\r
+Var ConfigDirectorName\r
+Var ConfigDirectorPort\r
+Var ConfigDirectorMaxJobs\r
+Var ConfigDirectorPassword\r
+Var ConfigDirectorAddress\r
+Var ConfigDirectorMailServer\r
+Var ConfigDirectorMailAddress\r
+Var ConfigDirectorDB\r
+Var ConfigDirectorInstallService\r
+Var ConfigDirectorStartService\r
+\r
+Var ConfigMonitorName\r
+Var ConfigMonitorPassword\r
+\r
+Var LocalDirectorPassword\r
+Var LocalHostAddress\r
+\r
+Var MySQLPath\r
+Var MySQLVersion\r
+Var PostgreSQLPath\r
+Var PostgreSQLVersion\r
+\r
+Var AutomaticInstall\r
+Var InstallType\r
+!define NewInstall      0\r
+!define UpgradeInstall  1\r
+!define MigrateInstall  2\r
+\r
+Var OldInstallDir\r
+Var PreviousComponents\r
+Var NewComponents\r
+\r
+; Bit 0 = File Service\r
+;     1 = Storage Service\r
+;     2 = Director Service\r
+;     3 = Command Console\r
+;     4 = Graphical Console\r
+;     5 = Documentation (PDF)\r
+;     6 = Documentation (HTML)\r
+\r
+!define ComponentFile                   1\r
+!define ComponentStorage                2\r
+!define ComponentDirector               4\r
+!define ComponentTextConsole            8\r
+!define ComponentGUIConsole             16\r
+!define ComponentPDFDocs                32\r
+!define ComponentHTMLDocs               64\r
+\r
+!define ComponentsRequiringUserConfig           31\r
+!define ComponentsFileAndStorage                3\r
+!define ComponentsFileAndStorageAndDirector     7\r
+!define ComponentsDirectorAndTextGuiConsoles    28\r
+!define ComponentsTextAndGuiConsoles            24\r
+\r
+Var HDLG\r
+Var HCTL\r
+\r
+Function .onInit\r
+  Push $R0\r
+  Push $R1\r
+\r
+  ; Process Command Line Options\r
+  StrCpy $OptService 1\r
+  StrCpy $OptStart 1\r
+  StrCpy $OptSilent 0\r
+  StrCpy $CommonFilesDone 0\r
+  StrCpy $OsIsNT 0\r
+  StrCpy $AutomaticInstall 0\r
+  StrCpy $InstallType ${NewInstall}\r
+  StrCpy $OldInstallDir ""\r
+  StrCpy $PreviousComponents 0\r
+  StrCpy $NewComponents 0\r
+  StrCpy $MySQLPath ""\r
+  StrCpy $MySQLVersion ""\r
+  StrCpy $PostgreSQLPath ""\r
+  StrCpy $PostgreSQLVersion ""\r
+\r
+  ${GetParameters} $R0\r
+\r
+  ClearErrors\r
+  ${GetOptions} $R0 "/noservice" $R1\r
+  IfErrors +2\r
+    StrCpy $OptService 0\r
+\r
+  ClearErrors\r
+  ${GetOptions} $R0 "/nostart" $R1\r
+  IfErrors +2\r
+    StrCpy $OptStart 0\r
+\r
+  IfSilent 0 +2\r
+    StrCpy $OptSilent 1\r
+\r
+  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion\r
+  ${If} $R0 != ""\r
+    StrCpy $OsIsNT 1\r
+  ${EndIf}\r
+\r
+  Call GetComputerName\r
+  Pop $HostName\r
+\r
+  Call GetHostName\r
+  Pop $LocalHostAddress\r
+\r
+  Call GetUserName\r
+  Pop $ConfigDirectorMailAddress\r
+\r
+  Call FindDatabaseApps\r
+\r
+  ; Configuration Defaults\r
+\r
+  StrCpy $ConfigClientName               "$HostName-fd"\r
+  StrCpy $ConfigClientPort               9102\r
+  StrCpy $ConfigClientMaxJobs            2\r
+  ;StrCpy $ConfigClientPassword\r
+  StrCpy $ConfigClientInstallService     "$OptService"\r
+  StrCpy $ConfigClientStartService       "$OptStart"\r
+\r
+  StrCpy $ConfigStorageName              "$HostName-sd"\r
+  StrCpy $ConfigStoragePort              9103\r
+  StrCpy $ConfigStorageMaxJobs           10\r
+  ;StrCpy $ConfigStoragePassword\r
+  StrCpy $ConfigStorageInstallService    "$OptService"\r
+  StrCpy $ConfigStorageStartService      "$OptStart"\r
+\r
+  ;StrCpy $ConfigDirectorName            "$HostName-dir"\r
+  StrCpy $ConfigDirectorPort             9101\r
+  StrCpy $ConfigDirectorMaxJobs          1\r
+  ;StrCpy $ConfigDirectorPassword\r
+  StrCpy $ConfigDirectorDB               0\r
+  StrCpy $ConfigDirectorInstallService   "$OptService"\r
+  StrCpy $ConfigDirectorStartService     "$OptStart"\r
+\r
+  StrCpy $ConfigMonitorName              "$HostName-mon"\r
+  ;StrCpy $ConfigMonitorPassword\r
+\r
+  InitPluginsDir\r
+  File "/oname=$PLUGINSDIR\openssl.exe"  "${SRC_DIR}\openssl.exe"\r
+  File "/oname=$PLUGINSDIR\libeay32.dll" "${SRC_DIR}\libeay32.dll"\r
+  File "/oname=$PLUGINSDIR\ssleay32.dll" "${SRC_DIR}\ssleay32.dll"\r
+  File "/oname=$PLUGINSDIR\sed.exe"      "${SRC_DIR}\sed.exe"\r
+\r
+  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "InstallType.ini"\r
+  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "WriteTemplates.ini"\r
+\r
+  SetPluginUnload alwaysoff\r
+\r
+  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'\r
+  pop $R0\r
+  ${If} $R0 = 0\r
+   FileOpen $R1 "$PLUGINSDIR\pw.txt" r\r
+   IfErrors +4\r
+     FileRead $R1 $R0\r
+     ${StrTrimNewLines} $ConfigClientPassword $R0\r
+     FileClose $R1\r
+  ${EndIf}\r
+\r
+  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'\r
+  pop $R0\r
+  ${If} $R0 = 0\r
+   FileOpen $R1 "$PLUGINSDIR\pw.txt" r\r
+   IfErrors +4\r
+     FileRead $R1 $R0\r
+     ${StrTrimNewLines} $ConfigStoragePassword $R0\r
+     FileClose $R1\r
+  ${EndIf}\r
+\r
+  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'\r
+  pop $R0\r
+  ${If} $R0 = 0\r
+   FileOpen $R1 "$PLUGINSDIR\pw.txt" r\r
+   IfErrors +4\r
+     FileRead $R1 $R0\r
+     ${StrTrimNewLines} $LocalDirectorPassword $R0\r
+     FileClose $R1\r
+  ${EndIf}\r
+\r
+  SetPluginUnload manual\r
+\r
+  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'\r
+  pop $R0\r
+  ${If} $R0 = 0\r
+   FileOpen $R1 "$PLUGINSDIR\pw.txt" r\r
+   IfErrors +4\r
+     FileRead $R1 $R0\r
+     ${StrTrimNewLines} $ConfigMonitorPassword $R0\r
+     FileClose $R1\r
+  ${EndIf}\r
+\r
+  Pop $R1\r
+  Pop $R0\r
+FunctionEnd\r
+\r
+Function .onSelChange\r
+  Call UpdateComponentUI\r
+FunctionEnd\r
+\r
+Function InstallCommonFiles\r
+  ${If} $CommonFilesDone = 0\r
+    SetOutPath "$INSTDIR"\r
+    File "Readme.txt"\r
+\r
+    SetOutPath "$INSTDIR\bin"\r
+!if "${BUILD_TOOLS}" == "VC8"\r
+    File "${SRC_DIR}\msvcm80.dll"\r
+    File "${SRC_DIR}\msvcp80.dll"\r
+    File "${SRC_DIR}\msvcr80.dll"\r
+    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"\r
+    File "${SRC_DIR}\pthreadVCE.dll"\r
+!endif\r
+!if "${BUILD_TOOLS}" == "VC8_DEBUG"\r
+    File "${SRC_DIR}\msvcm80.dll"\r
+    File "${SRC_DIR}\msvcp80.dll"\r
+    File "${SRC_DIR}\msvcr80.dll"\r
+    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"\r
+    File "${SRC_DIR}\msvcm80d.dll"\r
+    File "${SRC_DIR}\msvcp80d.dll"\r
+    File "${SRC_DIR}\msvcr80d.dll"\r
+    File "${SRC_DIR}\Microsoft.VC80.DebugCRT.manifest"\r
+    File "${SRC_DIR}\pthreadVCE.dll"\r
+!endif\r
+!if "${BUILD_TOOLS}" == "MinGW"\r
+    File "${SRC_DIR}\mingwm10.dll"\r
+    File "${SRC_DIR}\pthreadGCE.dll"\r
+!endif\r
+    File "${SRC_DIR}\libeay32.dll"\r
+    File "${SRC_DIR}\ssleay32.dll"\r
+    File "${SRC_DIR}\zlib1.dll"\r
+!if "${BUILD_TOOLS}" == "VC8"\r
+    File "${SRC_DIR}\zlib1.dll.manifest"\r
+!endif\r
+!If "${BUILD_TOOLS}" == "VC8_DEBUG"\r
+    File "${SRC_DIR}\zlib1.dll.manifest"\r
+!endif\r
+    File "/oname=$INSTDIR\openssl.cnf" "${SRC_DIR}\openssl.cnf"\r
+    File "${SRC_DIR}\openssl.exe"\r
+    File "${SRC_DIR}\bsleep.exe"\r
+    File "${SRC_DIR}\bsmtp.exe"\r
+    File "${SRC_DIR}\bacula.dll"\r
+    File "${SRC_DIR}\expr64.exe"\r
+    File "${SRC_DIR}\snooze.exe"\r
+\r
+    CreateShortCut "$SMPROGRAMS\Bacula\Documentation\View Readme.lnk" "write.exe" '"$INSTDIR\Readme.txt"'\r
+\r
+    StrCpy $CommonFilesDone 1\r
+  ${EndIf}\r
+FunctionEnd\r
+\r
+Section "-Initialize"\r
+  ${If} $MySQLPath != ""\r
+    DetailPrint "Found MySQL (version $MySQLVersion)"\r
+  ${EndIf}\r
+  ${If} $PostgreSQLPath != ""\r
+    DetailPrint "Found PostgreSQL (version $PostgreSQLVersion)"\r
+  ${EndIf}\r
+\r
+  WriteRegStr   HKLM Software\Bacula InstallLocation "$INSTDIR"\r
+\r
+  Call GetSelectedComponents\r
+  Pop $R2\r
+  WriteRegDWORD HKLM Software\Bacula Components $R2\r
+\r
+  WriteRegDWORD HKLM Software\Bacula Database $ConfigDirectorDB\r
+\r
+  ; remove start menu items\r
+  SetShellVarContext all\r
+\r
+  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Configuration\*"\r
+  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Documentation\*"\r
+  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"\r
+  RMDir "$SMPROGRAMS\Bacula\Configuration"\r
+  RMDir "$SMPROGRAMS\Bacula\Documentation"\r
+  RMDir "$SMPROGRAMS\Bacula"\r
+  CreateDirectory "$SMPROGRAMS\Bacula"\r
+  CreateDirectory "$SMPROGRAMS\Bacula\Configuration"\r
+  CreateDirectory "$SMPROGRAMS\Bacula\Documentation"\r
+\r
+  CreateDirectory "$INSTDIR"\r
+  CreateDirectory "$INSTDIR\bin"\r
+  CreateDirectory "$APPDATA\Bacula"\r
+  CreateDirectory "$APPDATA\Bacula\Work"\r
+  CreateDirectory "$APPDATA\Bacula\Spool"\r
+\r
+  File "..\..\..\LICENSE"\r
+  Delete /REBOOTOK "$INSTDIR\bin\License.txt"\r
+\r
+  FileOpen $R1 $PLUGINSDIR\config.sed w\r
+  FileWrite $R1 "s;@VERSION@;${VERSION};g$\r$\n"\r
+  FileWrite $R1 "s;@DATE@;${__DATE__};g$\r$\n"\r
+  FileWrite $R1 "s;@DISTNAME@;Windows;g$\r$\n"\r
+\r
+!If "$BUILD_TOOLS" == "MinGW"\r
+  StrCpy $R2 "MinGW32"\r
+!Else\r
+  StrCpy $R2 "MVS"\r
+!EndIf\r
+\r
+  Call GetHostName\r
+  Exch $R3\r
+  Pop $R3\r
+\r
+  FileWrite $R1 "s;@DISTVER@;$R2;g$\r$\n"\r
+\r
+  ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\\\"\r
+  FileWrite $R1 's;@working_dir@;$R2;g$\r$\n'\r
+  ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\"\r
+  FileWrite $R1 's;@working_dir_cmd@;$R2;g$\r$\n'\r
+\r
+  ${StrRep} $R2 "$INSTDIR\bin" "\" "\\\\"\r
+  FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'\r
+  ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"\r
+  FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'\r
+\r
+  ${StrRep} $R2 "$INSTDIR" "\" "/"\r
+  FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"\r
+\r
+  Call IsDirectorSelected\r
+  Pop $R2\r
+  ${If} $R2 = 1\r
+    FileWrite $R1 "s;@director_address@;$LocalHostAddress;g$\r$\n"\r
+  ${Else}\r
+    ${If} "$ConfigDirectorAddress" != ""\r
+      FileWrite $R1 "s;@director_address@;$ConfigDirectorAddress;g$\r$\n"\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  FileWrite $R1 "s;@client_address@;$LocalHostAddress;g$\r$\n"\r
+  FileWrite $R1 "s;@storage_address@;$LocalHostAddress;g$\r$\n"\r
+\r
+  ${If} "$ConfigClientName" != ""\r
+    FileWrite $R1 "s;@client_name@;$ConfigClientName;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigClientPort" != ""\r
+    FileWrite $R1 "s;@client_port@;$ConfigClientPort;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigClientMaxJobs" != ""\r
+    FileWrite $R1 "s;@client_maxjobs@;$ConfigClientMaxJobs;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigClientPassword" != ""\r
+    FileWrite $R1 "s;@client_password@;$ConfigClientPassword;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigStorageName" != ""\r
+    FileWrite $R1 "s;@storage_name@;$ConfigStorageName;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigStoragePort" != ""\r
+    FileWrite $R1 "s;@storage_port@;$ConfigStoragePort;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigStorageMaxJobs" != ""\r
+    FileWrite $R1 "s;@storage_maxjobs@;$ConfigStorageMaxJobs;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigStoragePassword" != ""\r
+    FileWrite $R1 "s;@storage_password@;$ConfigStoragePassword;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorName" != ""\r
+    FileWrite $R1 "s;@director_name@;$ConfigDirectorName;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorPort" != ""\r
+    FileWrite $R1 "s;@director_port@;$ConfigDirectorPort;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorMaxJobs" != ""\r
+    FileWrite $R1 "s;@director_maxjobs@;$ConfigDirectorMaxJobs;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorPassword" != ""\r
+    FileWrite $R1 "s;@director_password@;$ConfigDirectorPassword;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorMailServer" != ""\r
+    FileWrite $R1 "s;@smtp_host@;$ConfigDirectorMailServer;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigDirectorMailAddress" != ""\r
+    FileWrite $R1 "s;@job_email@;$ConfigDirectorMailAddress;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigMonitorName" != ""\r
+    FileWrite $R1 "s;@monitor_name@;$ConfigMonitorName;g$\r$\n"\r
+  ${EndIf}\r
+  ${If} "$ConfigMonitorPassword" != ""\r
+    FileWrite $R1 "s;@monitor_password@;$ConfigMonitorPassword;g$\r$\n"\r
+  ${EndIf}\r
+\r
+  ${If} $ConfigDirectorDB = 1\r
+    ${If} $MySQLPath != ""\r
+      ${StrRep} $R2 "$MySQLPath\bin" "\" "\\"\r
+      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"\r
+    ${EndIf}\r
+  ${ElseIf} $ConfigDirectorDB = 2\r
+    ${If} $PostgreSQLPath != ""\r
+      ${StrRep} $R2 "$PostgreSQLPath\bin" "\" "\\"\r
+      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  FileClose $R1\r
+\r
+  ${If} $InstallType = ${MigrateInstall}\r
+    FileOpen $R1 $PLUGINSDIR\migrate.sed w\r
+    ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\\\"\r
+    FileWrite $R1 's;\(Working *Directory *= *\)[^ ][^ ]*.*$$;\1"$R2";$\r$\n'\r
+    FileWrite $R1 's;\(Pid *Directory *= *\)[^ ][^ ]*.*$$;\1"$R2";$\r$\n'\r
+    FileClose $R1\r
+  ${EndIf}\r
+\r
+  ${If} ${FileExists} "$OldInstallDir\bin\bacula-fd.exe"\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /kill'     ; Shutdown any bacula that could be running\r
+    Sleep 3000\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /remove'   ; Remove existing service\r
+  ${EndIf}\r
+\r
+  ${If} ${FileExists} "$OldInstallDir\bin\bacula-sd.exe"\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /kill'     ; Shutdown any bacula that could be running\r
+    Sleep 3000\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /remove'   ; Remove existing service\r
+  ${EndIf}\r
+\r
+  ${If} ${FileExists} "$OldInstallDir\bin\bacula-dir.exe"\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /kill'     ; Shutdown any bacula that could be running\r
+    Sleep 3000\r
+    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /remove'   ; Remove existing service\r
+  ${EndIf}\r
+\r
+SectionEnd\r
+\r
+SectionGroup "Client" SecGroupClient\r
+\r
+Section "File Service" SecFileDaemon\r
+  SectionIn 1 2 3\r
+\r
+  SetOutPath "$INSTDIR\bin"\r
+\r
+  File "${SRC_DIR}\bacula-fd.exe"\r
+\r
+  ${If} $InstallType = ${MigrateInstall}\r
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"\r
+    CopyFiles "$OldInstallDir\bin\bacula-fd.conf" "$APPDATA\Bacula"\r
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\migrate.sed" -i.bak "$APPDATA\Bacula\bacula-fd.conf"'\r
+  ${Else}\r
+    File "/oname=$PLUGINSDIR\bacula-fd.conf" "bacula-fd.conf.in"\r
+\r
+    StrCpy $0 "$APPDATA\Bacula"\r
+    StrCpy $1 bacula-fd.conf\r
+    Call ConfigEditAndCopy\r
+  ${EndIf}\r
+\r
+  StrCpy $0 bacula-fd\r
+  StrCpy $1 "File Service"\r
+  StrCpy $2 $ConfigClientInstallService\r
+  StrCpy $3 $ConfigClientStartService\r
+\r
+  Call InstallDaemon\r
+\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Client Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-fd.conf"'\r
+SectionEnd\r
+\r
+SectionGroupEnd\r
+\r
+SectionGroup "Server" SecGroupServer\r
+\r
+Section "Storage Service" SecStorageDaemon\r
+  SectionIn 2 3\r
+\r
+  SetOutPath "$INSTDIR\bin"\r
+\r
+  File "${SRC_DIR}\loaderinfo.exe"\r
+  File "${SRC_DIR}\mt.exe"\r
+  File "${SRC_DIR}\mtx.exe"\r
+  File "${SRC_DIR}\scsitape.exe"\r
+  File "${SRC_DIR}\tapeinfo.exe"\r
+  File "${SRC_DIR}\bacula-sd.exe"\r
+  File "${SRC_DIR}\bcopy.exe"\r
+  File "${SRC_DIR}\bextract.exe"\r
+  File "${SRC_DIR}\bls.exe"\r
+  File "${SRC_DIR}\bscan.exe"\r
+  File "${SRC_DIR}\btape.exe"\r
+  File "${SRC_DIR}\scsilist.exe"\r
+  File "${SRC_DIR}\mkisofs.exe"\r
+  File "${SRC_DIR}\growisofs.exe"\r
+  File "${SRC_DIR}\dvd-ram-control.exe"\r
+  File "${SRC_DIR}\dvd+rw-booktype.exe"\r
+  File "${SRC_DIR}\dvd+rw-format.exe"\r
+  File "${SRC_DIR}\dvd+rw-mediainfo.exe"\r
+\r
+  File "/oname=$PLUGINSDIR\mtx-changer.cmd" "${SRC_DIR}\mtx-changer.cmd"\r
+\r
+  StrCpy $0 "$INSTDIR\bin"\r
+  StrCpy $1 mtx-changer.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  File "/oname=$PLUGINSDIR\disk-changer.cmd" "${SRC_DIR}\disk-changer.cmd"\r
+\r
+  StrCpy $0 "$INSTDIR\bin"\r
+  StrCpy $1 disk-changer.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  File "/oname=$PLUGINSDIR\dvd-handler.cmd" "${SRC_DIR}\dvd-handler.cmd"\r
+\r
+  StrCpy $0 "$INSTDIR\bin"\r
+  StrCpy $1 dvd-handler.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  File "/oname=$PLUGINSDIR\bacula-sd.conf" "bacula-sd.conf.in"\r
+\r
+  StrCpy $0 "$APPDATA\Bacula"\r
+  StrCpy $1 bacula-sd.conf\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $0 bacula-sd\r
+  StrCpy $1 "Storage Service"\r
+  StrCpy $2 $ConfigStorageInstallService\r
+  StrCpy $3 $ConfigStorageStartService\r
+  Call InstallDaemon\r
+\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\List Devices.lnk" "$INSTDIR\bin\scsilist.exe" "/pause"\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Storage Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-sd.conf"'\r
+SectionEnd\r
+\r
+Section "Director Service" SecDirectorDaemon\r
+  SectionIn 2 3\r
+\r
+  SetOutPath "$INSTDIR\bin"\r
+\r
+  ${If} $ConfigDirectorDB = 1\r
+    File /oname=bacula_cats.dll "${SRC_DIR}\cats_mysql.dll"\r
+    File "${SRC_DIR}\libmysql.dll"\r
+    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_mysql_database.cmd\r
+    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_mysql_database.cmd\r
+    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_mysql_tables.cmd\r
+    File ${SRC_DIR}\make_mysql_tables.sql\r
+    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_mysql_tables.cmd\r
+    File ${SRC_DIR}\drop_mysql_tables.sql\r
+    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_mysql_privileges.cmd\r
+    File ${SRC_DIR}\grant_mysql_privileges.sql\r
+    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_mysql_catalog_backup.cmd\r
+  ${ElseIf} $ConfigDirectorDB = 2\r
+    File /oname=bacula_cats.dll "${SRC_DIR}\cats_postgresql.dll"\r
+    File "${SRC_DIR}\libpq.dll"\r
+!if "${BUILD_TOOLS}" == "VC8"\r
+    File "${SRC_DIR}\comerr32.dll"\r
+    File "${SRC_DIR}\libintl-2.dll"\r
+    File "${SRC_DIR}\libiconv-2.dll"\r
+    File "${SRC_DIR}\krb5_32.dll"\r
+!endif\r
+!If "${BUILD_TOOLS}" == "VC8_DEBUG"\r
+    File "${SRC_DIR}\comerr32.dll"\r
+    File "${SRC_DIR}\libintl-2.dll"\r
+    File "${SRC_DIR}\libiconv-2.dll"\r
+    File "${SRC_DIR}\krb5_32.dll"\r
+!endif\r
+    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_postgresql_database.cmd\r
+    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_postgresql_database.cmd\r
+    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_postgresql_tables.cmd\r
+    File ${SRC_DIR}\make_postgresql_tables.sql\r
+    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_postgresql_tables.cmd\r
+    File ${SRC_DIR}\drop_postgresql_tables.sql\r
+    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_postgresql_privileges.cmd\r
+    File ${SRC_DIR}\grant_postgresql_privileges.sql\r
+    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_postgresql_catalog_backup.cmd\r
+  ${ElseIf} $ConfigDirectorDB = 3\r
+    File "${SRC_DIR}\sqlite3.exe"\r
+!if "${BUILD_TOOLS}" == "VC8"\r
+    File "${SRC_DIR}\sqlite3.exe.manifest"\r
+!endif\r
+!If "${BUILD_TOOLS}" == "VC8_DEBUG"\r
+    File "${SRC_DIR}\sqlite3.exe.manifest"\r
+!endif\r
+    File /oname=bacula_cats.dll "${SRC_DIR}\cats_sqlite3.dll"\r
+    File /oname=$PLUGINSDIR\create_database.cmd ${SRC_DIR}\create_sqlite3_database.cmd\r
+    File /oname=$PLUGINSDIR\drop_database.cmd ${SRC_DIR}\drop_sqlite3_database.cmd\r
+    File /oname=$PLUGINSDIR\make_tables.cmd ${SRC_DIR}\make_sqlite3_tables.cmd\r
+    File ${SRC_DIR}\make_sqlite3_tables.sql\r
+    File /oname=$PLUGINSDIR\drop_tables.cmd ${SRC_DIR}\drop_sqlite3_tables.cmd\r
+    File /oname=$PLUGINSDIR\grant_privileges.cmd ${SRC_DIR}\grant_sqlite3_privileges.cmd\r
+    File /oname=$PLUGINSDIR\make_catalog_backup.cmd ${SRC_DIR}\make_sqlite3_catalog_backup.cmd\r
+  ${EndIf}\r
+\r
+  File "${SRC_DIR}\bacula-dir.exe"\r
+  File "${SRC_DIR}\dbcheck.exe"\r
+\r
+  File "/oname=$PLUGINSDIR\delete_catalog_backup.cmd" "${SRC_DIR}\delete_catalog_backup.cmd"\r
+\r
+  StrCpy $0 "$INSTDIR\bin"\r
+  \r
+  StrCpy $1 create_database.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 drop_database.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 make_tables.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 drop_tables.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 grant_privileges.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 make_catalog_backup.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $1 delete_catalog_backup.cmd\r
+  Call ConfigEditAndCopy\r
+\r
+  File "${SRC_DIR}\query.sql"\r
+\r
+  File "/oname=$PLUGINSDIR\bacula-dir.conf" "bacula-dir.conf.in"\r
+\r
+  StrCpy $0 "$APPDATA\Bacula"\r
+  StrCpy $1 bacula-dir.conf\r
+  Call ConfigEditAndCopy\r
+\r
+  StrCpy $0 bacula-dir\r
+  StrCpy $1 "Director Service"\r
+  StrCpy $2 $ConfigDirectorInstallService\r
+  StrCpy $3 $ConfigDirectorStartService\r
+  Call InstallDaemon\r
+\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Director Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-dir.conf"'\r
+SectionEnd\r
+\r
+SectionGroupEnd\r
+\r
+SectionGroup "Consoles" SecGroupConsoles\r
+\r
+Section "Command Console" SecConsole\r
+  SectionIn 1 2 3\r
+\r
+  SetOutPath "$INSTDIR\bin"\r
+\r
+  File "${SRC_DIR}\bconsole.exe"\r
+  Call InstallCommonFiles\r
+\r
+  ${If} $InstallType = ${MigrateInstall}\r
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bconsole.conf"\r
+    CopyFiles "$OldInstallDir\bin\bconsole.conf" "$APPDATA\Bacula"\r
+  ${Else}\r
+    File "/oname=$PLUGINSDIR\bconsole.conf" "bconsole.conf.in"\r
+    StrCpy $0 "$APPDATA\Bacula"\r
+    StrCpy $1 bconsole.conf\r
+    Call ConfigEditAndCopy\r
+  ${EndIf}\r
+\r
+  CreateShortCut "$SMPROGRAMS\Bacula\bconsole.lnk" "$INSTDIR\bin\bconsole.exe" '-c "$APPDATA\Bacula\bconsole.conf"' "$INSTDIR\bin\bconsole.exe" 0\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Command Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bconsole.conf"'\r
+\r
+SectionEnd\r
+\r
+Section "Graphical Console" SecWxConsole\r
+  SectionIn 1 2 3\r
+  \r
+  SetOutPath "$INSTDIR\bin"\r
+\r
+  Call InstallCommonFiles\r
+!if "${BUILD_TOOLS}" == "VC8"\r
+  File "${SRC_DIR}\wxbase270_vc_bacula.dll"\r
+  File "${SRC_DIR}\wxmsw270_core_vc_bacula.dll"\r
+!endif\r
+!If "${BUILD_TOOLS}" == "VC8_DEBUG"\r
+  File "${SRC_DIR}\wxbase270_vc_bacula.dll"\r
+  File "${SRC_DIR}\wxmsw270_core_vc_bacula.dll"\r
+!endif\r
+!if "${BUILD_TOOLS}" == "MinGW"\r
+  File "${SRC_DIR}\wxbase270_gcc_bacula.dll"\r
+  File "${SRC_DIR}\wxmsw270_core_gcc_bacula.dll"\r
+!endif\r
+\r
+  File "${SRC_DIR}\wx-console.exe"\r
+\r
+  ${If} $InstallType = ${MigrateInstall}\r
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\wx-console.conf"\r
+    CopyFiles "$OldInstallDir\bin\wx-console.conf" "$APPDATA\Bacula"\r
+  ${Else}\r
+    File "/oname=$PLUGINSDIR\wx-console.conf" "wx-console.conf.in"\r
+    StrCpy $0 "$APPDATA\Bacula"\r
+    StrCpy $1 wx-console.conf\r
+    Call ConfigEditAndCopy\r
+  ${EndIf}\r
+\r
+  ; Create Start Menu entry\r
+  CreateShortCut "$SMPROGRAMS\Bacula\wx-console.lnk" "$INSTDIR\bin\wx-console.exe" '-c "$APPDATA\Bacula\wx-console.conf"' "$INSTDIR\bin\wx-console.exe" 0\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\wx-console.conf"'\r
+SectionEnd\r
+\r
+SectionGroupEnd\r
+\r
+SectionGroup "Documentation" SecGroupDocumentation\r
+\r
+Section "Documentation (Acrobat Format)" SecDocPdf\r
+  SectionIn 1 2 3\r
+\r
+  SetOutPath "$INSTDIR\doc"\r
+  CreateDirectory "$INSTDIR\doc"\r
+\r
+  File "${SRC_DIR}\manual\bacula.pdf"\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual.lnk" '"$INSTDIR\doc\bacula.pdf"'\r
+SectionEnd\r
+\r
+Section "Documentation (HTML Format)" SecDocHtml\r
+  SectionIn 3\r
+\r
+  SetOutPath "$INSTDIR\doc"\r
+  CreateDirectory "$INSTDIR\doc"\r
+\r
+  File "${SRC_DIR}\manual\bacula\*.html"\r
+  File "${SRC_DIR}\manual\bacula\*.png"\r
+  File "${SRC_DIR}\manual\bacula\*.css"\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'\r
+SectionEnd\r
+\r
+SectionGroupEnd\r
+\r
+Section "-Finish"\r
+  Push $R0\r
+\r
+  ${If} $OsIsNT = 1\r
+    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$INSTDIR" /T /G SYSTEM:F Administrators:F'\r
+    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$APPDATA\Bacula" /T /G SYSTEM:F Administrators:F'\r
+  ${EndIf}\r
+\r
+  ; Write the uninstall keys for Windows & create Start Menu entry\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula"\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "InstallLocation" "$INSTDIR"\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayVersion" "${VERSION}"\r
+  ${StrTok} $R0 "${VERSION}" "." 0 0\r
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMajor" $R0\r
+  ${StrTok} $R0 "${VERSION}" "." 1 0\r
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMinor" $R0\r
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoModify" 1\r
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoRepair" 1\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://sourceforge.net/project/showfiles.php?group_id=50727"\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.bacula.org"\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.bacula.org/?page=support"\r
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"'\r
+  WriteUninstaller "$INSTDIR\Uninstall.exe"\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Uninstall Bacula.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0\r
+  Pop $R0\r
+SectionEnd\r
+\r
+; Extra Page descriptions\r
+\r
+LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."\r
+LangString DESC_SecStorageDaemon ${LANG_ENGLISH} "Install Bacula Storage Daemon on this system."\r
+LangString DESC_SecDirectorDaemon ${LANG_ENGLISH} "Install Bacula Director Daemon on this system."\r
+LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."\r
+LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."\r
+LangString DESC_SecDocPdf ${LANG_ENGLISH} "Install documentation in Acrobat format on this system."\r
+LangString DESC_SecDocHtml ${LANG_ENGLISH} "Install documentation in HTML format on this system."\r
+\r
+LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"\r
+LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."\r
+\r
+LangString TITLE_ConfigPage2 ${LANG_ENGLISH} "Configuration (continued)"\r
+LangString SUBTITLE_ConfigPage2 ${LANG_ENGLISH} "Set installation configuration."\r
+\r
+LangString TITLE_InstallType ${LANG_ENGLISH} "Installation Type"\r
+LangString SUBTITLE_InstallType ${LANG_ENGLISH} "Choose installation type."\r
+\r
+LangString TITLE_WriteTemplates ${LANG_ENGLISH} "Create Templates"\r
+LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create resource templates for inclusion in the Director's configuration file."\r
+\r
+!InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecStorageDaemon} $(DESC_SecStorageDaemon)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDirectorDaemon} $(DESC_SecDirectorDaemon)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecWxConsole} $(DESC_SecWxConsole)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocPdf} $(DESC_SecDocPdf)\r
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocHtml} $(DESC_SecDocHtml)\r
+!InsertMacro MUI_FUNCTION_DESCRIPTION_END\r
+\r
+; Uninstall section\r
+\r
+UninstallText "This will uninstall Bacula. Hit next to continue."\r
+\r
+Section "Uninstall"\r
+  ; Shutdown any baculum that could be running\r
+  nsExec::ExecToLog '"$INSTDIR\bin\bacula-fd.exe" /kill'\r
+  nsExec::ExecToLog '"$INSTDIR\bin\bacula-sd.exe" /kill'\r
+  nsExec::ExecToLog '"$INSTDIR\bin\bacula-dir.exe" /kill'\r
+  Sleep 3000\r
+\r
+  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-fd"\r
+  ${If} $R0 = 1\r
+    ; Remove bacula service\r
+    nsExec::ExecToLog '"$INSTDIR\bin\bacula-fd.exe" /remove'\r
+  ${EndIf}\r
+  \r
+  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-sd"\r
+  ${If} $R0 = 1\r
+    ; Remove bacula service\r
+    nsExec::ExecToLog '"$INSTDIR\bin\bacula-sd.exe" /remove'\r
+  ${EndIf}\r
+  \r
+  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-dir"\r
+  ${If} $R0 = 1\r
+    ; Remove bacula service\r
+    nsExec::ExecToLog '"$INSTDIR\bin\bacula-dir.exe" /remove'\r
+  ${EndIf}\r
+  \r
+  ; remove registry keys\r
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula"\r
+  DeleteRegKey HKLM "Software\Bacula"\r
+\r
+  ; remove start menu items\r
+  SetShellVarContext all\r
+  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"\r
+  RMDir "$SMPROGRAMS\Bacula"\r
+\r
+  ; remove files and uninstaller (preserving config for now)\r
+  Delete /REBOOTOK "$INSTDIR\bin\*"\r
+  Delete /REBOOTOK "$INSTDIR\doc\*"\r
+  Delete /REBOOTOK "$INSTDIR\*"\r
+\r
+  ; Check for existing installation\r
+  MessageBox MB_YESNO|MB_ICONQUESTION \\r
+  "Would you like to delete the current configuration files and the working state file?" IDNO +7\r
+    Delete /REBOOTOK "$APPDATA\Bacula\*"\r
+    Delete /REBOOTOK "$APPDATA\Bacula\Work\*"\r
+    Delete /REBOOTOK "$APPDATA\Bacula\Spool\*"\r
+    RMDir "$APPDATA\Bacula\Work"\r
+    RMDir "$APPDATA\Bacula\Spool"\r
+    RMDir "$APPDATA\Bacula"\r
+\r
+  ; remove directories used\r
+  RMDir "$INSTDIR\bin"\r
+  RMDir "$INSTDIR\doc"\r
+  RMDir "$INSTDIR"\r
+SectionEnd\r
+\r
+;\r
+; $0 - Service Name (ie Bacula-FD)\r
+; $1 - Service Description (ie Bacula File Daemon)\r
+; $2 - Install as Service\r
+; $3 - Start Service now\r
+;\r
+Function InstallDaemon\r
+  Call InstallCommonFiles\r
+\r
+  WriteRegDWORD HKLM "Software\Bacula" "Service_$0" $2\r
+  \r
+  ${If} $2 = 1\r
+    nsExec::ExecToLog '"$INSTDIR\bin\$0.exe" /install -c "$APPDATA\Bacula\$0.conf"'\r
+\r
+    ${If} $OsIsNT <> 1\r
+      File "Start.bat"\r
+      File "Stop.bat"\r
+    ${EndIf}\r
+\r
+    ; Start the service?\r
+\r
+    ${If} $3 = 1  \r
+      ${If} $OsIsNT = 1\r
+        nsExec::ExecToLog 'net start $0'\r
+      ${Else}\r
+        Exec '"$INSTDIR\bin\$0.exe" -c "$APPDATA\Bacula\$0.conf"'\r
+      ${EndIf}\r
+    ${EndIf}\r
+  ${Else}\r
+    CreateShortCut "$SMPROGRAMS\Bacula\Start $1.lnk" "$INSTDIR\bin\$0.exe" '-c "$APPDATA\Bacula\$0.conf"' "$INSTDIR\bin\$0.exe" 0\r
+  ${EndIf}\r
+FunctionEnd\r
+\r
+Function GetComputerName\r
+  Push $R0\r
+  Push $R1\r
+  Push $R2\r
+\r
+  System::Call "kernel32::GetComputerNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2"\r
+\r
+  ${StrCase} $R0 $R0 "L"\r
+\r
+  Pop $R2\r
+  Pop $R1\r
+  Exch $R0\r
+FunctionEnd\r
+\r
+!define ComputerNameDnsFullyQualified   3\r
+\r
+Function GetHostName\r
+  Push $R0\r
+  Push $R1\r
+  Push $R2\r
+\r
+  ${If} $OsIsNT = 1\r
+    System::Call "kernel32::GetComputerNameExA(i ${ComputerNameDnsFullyQualified}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"\r
+    ${If} $R2 = 0\r
+      Pop $R2\r
+      DetailPrint "GetComputerNameExA failed - LastError = $R2"\r
+      Call GetComputerName\r
+      Pop $R0\r
+    ${Else}\r
+      Pop $R2\r
+    ${EndIf}\r
+  ${Else}\r
+    Call GetComputerName\r
+    Pop $R0\r
+  ${EndIf}\r
+\r
+  Pop $R2\r
+  Pop $R1\r
+  Exch $R0\r
+FunctionEnd\r
+\r
+!define NameUserPrincipal 8\r
+\r
+Function GetUserName\r
+  Push $R0\r
+  Push $R1\r
+  Push $R2\r
+\r
+  ${If} $OsIsNT = 1\r
+    System::Call "secur32::GetUserNameExA(i ${NameUserPrincipal}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"\r
+    ${If} $R2 = 0\r
+      Pop $R2\r
+      DetailPrint "GetUserNameExA failed - LastError = $R2"\r
+      Pop $R0\r
+      StrCpy $R0 ""\r
+    ${Else}\r
+      Pop $R2\r
+    ${EndIf}\r
+  ${Else}\r
+      StrCpy $R0 ""\r
+  ${EndIf}\r
+\r
+  ${If} $R0 == ""\r
+    System::Call "advapi32::GetUserNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"\r
+    ${If} $R2 = 0\r
+      Pop $R2\r
+      DetailPrint "GetUserNameA failed - LastError = $R2"\r
+      StrCpy $R0 ""\r
+    ${Else}\r
+      Pop $R2\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  Pop $R2\r
+  Pop $R1\r
+  Exch $R0\r
+FunctionEnd\r
+\r
+Function ConfigEditAndCopy\r
+  Push $R1\r
+\r
+  ${If} ${FileExists} "$0\$1"\r
+    StrCpy $R1 ".new"\r
+  ${Else}\r
+    StrCpy $R1 ""\r
+  ${EndIf}\r
+\r
+  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\$1"'\r
+  CopyFiles "$PLUGINSDIR\$1" "$0\$1$R1"\r
+\r
+  Pop $R1\r
+FunctionEnd\r
+\r
+Function FindDatabaseApps\r
+  Push $R1\r
+\r
+  ReadRegStr $0 HKLM "Software\MySQL AB\MySQL Server 5.0" "Location"\r
+\r
+  ${If} $0 != ""\r
+    Call RemoveTrailingSlash\r
+    StrCpy $MySQLPath $0\r
+    ReadRegStr $0 HKLM "Software\MySQL AB\MySQL Server 5.0" "Version"\r
+    StrCpy $MySQLVersion $0\r
+  ${EndIf}\r
+\r
+  EnumRegKey $R1 HKLM "Software\PostgreSQL\Installations" 0\r
+  ${If} $R1 != ""\r
+    ReadRegStr $0 HKLM "Software\PostgreSQL\Installations\$R1" "Base Directory"\r
+    Call RemoveTrailingSlash\r
+    StrCpy $PostgreSQLPath $0\r
+    ReadRegStr $0 HKLM "Software\PostgreSQL\Installations\$R1" "Version"\r
+    StrCpy $PostgreSQLVersion $0\r
+  ${EndIf}\r
+\r
+  Pop $R1\r
+FunctionEnd\r
+\r
+Function RemoveTrailingSlash\r
+  Push $R1\r
+  StrCpy $R1 $0 "" -1\r
+  ${If} $R1 == "\"\r
+    StrCpy $0 $0 -1\r
+  ${EndIf}\r
+  Pop $R1\r
+FunctionEnd\r
+\r
+Function IsDirectorSelected\r
+  Push $R0\r
+  SectionGetFlags ${SecDirectorDaemon} $R0\r
+  IntOp $R0 $R0 & ${SF_SELECTED}\r
+  Exch $R0\r
+FunctionEnd\r
+\r
+Function GetSelectedComponents\r
+  Push $R0\r
+  StrCpy $R0 0\r
+  ${If} ${SectionIsSelected} ${SecFileDaemon}\r
+    IntOp $R0 $R0 | ${ComponentFile}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecStorageDaemon}\r
+    IntOp $R0 $R0 | ${ComponentStorage}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecDirectorDaemon}\r
+    IntOp $R0 $R0 | ${ComponentDirector}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecConsole}\r
+    IntOp $R0 $R0 | ${ComponentTextConsole}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecWxConsole}\r
+    IntOp $R0 $R0 | ${ComponentGUIConsole}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecDocPdf}\r
+    IntOp $R0 $R0 | ${ComponentPDFDocs}\r
+  ${EndIf}\r
+  ${If} ${SectionIsSelected} ${SecDocHtml}\r
+    IntOp $R0 $R0 | ${ComponentHTMLDocs}\r
+  ${EndIf}\r
+  Exch $R0\r
+FunctionEnd\r
+\r
+Function PageComponentsShow\r
+  ${If} $OsIsNT <> 1\r
+    Call DisableServerSections\r
+  ${EndIf}\r
+\r
+  Call SelectPreviousComponents\r
+  Call UpdateComponentUI\r
+FunctionEnd\r
+\r
+Function PageDirectoryPre\r
+  ${If} $AutomaticInstall = 1\r
+  ${OrIf} $InstallType = ${UpgradeInstall}\r
+    Abort\r
+  ${EndIf}\r
+FunctionEnd\r
+\r
+Function LeaveInstallPage\r
+  Push "$INSTDIR\install.log"\r
+  Call DumpLog\r
+FunctionEnd\r
+\r
+Function EnterWriteTemplates\r
+  Push $R0\r
+  Push $R1\r
+\r
+  Call GetSelectedComponents\r
+  Pop $R0\r
+\r
+  IntOp $R0 $R0 & ${ComponentDirector}\r
+  IntOp $R1 $NewComponents & ${ComponentsFileAndStorage}\r
+\r
+  ${If} $R0 <> 0\r
+  ${OrIf} $R1 = 0\r
+    Pop $R1\r
+    Pop $R0\r
+    Abort\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentFile}\r
+  ${If} $R0 = 0\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 0\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags DISABLED\r
+    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST|DISABLED\r
+  ${Else}\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 1\r
+    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State "C:\$ConfigClientName.conf"\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST\r
+  ${EndIf}\r
+\r
+  IntOp $R0 $NewComponents & ${ComponentStorage}\r
+  ${If} $R0 = 0\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" State 0\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" Flags DISABLED\r
+    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" State\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST|DISABLED\r
+  ${Else}\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" State 1\r
+    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 4" Flags\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" State "C:\$ConfigStorageName.conf"\r
+    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST\r
+  ${EndIf}\r
+\r
+  !InsertMacro MUI_HEADER_TEXT "$(TITLE_WriteTemplates)" "$(SUBTITLE_WriteTemplates)"\r
+  !InsertMacro MUI_INSTALLOPTIONS_DISPLAY "WriteTemplates.ini"\r
+\r
+  !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 2" State\r
+  ${If} $R0 <> 0\r
+    File "/oname=$PLUGINSDIR\client.conf.in" "client.conf.in"\r
+\r
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\client.conf.in"'\r
+    !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 3" State\r
+    ${If} $R0 != ""\r
+      CopyFiles "$PLUGINSDIR\client.conf.in" "$R0"\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 4" State\r
+  ${If} $R0 <> 0\r
+    File "/oname=$PLUGINSDIR\storage.conf.in" "storage.conf.in"\r
+\r
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\storage.conf.in"'\r
+    !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 5" State\r
+    ${If} $R0 != ""\r
+      CopyFiles "$PLUGINSDIR\storage.conf.in" "$R0"\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  Pop $R1\r
+  Pop $R0\r
+FunctionEnd\r
+\r
+Function SelectPreviousComponents\r
+  ${If} $InstallType <> ${NewInstall}\r
+    IntOp $R1 $PreviousComponents & ${ComponentFile}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecFileDaemon}\r
+      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecFileDaemon}\r
+      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentStorage}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecStorageDaemon}\r
+      !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecStorageDaemon}\r
+      !InsertMacro ClearSectionFlag ${SecStorageDaemon} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentDirector}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecDirectorDaemon}\r
+      !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecDirectorDaemon}\r
+      !InsertMacro ClearSectionFlag ${SecDirectorDaemon} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentTextConsole}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecConsole}\r
+      !InsertMacro SetSectionFlag ${SecConsole} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecConsole}\r
+      !InsertMacro ClearSectionFlag ${SecConsole} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentGUIConsole}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecWxConsole}\r
+      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecWxConsole}\r
+      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentPDFDocs}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecDocPdf}\r
+      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecDocPdf}\r
+      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_RO}\r
+    ${EndIf}\r
+    IntOp $R1 $PreviousComponents & ${ComponentHTMLDocs}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SelectSection ${SecDocHtml}\r
+      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_RO}\r
+    ${Else}\r
+      !InsertMacro UnselectSection ${SecDocHtml}\r
+      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_RO}\r
+    ${EndIf}\r
+  ${EndIf}\r
+FunctionEnd\r
+\r
+Function DisableServerSections\r
+  !InsertMacro UnselectSection ${SecGroupServer}\r
+  !InsertMacro SetSectionFlag  ${SecGroupServer} ${SF_RO}\r
+  !InsertMacro UnselectSection ${SecStorageDaemon}\r
+  !InsertMacro SetSectionFlag  ${SecStorageDaemon} ${SF_RO}\r
+  !InsertMacro UnselectSection ${SecDirectorDaemon}\r
+  !InsertMacro SetSectionFlag  ${SecDirectorDaemon} ${SF_RO}\r
+FunctionEnd\r
+\r
+Function UpdateComponentUI\r
+  Push $R0\r
+  Push $R1\r
+\r
+  Call GetSelectedComponents\r
+  Pop $R0\r
+\r
+  IntOp $R1 $R0 ^ $PreviousComponents\r
+  IntOp $NewComponents $R0 & $R1\r
+\r
+  ${If} $InstallType <> ${NewInstall}\r
+    IntOp $R1 $NewComponents & ${ComponentFile}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentStorage}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecStorageDaemon} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentDirector}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecDirectorDaemon} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentTextConsole}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecConsole} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentGUIConsole}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentPDFDocs}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_BOLD}\r
+    ${EndIf}\r
+    IntOp $R1 $NewComponents & ${ComponentHTMLDocs}\r
+    ${If} $R1 <> 0\r
+      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_BOLD}\r
+    ${Else}\r
+      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_BOLD}\r
+    ${EndIf}\r
+  ${EndIf}\r
+\r
+  GetDlgItem $R0 $HWNDPARENT 1\r
+\r
+  IntOp $R1 $NewComponents & ${ComponentsRequiringUserConfig}\r
+  ${If} $R1 = 0\r
+    SendMessage $R0 ${WM_SETTEXT} 0 "STR:Install"\r
+  ${Else}\r
+    SendMessage $R0 ${WM_SETTEXT} 0 "STR:&Next >"\r
+  ${EndIf}\r
+\r
+  Pop $R1\r
+  Pop $R0\r
+FunctionEnd\r
+\r
+!include "InstallType.nsh"\r
+!include "ConfigPage1.nsh"\r
+!include "ConfigPage2.nsh"\r
+!include "DumpLog.nsh"\r
index 3013fa2c7e41797311a5234b58df9efdbffa39d2..4f60389ea471f092f5a6d5734f0e40a2ad0be448 100644 (file)
@@ -1,10 +1,10 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @director_name@
-  DIRport = @director_port@
-  address = @director_address@
-  Password = "@director_password@"
-}
+#\r
+# Bacula User Agent (or Console) Configuration File\r
+#\r
+\r
+Director {\r
+  Name = @director_name@\r
+  DIRport = @director_port@\r
+  address = @director_address@\r
+  Password = "@director_password@"\r
+}\r
index ea9deea165c6be6d49e577b7a105c9b15f0539a2..3a1208e2c1246e2aad3317f3a0832df1e27534e2 100644 (file)
-LIBRARY bacula.dll
-EXPORTS
-
-; address_conf.obj 
-?get_port_net_order@IPADDR@@QBEGXZ
-?get_address@IPADDR@@QAEPBDPADH@Z
-?get_first_address@@YAPBDPAVdlist@@PADH@Z
-?get_first_port_host_order@@YAHPAVdlist@@@Z
-?init_default_addresses@@YAXPAPAVdlist@@H@Z
-?store_addresses@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z
-?store_addresses_address@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z
-?store_addresses_port@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z
-?free_addresses@@YAXPAVdlist@@@Z
-?sockaddr_get_port_net_order@@YAHPBUsockaddr@@@Z
-?sockaddr_to_ascii@@YAPADPBUsockaddr@@PADH@Z
-; alist.obj 
-?first@alist@@QAEPAXXZ
-?next@alist@@QAEPAXXZ
-?prepend@alist@@QAEXPAX@Z
-?append@alist@@QAEXPAX@Z
-?remove@alist@@QAEPAXH@Z
-?get@alist@@QAEPAXH@Z
-?destroy@alist@@QAEXXZ
-; attr.obj 
-?new_attr@@YAPAUATTR@@XZ
-?free_attr@@YAXPAUATTR@@@Z
-?unpack_attributes_record@@YAHPAVJCR@@JPADPAUATTR@@@Z
-?build_attr_output_fnames@@YAXPAVJCR@@PAUATTR@@@Z
-?print_ls_output@@YAXPAVJCR@@PAUATTR@@@Z
-; attribs.obj 
-?select_data_stream@@YAHPAUFF_PKT@@@Z
-?encode_stat@@YAXPADPAUFF_PKT@@H@Z
-?decode_stat@@YAHPADPAUstat@@PAJ@Z
-?decode_LinkFI@@YAJPADPAUstat@@@Z
-?set_attributes@@YA_NPAVJCR@@PAUATTR@@PAUBFILE@@@Z
-?encode_attribsEx@@YAHPAVJCR@@PADPAUFF_PKT@@@Z
-; base64.obj 
-?bin_to_base64@@YAHPADH0HH@Z
-; berrno.obj 
-?strerror@berrno@@QAEPBDXZ
-?format_win32_message@berrno@@AAEXXZ
-; bfile.obj 
-?is_win32_stream@@YA_NH@Z
-?stream_to_ascii@@YAPBDH@Z
-?processWin32BackupAPIBlock@@YA_NPAUBFILE@@PAXH@Z
-?binit@@YAXPAUBFILE@@@Z
-?set_portable_backup@@YA_NPAUBFILE@@@Z
-?set_prog@@YA_NPAUBFILE@@PADPAVJCR@@@Z
-?is_portable_backup@@YA_NPAUBFILE@@@Z
-?have_win32_api@@YA_NXZ
-?is_restore_stream_supported@@YA_NH@Z
-?bopen@@YAHPAUBFILE@@PBDHI@Z
-?bclose@@YAHPAUBFILE@@@Z
-?bread@@YAHPAUBFILE@@PAXI@Z
-?bwrite@@YAHPAUBFILE@@PAXI@Z
-?is_bopen@@YA_NPAUBFILE@@@Z
-?blseek@@YA_JPAUBFILE@@_JH@Z
-; bget_msg.obj 
-?bget_msg@@YAHPAUBSOCK@@@Z
-; bnet.obj 
-?bnet_recv@@YAJPAUBSOCK@@@Z
-?is_bnet_stop@@YA_NPAUBSOCK@@@Z
-?is_bnet_error@@YAHPAUBSOCK@@@Z
-?bnet_suppress_error_messages@@YAXPAUBSOCK@@_N@Z
-?bnet_despool_to_bsock@@YAHPAUBSOCK@@P6AXH@ZH@Z
-?bnet_send@@YA_NPAUBSOCK@@@Z
-?bnet_tls_server@@YA_NPAUTLS_Context@@PAUBSOCK@@PAValist@@@Z
-?bnet_tls_client@@YA_NPAUTLS_Context@@PAUBSOCK@@@Z
-?bnet_wait_data@@YAHPAUBSOCK@@H@Z
-?bnet_wait_data_intr@@YAHPAUBSOCK@@H@Z
-?bnet_connect@@YAPAUBSOCK@@PAVJCR@@HHPBDPAD2HH@Z
-?bnet_strerror@@YAPBDPAUBSOCK@@@Z
-?bnet_fsend@@YA_NPAUBSOCK@@PBDZZ
-?bnet_get_peer@@YAHPAUBSOCK@@PADH@Z
-?bnet_set_buffer_size@@YA_NPAUBSOCK@@IH@Z
-?bnet_sig@@YA_NPAUBSOCK@@H@Z
-?bnet_sig_to_ascii@@YAPBDPAUBSOCK@@@Z
-?init_bsock@@YAPAUBSOCK@@PAVJCR@@HPBD1HPAUsockaddr@@@Z
-?dup_bsock@@YAPAUBSOCK@@PAU1@@Z
-?bnet_close@@YAXPAUBSOCK@@@Z
-?term_bsock@@YAXPAUBSOCK@@@Z
-; bnet_server.obj 
-?bnet_stop_thread_server@@YAXPAUpthread_t_@@@Z
-?bnet_thread_server@@YAXPAVdlist@@HPAUworkq_tag@@P6APAXPAX@Z@Z
-; bpipe.obj 
-?run_program@@YAHPADH0@Z
-?run_program_full_output@@YAHPADH0@Z
-; bregex.obj 
-b_regcomp
-b_regexec
-b_regerror
-b_regfree
-
-; bsnprintf.obj 
-?bsnprintf@@YAHPADJPBDZZ
-?bvsnprintf@@YAHPADJPBD0@Z
-; bsys.obj 
-?bmicrosleep@@YAHJJ@Z
-?bstrncpy@@YAPADPADPBDH@Z
-?bstrncpy@@YAPADPADAAVPOOL_MEM@@H@Z
-?bstrncat@@YAPADPADPBDH@Z
-?bstrcmp@@YA_NPBD0@Z
-?cstrlen@@YAHPBD@Z
-?bfree@@YAXPAX@Z
-?b_malloc@@YAPAXPBDHI@Z
-?brealloc@@YAPAXPAXI@Z
-?_p@@YAXPAPAUpthread_mutex_t_@@@Z
-?_v@@YAXPAPAUpthread_mutex_t_@@@Z
-?create_pid_file@@YAXPADPBDH@Z
-?delete_pid_file@@YAHPADPBDH@Z
-?read_state_file@@YAXPADPBDH@Z
-?write_state_file@@YAXPADPBDH@Z
-?drop@@YAXPAD0@Z
-?bfgets@@YAPADPADHPAU_iobuf@@@Z
-?escape_filename@@YAPADPBD@Z
-; btime.obj 
-?bstrftime@@YAPADPADH_J@Z
-?bstrftimes@@YAPADPADH_J@Z
-?bstrftime_nc@@YAPADPADH_J@Z
-?bstrutime@@YAPADPADH_J@Z
-?str_to_utime@@YA_JPAD@Z
-?get_current_btime@@YA_JXZ
-?btime_to_unix@@YAJ_J@Z
-?btime_to_utime@@YA_J_J@Z
-?tm_woy@@YAHJ@Z
-?get_current_time@@YAXPAUdate_time@@@Z
-?tm_decode@@YAXPAUdate_time@@PAUtm@@@Z
-; btimers.obj 
-?start_thread_timer@@YAPAUs_btimer_t@@PAUpthread_t_@@I@Z
-?start_bsock_timer@@YAPAUs_btimer_t@@PAUBSOCK@@I@Z
-?stop_bsock_timer@@YAXPAUs_btimer_t@@@Z
-?stop_thread_timer@@YAXPAUs_btimer_t@@@Z
-; compat.obj 
-?SetVSSPathConvert@@YAXP6AHPBDPADH@ZP6AHPB_WPA_WH@Z@Z
-?wchar_2_UTF8@@YAHPADPB_WH@Z
-?random@@YAJXZ
-?srandom@@YAXI@Z
-?fstat@@YAHHPAUstat@@@Z
-?stat@@YAHPBDPAU0@@Z
-?fcntl@@YAHHHJ@Z
-?lstat@@YAHPBDPAUstat@@@Z
-?sleep@@YAXH@Z
-?strcasecmp@@YAHPBD0@Z
-?gettimeofday@@YAHPAUtimeval@@PAUtimezone@@@Z
-?opendir@@YAPAXPBD@Z
-?closedir@@YAHPAX@Z
-?readdir_r@@YAHPAXPAUdirent@@PAPAU1@@Z
-?init_signals@@YAXP6AXH@Z@Z
-?init_stack_dump@@YAXXZ
-?pathconf@@YAJPBDH@Z
-?WSA_Init@@YAHXZ
-?win32_fputs@@YAHPBDPAU_iobuf@@@Z
-?win32_cgets@@YAPADPADH@Z
-?win32_unlink@@YAHPBD@Z
-?open_bpipe@@YAPAVBPIPE@@PADHPBD@Z
-?kill@@YAHHH@Z
-?close_bpipe@@YAHPAVBPIPE@@@Z
-?utime@@YAHPBDPAUutimbuf@@@Z
-; cram-md5.obj 
-?cram_md5_challenge@@YA_NPAUBSOCK@@PADHH@Z
-?cram_md5_respond@@YA_NPAUBSOCK@@PADPAH2@Z
-; crc32.obj 
-?bcrc32@@YAIPAEH@Z
-;create_file.obj 
-?create_file@@YAHPAVJCR@@PAUATTR@@PAUBFILE@@H@Z
-; crypto.obj 
-?crypto_digest_new@@YAPAUDigest@@W4crypto_digest_t@@@Z
-?crypto_digest_update@@YA_NPAUDigest@@PBEI@Z
-?crypto_digest_finalize@@YA_NPAUDigest@@PAEPAI@Z
-?crypto_digest_free@@YAXPAUDigest@@@Z
-?init_crypto@@YAHXZ
-?cleanup_crypto@@YAHXZ
-?crypto_sign_new@@YAPAUSignature@@XZ
-?crypto_sign_get_digest@@YA?AW4crypto_error_t@@PAUSignature@@PAUX509_Keypair@@PAPAUDigest@@@Z
-?crypto_sign_verify@@YA?AW4crypto_error_t@@PAUSignature@@PAUX509_Keypair@@PAUDigest@@@Z
-?crypto_sign_add_signer@@YAHPAUSignature@@PAUDigest@@PAUX509_Keypair@@@Z
-?crypto_sign_encode@@YAHPAUSignature@@PAEPAI@Z
-?crypto_sign_decode@@YAPAUSignature@@PBEI@Z
-?crypto_sign_free@@YAXPAUSignature@@@Z
-?crypto_keypair_new@@YAPAUX509_Keypair@@XZ
-?crypto_keypair_dup@@YAPAUX509_Keypair@@PAU1@@Z
-?crypto_keypair_load_cert@@YAHPAUX509_Keypair@@PBD@Z
-?crypto_keypair_has_key@@YA_NPBD@Z
-?crypto_keypair_load_key@@YAHPAUX509_Keypair@@PBDP6AHPADHPBX@Z3@Z
-?crypto_keypair_free@@YAXPAUX509_Keypair@@@Z
-?crypto_session_new@@YAPAUCrypto_Session@@W4crypto_cipher_t@@PAValist@@@Z
-?crypto_session_free@@YAXPAUCrypto_Session@@@Z
-?crypto_session_encode@@YA_NPAUCrypto_Session@@PAEPAI@Z
-?crypto_session_decode@@YA?AW4crypto_error_t@@PBEIPAValist@@PAPAUCrypto_Session@@@Z
-?crypto_cipher_new@@YAPAUCipher_Context@@PAUCrypto_Session@@_NPAI@Z
-?crypto_cipher_update@@YA_NPAUCipher_Context@@PBEI1PAI@Z
-?crypto_cipher_finalize@@YA_NPAUCipher_Context@@PAEPAI@Z
-?crypto_cipher_free@@YAXPAUCipher_Context@@@Z
-?crypto_default_pem_callback@@YAHPADHPBX@Z
-?crypto_digest_name@@YAPBDPAUDigest@@@Z
-?crypto_digest_stream_type@@YA?AW4crypto_digest_t@@H@Z
-?crypto_strerror@@YAPBDW4crypto_error_t@@@Z
-; daemon.obj 
-?daemon_start@@YAXXZ
-; dlist.obj 
-?append@dlist@@QAEXPAX@Z
-?prepend@dlist@@QAEXPAX@Z
-?insert_before@dlist@@QAEXPAX0@Z
-?binary_insert@dlist@@QAEPAXPAXP6AH00@Z@Z
-?first@dlist@@QBEPAXXZ
-?last@dlist@@QBEPAXXZ
-?binary_insert_multiple@dlist@@QAEXPAXP6AH00@Z@Z
-?binary_search@dlist@@QAEPAXPAXP6AH00@Z@Z
-?remove@dlist@@QAEXPAX@Z
-?next@dlist@@QBEPAXPBX@Z
-?destroy@dlist@@QAEXXZ
-; drivetype.obj 
-?drivetype@@YA_NPBDPADH@Z
-; edit.obj 
-?str_to_uint64@@YA_KPAD@Z
-?str_to_int64@@YA_JPAD@Z
-?edit_uint64_with_commas@@YAPAD_KPAD@Z
-?edit_uint64_with_suffix@@YAPAD_KPAD@Z
-?edit_uint64@@YAPAD_KPAD@Z
-?edit_int64@@YAPAD_JPAD@Z
-?duration_to_utime@@YA_NPADPA_J@Z
-?edit_utime@@YAPAD_JPADH@Z
-?size_to_uint64@@YA_NPADHPA_K@Z
-?is_a_number@@YA_NPBD@Z
-?is_an_integer@@YA_NPBD@Z
-?is_name_valid@@YA_NPADPAPAD@Z
-?add_commas@@YAPADPAD0@Z
-; enable_priv.obj 
-?enable_backup_privileges@@YAHPAVJCR@@H@Z
-; enh_fnmatch.obj 
-; find.obj 
-?init_find_files@@YAPAUFF_PKT@@XZ
-?set_find_options@@YAXPAUFF_PKT@@HJ@Z
-?get_win32_driveletters@@YAHPAUFF_PKT@@PAD@Z
-?find_files@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2@Z
-?term_find_files@@YAHPAUFF_PKT@@@Z
-; find_one.obj 
-?find_one_file@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2PADI3@Z
-; fnmatch.obj 
-fnmatch
-; fstype.obj 
-?fstype@@YA_NPBDPADH@Z
-; hmac.obj 
-?hmac_md5@@YAXPAEH0H0@Z
-; htable.obj 
-; idcache.obj 
-?getuser@@YAPADIPADH@Z
-?getgroup@@YAPADIPADH@Z
-; jcr.obj 
-?lock_jobs@@YAXXZ
-?unlock_jobs@@YAXXZ
-?term_last_jobs_list@@YAXXZ
-?lock_last_jobs_list@@YAXXZ
-?unlock_last_jobs_list@@YAXXZ
-?job_end_push@@YAXPAVJCR@@P6AX0PAX@Z1@Z
-?new_jcr@@YAPAVJCR@@HP6AXPAV1@@Z@Z
-?inc_use_count@JCR@@QAEXXZ
-?lock@JCR@@QAEXXZ
-?unlock@JCR@@QAEXXZ
-?init_mutex@JCR@@QAEXXZ
-?b_free_jcr@@YAXPBDHPAVJCR@@@Z
-?dec_use_count@JCR@@QAEXXZ
-?use_count@JCR@@QAEHXZ
-?destroy_mutex@JCR@@QAEXXZ
-?get_jcr_by_id@@YAPAVJCR@@I@Z
-?get_jcr_by_session@@YAPAVJCR@@II@Z
-?get_jcr_by_partial_name@@YAPAVJCR@@PAD@Z
-?get_jcr_by_full_name@@YAPAVJCR@@PAD@Z
-?set_jcr_job_status@@YAXPAVJCR@@H@Z
-?jcr_walk_start@@YAPAVJCR@@XZ
-?jcr_walk_next@@YAPAVJCR@@PAV1@@Z
-?jcr_walk_end@@YAXPAVJCR@@@Z
-?init_jcr_subsystem@@YA_NXZ
-; lex.obj 
-?scan_to_eol@@YAXPAUs_lex_context@@@Z
-?lex_set_default_error_handler@@YAXPAUs_lex_context@@@Z
-?lex_set_error_handler_error_type@@YAHPAUs_lex_context@@H@Z
-?lex_close_file@@YAPAUs_lex_context@@PAU1@@Z
-?lex_open_file@@YAPAUs_lex_context@@PAU1@PBDP6AX1H01ZZ@Z
-?lex_tok_to_str@@YAPBDH@Z
-?lex_get_token@@YAHPAUs_lex_context@@H@Z
-; makepath.obj 
-; match.obj 
-?match_files@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2@Z
-?term_include_exclude_files@@YAXPAUFF_PKT@@@Z
-?add_fname_to_include_list@@YAXPAUFF_PKT@@HPBD@Z
-?add_fname_to_exclude_list@@YAXPAUFF_PKT@@PBD@Z
-?file_is_included@@YAHPAUFF_PKT@@PBD@Z
-?file_is_excluded@@YAHPAUFF_PKT@@PBD@Z
-; md5.obj 
-?MD5Init@@YAXPAUMD5Context@@@Z
-?MD5Update@@YAXPAUMD5Context@@PAEI@Z
-?MD5Final@@YAXQAEPAUMD5Context@@@Z
-; mem_pool.obj 
-?sm_get_pool_memory@@YAPADPBDHH@Z
-?sm_get_memory@@YAPADPBDHJ@Z
-?sm_sizeof_pool_memory@@YAJPBDHPAD@Z
-?sm_realloc_pool_memory@@YAPADPBDHPADJ@Z
-?sm_check_pool_memory_size@@YAPADPBDHPADJ@Z
-?sm_free_pool_memory@@YAXPBDHPAD@Z
-?close_memory_pool@@YAXXZ
-?print_memory_pool_stats@@YAXXZ
-?pm_strcat@@YAHPAPADPBD@Z
-?pm_strcat@@YAHAAPADPBD@Z
-?c_str@POOL_MEM@@QBEPADXZ
-?pm_strcat@@YAHAAVPOOL_MEM@@PBD@Z
-?check_size@POOL_MEM@@QAEPADJ@Z
-?pm_strcpy@@YAHPAPADPBD@Z
-?pm_strcpy@@YAHAAPADPBD@Z
-?pm_strcpy@@YAHAAPADAAVPOOL_MEM@@@Z
-?pm_strcpy@@YAHAAVPOOL_MEM@@PBD@Z
-?max_size@POOL_MEM@@QAEJXZ
-; message.obj 
-?my_name_is@@YAXHQAPADPBD@Z
-?get_db_type@@YAPBDXZ
-?set_db_type@@YAXPBD@Z
-?init_msg@@YAXPAVJCR@@PAVMSGS@@@Z
-?init_console_msg@@YAXPBD@Z
-?add_msg_dest@@YAXPAVMSGS@@HHPAD1@Z
-?rem_msg_dest@@YAXPAVMSGS@@HHPAD@Z
-?close_msg@@YAXPAVJCR@@@Z
-?set_errno@berrno@@QAEXH@Z
-?free_msgs_res@@YAXPAVMSGS@@@Z
-?term_msg@@YAXXZ
-?dispatch_message@@YAXPAVJCR@@HJPAD@Z
-?c_str@POOL_MEM@@QBEPADXZ
-?d_msg@@YAXPBDHH0ZZ
-?get_basename@@YAPBDPBD@Z
-?set_trace@@YAXH@Z
-?get_trace@@YA_NXZ
-?p_msg@@YAXPBDHH0ZZ
-?e_msg@@YAXPBDHHH0ZZ
-?Jmsg@@YAXPAVJCR@@HJPBDZZ
-?j_msg@@YAXPBDHPAVJCR@@HJ0ZZ
-?m_msg@@YAHPBDHPAPAD0ZZ
-?m_msg@@YAHPBDHAAPAD0ZZ
-?Mmsg@@YAHPAPADPBDZZ
-?Mmsg@@YAHAAPADPBDZZ
-?Mmsg@@YAHAAVPOOL_MEM@@PBDZZ
-?Qmsg@@YAXPAVJCR@@HJPBDZZ
-?dequeue_messages@@YAXPAVJCR@@@Z
-?q_msg@@YAXPBDHPAVJCR@@HJ0ZZ
-; print.obj 
-; pythonlib.obj 
-?generate_daemon_event@@YAHPAVJCR@@PBD@Z
-?init_python_interpreter@@YAXPBD00@Z
-?term_python_interpreter@@YAXXZ
-; queue.obj 
-?qinsert@@YAXPAUb_queue@@0@Z
-?qnext@@YAPAUb_queue@@PAU1@0@Z
-?qdchain@@YAPAUb_queue@@PAU1@@Z
-; runscript.obj 
-?new_runscript@@YAPAVRUNSCRIPT@@XZ
-?reset_default@RUNSCRIPT@@QAEX_N@Z
-?copy_runscript@@YAPAVRUNSCRIPT@@PAV1@@Z
-?free_runscript@@YAXPAVRUNSCRIPT@@@Z
-?run_scripts@@YAHPAVJCR@@PAValist@@PBD@Z
-?set_command@RUNSCRIPT@@QAEXPBD@Z
-?set_target@RUNSCRIPT@@QAEXPBD@Z
-?run@RUNSCRIPT@@QAEHPAVJCR@@PBD@Z
-?free_runscripts@@YAXPAValist@@@Z
-?debug@RUNSCRIPT@@QAEXXZ
-; rwlock.obj 
-?rwl_init@@YAHPAUs_rwlock_tag@@@Z
-?rwl_destroy@@YAHPAUs_rwlock_tag@@@Z
-?rwl_writelock@@YAHPAUs_rwlock_tag@@@Z
-?rwl_writeunlock@@YAHPAUs_rwlock_tag@@@Z
-; save-cwd.obj 
-; scan.obj 
-?strip_leading_space@@YAXPAD@Z
-?strip_trailing_junk@@YAXPAD@Z
-?strip_trailing_newline@@YAXPAD@Z
-?skip_spaces@@YA_NPAPAD@Z
-?skip_nonspaces@@YA_NPAPAD@Z
-?fstrsch@@YAHPBD0@Z
-?next_arg@@YAPADPAPAD@Z
-?parse_args@@YAHPADPAPADPAH11H@Z
-?parse_args_only@@YAHPADPAPADPAH11H@Z
-?bsscanf@@YAHPBD0ZZ
-; serial.obj 
-?serial_int32@@YAXQAPAEJ@Z
-?serial_uint32@@YAXQAPAEI@Z
-?serial_uint64@@YAXQAPAE_K@Z
-?serial_btime@@YAXQAPAE_J@Z
-?serial_float64@@YAXQAPAEN@Z
-?serial_string@@YAXQAPAEQBD@Z
-?unserial_int32@@YAJQAPAE@Z
-?unserial_uint32@@YAIQAPAE@Z
-?unserial_uint64@@YA_KQAPAE@Z
-?unserial_btime@@YA_JQAPAE@Z
-?unserial_float64@@YANQAPAE@Z
-?unserial_string@@YAXQAPAEQAD@Z
-; sha1.obj 
-; signal.obj 
-; smartall.obj 
-?sm_free@@YAXPBDHPAX@Z
-?sm_malloc@@YAPAXPBDHI@Z
-?sm_calloc@@YAPAXPBDHII@Z
-?sm_realloc@@YAPAXPBDHPAXI@Z
-?sm_dump@@YAX_N@Z
-?sm_check@@YAXPBDH_N@Z
-?sm_static@@YAXH@Z
-; tls.obj 
-?new_tls_context@@YAPAUTLS_Context@@PBD000P6AHPADHPBX@Z20_N@Z
-?free_tls_context@@YAXPAUTLS_Context@@@Z
-; tree.obj 
-?new_tree@@YAPAUs_tree_root@@H@Z
-?free_tree@@YAXPAUs_tree_root@@@Z
-?insert_tree_node@@YAPAUs_tree_node@@PAD0HPAUs_tree_root@@PAU1@@Z
-?strrchr@@YAPADPADH@Z
-?tree_getpath@@YAHPAUs_tree_node@@PADH@Z
-?tree_cwd@@YAPAUs_tree_node@@PADPAUs_tree_root@@PAU1@@Z
-; util.obj 
-?is_buf_zero@@YA_NPADH@Z
-?lcase@@YAXPAD@Z
-?bash_spaces@@YAXPAD@Z
-?bash_spaces@@YAXAAVPOOL_MEM@@@Z
-?unbash_spaces@@YAXPAD@Z
-?unbash_spaces@@YAXAAVPOOL_MEM@@@Z
-?encode_time@@YAPADJPAD@Z
-?jobstatus_to_ascii@@YAXHPADH@Z
-?job_status_to_str@@YAPBDH@Z
-?job_type_to_str@@YAPBDH@Z
-?job_level_to_str@@YAPBDH@Z
-?encode_mode@@YAPADIPAD@Z
-?do_shell_expansion@@YAHPADH@Z
-?make_session_key@@YAXPAD0H@Z
-?edit_job_codes@@YAPADPAVJCR@@PAD1PBD@Z
-?set_working_directory@@YAXPAD@Z
-; var.obj 
-?var_create@@YA?AW4var_rc_t@@PAPAUvar_st@@@Z
-?var_destroy@@YA?AW4var_rc_t@@PAUvar_st@@@Z
-?var_config@@YA?AW4var_rc_t@@PAUvar_st@@W4var_config_t@@ZZ
-?var_unescape@@YA?AW4var_rc_t@@PAUvar_st@@PBDHPADHH@Z
-?var_expand@@YA?AW4var_rc_t@@PAUvar_st@@PBDHPAPADPAHH@Z
-?var_strerror@@YAPBDPAUvar_st@@W4var_rc_t@@@Z
-; watchdog.obj 
-?start_watchdog@@YAHXZ
-?stop_watchdog@@YAHXZ
-?new_watchdog@@YAPAUs_watchdog_t@@XZ
-?register_watchdog@@YA_NPAUs_watchdog_t@@@Z
-; winapi.obj 
-?InitWinAPIWrapper@@YAXXZ
-; workq.obj 
+LIBRARY bacula.dll\r
+EXPORTS\r
+\r
+; address_conf.obj \r
+?get_port_net_order@IPADDR@@QBEGXZ\r
+?get_address@IPADDR@@QAEPBDPADH@Z\r
+?get_first_address@@YAPBDPAVdlist@@PADH@Z\r
+?get_first_port_host_order@@YAHPAVdlist@@@Z\r
+?init_default_addresses@@YAXPAPAVdlist@@H@Z\r
+?store_addresses@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z\r
+?store_addresses_address@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z\r
+?store_addresses_port@@YAXPAUs_lex_context@@PAURES_ITEM@@HH@Z\r
+?free_addresses@@YAXPAVdlist@@@Z\r
+?sockaddr_get_port_net_order@@YAHPBUsockaddr@@@Z\r
+?sockaddr_to_ascii@@YAPADPBUsockaddr@@PADH@Z\r
\r
+; alist.obj \r
+?first@alist@@QAEPAXXZ\r
+?next@alist@@QAEPAXXZ\r
+?prepend@alist@@QAEXPAX@Z\r
+?append@alist@@QAEXPAX@Z\r
+?remove@alist@@QAEPAXH@Z\r
+?get@alist@@QAEPAXH@Z\r
+?destroy@alist@@QAEXXZ\r
\r
+; attr.obj \r
+?new_attr@@YAPAUATTR@@XZ\r
+?free_attr@@YAXPAUATTR@@@Z\r
+?unpack_attributes_record@@YAHPAVJCR@@JPADPAUATTR@@@Z\r
+?build_attr_output_fnames@@YAXPAVJCR@@PAUATTR@@@Z\r
+?print_ls_output@@YAXPAVJCR@@PAUATTR@@@Z\r
\r
+; attribs.obj \r
+?select_data_stream@@YAHPAUFF_PKT@@@Z\r
+?encode_stat@@YAXPADPAUFF_PKT@@H@Z\r
+?decode_stat@@YAHPADPAUstat@@PAJ@Z\r
+?decode_LinkFI@@YAJPADPAUstat@@@Z\r
+?set_attributes@@YA_NPAVJCR@@PAUATTR@@PAUBFILE@@@Z\r
+?encode_attribsEx@@YAHPAVJCR@@PADPAUFF_PKT@@@Z\r
\r
+; base64.obj \r
+?bin_to_base64@@YAHPADH0HH@Z\r
\r
+; berrno.obj \r
+?strerror@berrno@@QAEPBDXZ\r
+?format_win32_message@berrno@@AAEXXZ\r
\r
+; bfile.obj \r
+?is_win32_stream@@YA_NH@Z\r
+?stream_to_ascii@@YAPBDH@Z\r
+?processWin32BackupAPIBlock@@YA_NPAUBFILE@@PAXH@Z\r
+?binit@@YAXPAUBFILE@@@Z\r
+?set_portable_backup@@YA_NPAUBFILE@@@Z\r
+?set_prog@@YA_NPAUBFILE@@PADPAVJCR@@@Z\r
+?is_portable_backup@@YA_NPAUBFILE@@@Z\r
+?have_win32_api@@YA_NXZ\r
+?is_restore_stream_supported@@YA_NH@Z\r
+?bopen@@YAHPAUBFILE@@PBDHI@Z\r
+?bclose@@YAHPAUBFILE@@@Z\r
+?bread@@YAHPAUBFILE@@PAXI@Z\r
+?bwrite@@YAHPAUBFILE@@PAXI@Z\r
+?is_bopen@@YA_NPAUBFILE@@@Z\r
+?blseek@@YA_JPAUBFILE@@_JH@Z\r
\r
+; bget_msg.obj \r
+?bget_msg@@YAHPAUBSOCK@@@Z\r
\r
+; bnet.obj \r
+?bnet_recv@@YAJPAUBSOCK@@@Z\r
+?is_bnet_stop@@YA_NPAUBSOCK@@@Z\r
+?is_bnet_error@@YAHPAUBSOCK@@@Z\r
+?bnet_suppress_error_messages@@YAXPAUBSOCK@@_N@Z\r
+?bnet_despool_to_bsock@@YAHPAUBSOCK@@P6AXH@ZH@Z\r
+?bnet_send@@YA_NPAUBSOCK@@@Z\r
+?bnet_tls_server@@YA_NPAUTLS_Context@@PAUBSOCK@@PAValist@@@Z\r
+?bnet_tls_client@@YA_NPAUTLS_Context@@PAUBSOCK@@@Z\r
+?bnet_wait_data@@YAHPAUBSOCK@@H@Z\r
+?bnet_wait_data_intr@@YAHPAUBSOCK@@H@Z\r
+?bnet_connect@@YAPAUBSOCK@@PAVJCR@@HHPBDPAD2HH@Z\r
+?bnet_strerror@@YAPBDPAUBSOCK@@@Z\r
+?bnet_fsend@@YA_NPAUBSOCK@@PBDZZ\r
+?bnet_get_peer@@YAHPAUBSOCK@@PADH@Z\r
+?bnet_set_buffer_size@@YA_NPAUBSOCK@@IH@Z\r
+?bnet_sig@@YA_NPAUBSOCK@@H@Z\r
+?bnet_sig_to_ascii@@YAPBDPAUBSOCK@@@Z\r
+?init_bsock@@YAPAUBSOCK@@PAVJCR@@HPBD1HPAUsockaddr@@@Z\r
+?dup_bsock@@YAPAUBSOCK@@PAU1@@Z\r
+?bnet_close@@YAXPAUBSOCK@@@Z\r
+?term_bsock@@YAXPAUBSOCK@@@Z\r
\r
+; bnet_server.obj \r
+?bnet_stop_thread_server@@YAXPAUpthread_t_@@@Z\r
+?bnet_thread_server@@YAXPAVdlist@@HPAUworkq_tag@@P6APAXPAX@Z@Z\r
\r
+; bpipe.obj \r
+?run_program@@YAHPADH0@Z\r
+?run_program_full_output@@YAHPADH0@Z\r
\r
+; bregex.obj \r
+b_regcomp\r
+b_regexec\r
+b_regerror\r
+b_regfree\r
+\r
+; bsnprintf.obj \r
+?bsnprintf@@YAHPADJPBDZZ\r
+?bvsnprintf@@YAHPADJPBD0@Z\r
\r
+; bsys.obj \r
+?bmicrosleep@@YAHJJ@Z\r
+?bstrncpy@@YAPADPADPBDH@Z\r
+?bstrncpy@@YAPADPADAAVPOOL_MEM@@H@Z\r
+?bstrncat@@YAPADPADPBDH@Z\r
+?bstrcmp@@YA_NPBD0@Z\r
+?cstrlen@@YAHPBD@Z\r
+?bfree@@YAXPAX@Z\r
+?b_malloc@@YAPAXPBDHI@Z\r
+?brealloc@@YAPAXPAXI@Z\r
+?_p@@YAXPAPAUpthread_mutex_t_@@@Z\r
+?_v@@YAXPAPAUpthread_mutex_t_@@@Z\r
+?create_pid_file@@YAXPADPBDH@Z\r
+?delete_pid_file@@YAHPADPBDH@Z\r
+?read_state_file@@YAXPADPBDH@Z\r
+?write_state_file@@YAXPADPBDH@Z\r
+?drop@@YAXPAD0@Z\r
+?bfgets@@YAPADPADHPAU_iobuf@@@Z\r
+?escape_filename@@YAPADPBD@Z\r
\r
+; btime.obj \r
+?bstrftime@@YAPADPADH_J@Z\r
+?bstrftimes@@YAPADPADH_J@Z\r
+?bstrftime_nc@@YAPADPADH_J@Z\r
+?bstrutime@@YAPADPADH_J@Z\r
+?str_to_utime@@YA_JPAD@Z\r
+?get_current_btime@@YA_JXZ\r
+?btime_to_unix@@YAJ_J@Z\r
+?btime_to_utime@@YA_J_J@Z\r
+?tm_woy@@YAHJ@Z\r
+?get_current_time@@YAXPAUdate_time@@@Z\r
+?tm_decode@@YAXPAUdate_time@@PAUtm@@@Z\r
\r
+; btimers.obj \r
+?start_thread_timer@@YAPAUs_btimer_t@@PAUpthread_t_@@I@Z\r
+?start_bsock_timer@@YAPAUs_btimer_t@@PAUBSOCK@@I@Z\r
+?stop_bsock_timer@@YAXPAUs_btimer_t@@@Z\r
+?stop_thread_timer@@YAXPAUs_btimer_t@@@Z\r
\r
+; compat.obj \r
+?SetVSSPathConvert@@YAXP6AHPBDPADH@ZP6AHPB_WPA_WH@Z@Z\r
+?wchar_2_UTF8@@YAHPADPB_WH@Z\r
+?random@@YAJXZ\r
+?srandom@@YAXI@Z\r
+?fstat@@YAHHPAUstat@@@Z\r
+?stat@@YAHPBDPAU0@@Z\r
+?fcntl@@YAHHHJ@Z\r
+?lstat@@YAHPBDPAUstat@@@Z\r
+?sleep@@YAXH@Z\r
+?strcasecmp@@YAHPBD0@Z\r
+?gettimeofday@@YAHPAUtimeval@@PAUtimezone@@@Z\r
+?opendir@@YAPAXPBD@Z\r
+?closedir@@YAHPAX@Z\r
+?readdir_r@@YAHPAXPAUdirent@@PAPAU1@@Z\r
+?init_signals@@YAXP6AXH@Z@Z\r
+?init_stack_dump@@YAXXZ\r
+?pathconf@@YAJPBDH@Z\r
+?WSA_Init@@YAHXZ\r
+?win32_fputs@@YAHPBDPAU_iobuf@@@Z\r
+?win32_cgets@@YAPADPADH@Z\r
+?win32_unlink@@YAHPBD@Z\r
+?open_bpipe@@YAPAVBPIPE@@PADHPBD@Z\r
+?kill@@YAHHH@Z\r
+?close_bpipe@@YAHPAVBPIPE@@@Z\r
+?utime@@YAHPBDPAUutimbuf@@@Z\r
\r
+; cram-md5.obj \r
+?cram_md5_challenge@@YA_NPAUBSOCK@@PADHH@Z\r
+?cram_md5_respond@@YA_NPAUBSOCK@@PADPAH2@Z\r
\r
+; crc32.obj \r
+?bcrc32@@YAIPAEH@Z\r
\r
+;create_file.obj \r
+?create_file@@YAHPAVJCR@@PAUATTR@@PAUBFILE@@H@Z\r
\r
+; crypto.obj \r
+?crypto_digest_new@@YAPAUDigest@@W4crypto_digest_t@@@Z\r
+?crypto_digest_update@@YA_NPAUDigest@@PBEI@Z\r
+?crypto_digest_finalize@@YA_NPAUDigest@@PAEPAI@Z\r
+?crypto_digest_free@@YAXPAUDigest@@@Z\r
+?init_crypto@@YAHXZ\r
+?cleanup_crypto@@YAHXZ\r
+?crypto_sign_new@@YAPAUSignature@@XZ\r
+?crypto_sign_get_digest@@YA?AW4crypto_error_t@@PAUSignature@@PAUX509_Keypair@@PAPAUDigest@@@Z\r
+?crypto_sign_verify@@YA?AW4crypto_error_t@@PAUSignature@@PAUX509_Keypair@@PAUDigest@@@Z\r
+?crypto_sign_add_signer@@YAHPAUSignature@@PAUDigest@@PAUX509_Keypair@@@Z\r
+?crypto_sign_encode@@YAHPAUSignature@@PAEPAI@Z\r
+?crypto_sign_decode@@YAPAUSignature@@PBEI@Z\r
+?crypto_sign_free@@YAXPAUSignature@@@Z\r
+?crypto_keypair_new@@YAPAUX509_Keypair@@XZ\r
+?crypto_keypair_dup@@YAPAUX509_Keypair@@PAU1@@Z\r
+?crypto_keypair_load_cert@@YAHPAUX509_Keypair@@PBD@Z\r
+?crypto_keypair_has_key@@YA_NPBD@Z\r
+?crypto_keypair_load_key@@YAHPAUX509_Keypair@@PBDP6AHPADHPBX@Z3@Z\r
+?crypto_keypair_free@@YAXPAUX509_Keypair@@@Z\r
+?crypto_session_new@@YAPAUCrypto_Session@@W4crypto_cipher_t@@PAValist@@@Z\r
+?crypto_session_free@@YAXPAUCrypto_Session@@@Z\r
+?crypto_session_encode@@YA_NPAUCrypto_Session@@PAEPAI@Z\r
+?crypto_session_decode@@YA?AW4crypto_error_t@@PBEIPAValist@@PAPAUCrypto_Session@@@Z\r
+?crypto_cipher_new@@YAPAUCipher_Context@@PAUCrypto_Session@@_NPAI@Z\r
+?crypto_cipher_update@@YA_NPAUCipher_Context@@PBEI1PAI@Z\r
+?crypto_cipher_finalize@@YA_NPAUCipher_Context@@PAEPAI@Z\r
+?crypto_cipher_free@@YAXPAUCipher_Context@@@Z\r
+?crypto_default_pem_callback@@YAHPADHPBX@Z\r
+?crypto_digest_name@@YAPBDPAUDigest@@@Z\r
+?crypto_digest_stream_type@@YA?AW4crypto_digest_t@@H@Z\r
+?crypto_strerror@@YAPBDW4crypto_error_t@@@Z\r
\r
+; daemon.obj \r
+?daemon_start@@YAXXZ\r
\r
+; dlist.obj \r
+?append@dlist@@QAEXPAX@Z\r
+?prepend@dlist@@QAEXPAX@Z\r
+?insert_before@dlist@@QAEXPAX0@Z\r
+?binary_insert@dlist@@QAEPAXPAXP6AH00@Z@Z\r
+?first@dlist@@QBEPAXXZ\r
+?last@dlist@@QBEPAXXZ\r
+?binary_insert_multiple@dlist@@QAEXPAXP6AH00@Z@Z\r
+?binary_search@dlist@@QAEPAXPAXP6AH00@Z@Z\r
+?remove@dlist@@QAEXPAX@Z\r
+?next@dlist@@QBEPAXPBX@Z\r
+?destroy@dlist@@QAEXXZ\r
\r
+; drivetype.obj \r
+?drivetype@@YA_NPBDPADH@Z\r
\r
+; edit.obj \r
+?str_to_uint64@@YA_KPAD@Z\r
+?str_to_int64@@YA_JPAD@Z\r
+?edit_uint64_with_commas@@YAPAD_KPAD@Z\r
+?edit_uint64_with_suffix@@YAPAD_KPAD@Z\r
+?edit_uint64@@YAPAD_KPAD@Z\r
+?edit_int64@@YAPAD_JPAD@Z\r
+?duration_to_utime@@YA_NPADPA_J@Z\r
+?edit_utime@@YAPAD_JPADH@Z\r
+?size_to_uint64@@YA_NPADHPA_K@Z\r
+?is_a_number@@YA_NPBD@Z\r
+?is_an_integer@@YA_NPBD@Z\r
+?is_name_valid@@YA_NPADPAPAD@Z\r
+?add_commas@@YAPADPAD0@Z\r
\r
+; enable_priv.obj \r
+?enable_backup_privileges@@YAHPAVJCR@@H@Z\r
\r
+; enh_fnmatch.obj \r
\r
+; find.obj \r
+?init_find_files@@YAPAUFF_PKT@@XZ\r
+?set_find_options@@YAXPAUFF_PKT@@HJ@Z\r
+?get_win32_driveletters@@YAHPAUFF_PKT@@PAD@Z\r
+?find_files@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2@Z\r
+?term_find_files@@YAHPAUFF_PKT@@@Z\r
\r
+; find_one.obj \r
+?find_one_file@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2PADI3@Z\r
\r
+; fnmatch.obj \r
+fnmatch\r
\r
+; fstype.obj \r
+?fstype@@YA_NPBDPADH@Z\r
\r
+; hmac.obj \r
+?hmac_md5@@YAXPAEH0H0@Z\r
\r
+; htable.obj \r
\r
+; idcache.obj \r
+?getuser@@YAPADIPADH@Z\r
+?getgroup@@YAPADIPADH@Z\r
\r
+; jcr.obj \r
+?lock_jobs@@YAXXZ\r
+?unlock_jobs@@YAXXZ\r
+?term_last_jobs_list@@YAXXZ\r
+?lock_last_jobs_list@@YAXXZ\r
+?unlock_last_jobs_list@@YAXXZ\r
+?job_end_push@@YAXPAVJCR@@P6AX0PAX@Z1@Z\r
+?new_jcr@@YAPAVJCR@@HP6AXPAV1@@Z@Z\r
+?inc_use_count@JCR@@QAEXXZ\r
+?lock@JCR@@QAEXXZ\r
+?unlock@JCR@@QAEXXZ\r
+?init_mutex@JCR@@QAEXXZ\r
+?b_free_jcr@@YAXPBDHPAVJCR@@@Z\r
+?dec_use_count@JCR@@QAEXXZ\r
+?use_count@JCR@@QAEHXZ\r
+?destroy_mutex@JCR@@QAEXXZ\r
+?get_jcr_by_id@@YAPAVJCR@@I@Z\r
+?get_jcr_by_session@@YAPAVJCR@@II@Z\r
+?get_jcr_by_partial_name@@YAPAVJCR@@PAD@Z\r
+?get_jcr_by_full_name@@YAPAVJCR@@PAD@Z\r
+?set_jcr_job_status@@YAXPAVJCR@@H@Z\r
+?jcr_walk_start@@YAPAVJCR@@XZ\r
+?jcr_walk_next@@YAPAVJCR@@PAV1@@Z\r
+?jcr_walk_end@@YAXPAVJCR@@@Z\r
+?init_jcr_subsystem@@YA_NXZ\r
\r
+; lex.obj \r
+?scan_to_eol@@YAXPAUs_lex_context@@@Z\r
+?lex_set_default_error_handler@@YAXPAUs_lex_context@@@Z\r
+?lex_set_error_handler_error_type@@YAHPAUs_lex_context@@H@Z\r
+?lex_close_file@@YAPAUs_lex_context@@PAU1@@Z\r
+?lex_open_file@@YAPAUs_lex_context@@PAU1@PBDP6AX1H01ZZ@Z\r
+?lex_tok_to_str@@YAPBDH@Z\r
+?lex_get_token@@YAHPAUs_lex_context@@H@Z\r
\r
+; makepath.obj \r
\r
+; match.obj \r
+?match_files@@YAHPAVJCR@@PAUFF_PKT@@P6AH1PAX_N@Z2@Z\r
+?term_include_exclude_files@@YAXPAUFF_PKT@@@Z\r
+?add_fname_to_include_list@@YAXPAUFF_PKT@@HPBD@Z\r
+?add_fname_to_exclude_list@@YAXPAUFF_PKT@@PBD@Z\r
+?file_is_included@@YAHPAUFF_PKT@@PBD@Z\r
+?file_is_excluded@@YAHPAUFF_PKT@@PBD@Z\r
\r
+; md5.obj \r
+?MD5Init@@YAXPAUMD5Context@@@Z\r
+?MD5Update@@YAXPAUMD5Context@@PAEI@Z\r
+?MD5Final@@YAXQAEPAUMD5Context@@@Z\r
\r
+; mem_pool.obj \r
+?sm_get_pool_memory@@YAPADPBDHH@Z\r
+?sm_get_memory@@YAPADPBDHJ@Z\r
+?sm_sizeof_pool_memory@@YAJPBDHPAD@Z\r
+?sm_realloc_pool_memory@@YAPADPBDHPADJ@Z\r
+?sm_check_pool_memory_size@@YAPADPBDHPADJ@Z\r
+?sm_free_pool_memory@@YAXPBDHPAD@Z\r
+?close_memory_pool@@YAXXZ\r
+?print_memory_pool_stats@@YAXXZ\r
+?pm_strcat@@YAHPAPADPBD@Z\r
+?pm_strcat@@YAHAAPADPBD@Z\r
+?c_str@POOL_MEM@@QBEPADXZ\r
+?pm_strcat@@YAHAAVPOOL_MEM@@PBD@Z\r
+?check_size@POOL_MEM@@QAEPADJ@Z\r
+?pm_strcpy@@YAHPAPADPBD@Z\r
+?pm_strcpy@@YAHAAPADPBD@Z\r
+?pm_strcpy@@YAHAAPADAAVPOOL_MEM@@@Z\r
+?pm_strcpy@@YAHAAVPOOL_MEM@@PBD@Z\r
+?max_size@POOL_MEM@@QAEJXZ\r
\r
+; message.obj \r
+?my_name_is@@YAXHQAPADPBD@Z\r
+?get_db_type@@YAPBDXZ\r
+?set_db_type@@YAXPBD@Z\r
+?init_msg@@YAXPAVJCR@@PAVMSGS@@@Z\r
+?init_console_msg@@YAXPBD@Z\r
+?add_msg_dest@@YAXPAVMSGS@@HHPAD1@Z\r
+?rem_msg_dest@@YAXPAVMSGS@@HHPAD@Z\r
+?close_msg@@YAXPAVJCR@@@Z\r
+?set_errno@berrno@@QAEXH@Z\r
+?free_msgs_res@@YAXPAVMSGS@@@Z\r
+?term_msg@@YAXXZ\r
+?dispatch_message@@YAXPAVJCR@@HJPAD@Z\r
+?c_str@POOL_MEM@@QBEPADXZ\r
+?d_msg@@YAXPBDHH0ZZ\r
+?get_basename@@YAPBDPBD@Z\r
+?set_trace@@YAXH@Z\r
+?get_trace@@YA_NXZ\r
+?p_msg@@YAXPBDHH0ZZ\r
+?e_msg@@YAXPBDHHH0ZZ\r
+?Jmsg@@YAXPAVJCR@@HJPBDZZ\r
+?j_msg@@YAXPBDHPAVJCR@@HJ0ZZ\r
+?m_msg@@YAHPBDHPAPAD0ZZ\r
+?m_msg@@YAHPBDHAAPAD0ZZ\r
+?Mmsg@@YAHPAPADPBDZZ\r
+?Mmsg@@YAHAAPADPBDZZ\r
+?Mmsg@@YAHAAVPOOL_MEM@@PBDZZ\r
+?Qmsg@@YAXPAVJCR@@HJPBDZZ\r
+?dequeue_messages@@YAXPAVJCR@@@Z\r
+?q_msg@@YAXPBDHPAVJCR@@HJ0ZZ\r
\r
+; print.obj \r
\r
+; pythonlib.obj \r
+?generate_daemon_event@@YAHPAVJCR@@PBD@Z\r
+?init_python_interpreter@@YAXPBD00@Z\r
+?term_python_interpreter@@YAXXZ\r
\r
+; queue.obj \r
+?qinsert@@YAXPAUb_queue@@0@Z\r
+?qnext@@YAPAUb_queue@@PAU1@0@Z\r
+?qdchain@@YAPAUb_queue@@PAU1@@Z\r
\r
+; runscript.obj \r
+?new_runscript@@YAPAVRUNSCRIPT@@XZ\r
+?reset_default@RUNSCRIPT@@QAEX_N@Z\r
+?copy_runscript@@YAPAVRUNSCRIPT@@PAV1@@Z\r
+?free_runscript@@YAXPAVRUNSCRIPT@@@Z\r
+?run_scripts@@YAHPAVJCR@@PAValist@@PBD@Z\r
+?set_command@RUNSCRIPT@@QAEXPBD@Z\r
+?set_target@RUNSCRIPT@@QAEXPBD@Z\r
+?run@RUNSCRIPT@@QAEHPAVJCR@@PBD@Z\r
+?free_runscripts@@YAXPAValist@@@Z\r
+?debug@RUNSCRIPT@@QAEXXZ\r
\r
+; rwlock.obj \r
+?rwl_init@@YAHPAUs_rwlock_tag@@@Z\r
+?rwl_destroy@@YAHPAUs_rwlock_tag@@@Z\r
+?rwl_writelock@@YAHPAUs_rwlock_tag@@@Z\r
+?rwl_writeunlock@@YAHPAUs_rwlock_tag@@@Z\r
\r
+; save-cwd.obj \r
\r
+; scan.obj \r
+?strip_leading_space@@YAXPAD@Z\r
+?strip_trailing_junk@@YAXPAD@Z\r
+?strip_trailing_newline@@YAXPAD@Z\r
+?skip_spaces@@YA_NPAPAD@Z\r
+?skip_nonspaces@@YA_NPAPAD@Z\r
+?fstrsch@@YAHPBD0@Z\r
+?next_arg@@YAPADPAPAD@Z\r
+?parse_args@@YAHPADPAPADPAH11H@Z\r
+?parse_args_only@@YAHPADPAPADPAH11H@Z\r
+?bsscanf@@YAHPBD0ZZ\r
\r
+; serial.obj \r
+?serial_int32@@YAXQAPAEJ@Z\r
+?serial_uint32@@YAXQAPAEI@Z\r
+?serial_uint64@@YAXQAPAE_K@Z\r
+?serial_btime@@YAXQAPAE_J@Z\r
+?serial_float64@@YAXQAPAEN@Z\r
+?serial_string@@YAXQAPAEQBD@Z\r
+?unserial_int32@@YAJQAPAE@Z\r
+?unserial_uint32@@YAIQAPAE@Z\r
+?unserial_uint64@@YA_KQAPAE@Z\r
+?unserial_btime@@YA_JQAPAE@Z\r
+?unserial_float64@@YANQAPAE@Z\r
+?unserial_string@@YAXQAPAEQAD@Z\r
\r
+; sha1.obj \r
\r
+; signal.obj \r
\r
+; smartall.obj \r
+?sm_free@@YAXPBDHPAX@Z\r
+?sm_malloc@@YAPAXPBDHI@Z\r
+?sm_calloc@@YAPAXPBDHII@Z\r
+?sm_realloc@@YAPAXPBDHPAXI@Z\r
+?sm_dump@@YAX_N@Z\r
+?sm_check@@YAXPBDH_N@Z\r
+?sm_static@@YAXH@Z\r
\r
+; tls.obj \r
+?new_tls_context@@YAPAUTLS_Context@@PBD000P6AHPADHPBX@Z20_N@Z\r
+?free_tls_context@@YAXPAUTLS_Context@@@Z\r
\r
+; tree.obj \r
+?new_tree@@YAPAUs_tree_root@@H@Z\r
+?free_tree@@YAXPAUs_tree_root@@@Z\r
+?insert_tree_node@@YAPAUs_tree_node@@PAD0HPAUs_tree_root@@PAU1@@Z\r
+?strrchr@@YAPADPADH@Z\r
+?tree_getpath@@YAHPAUs_tree_node@@PADH@Z\r
+?tree_cwd@@YAPAUs_tree_node@@PADPAUs_tree_root@@PAU1@@Z\r
\r
+; util.obj \r
+?is_buf_zero@@YA_NPADH@Z\r
+?lcase@@YAXPAD@Z\r
+?bash_spaces@@YAXPAD@Z\r
+?bash_spaces@@YAXAAVPOOL_MEM@@@Z\r
+?unbash_spaces@@YAXPAD@Z\r
+?unbash_spaces@@YAXAAVPOOL_MEM@@@Z\r
+?encode_time@@YAPADJPAD@Z\r
+?jobstatus_to_ascii@@YAXHPADH@Z\r
+?job_status_to_str@@YAPBDH@Z\r
+?job_type_to_str@@YAPBDH@Z\r
+?job_level_to_str@@YAPBDH@Z\r
+?encode_mode@@YAPADIPAD@Z\r
+?do_shell_expansion@@YAHPADH@Z\r
+?make_session_key@@YAXPAD0H@Z\r
+?edit_job_codes@@YAPADPAVJCR@@PAD1PBD@Z\r
+?set_working_directory@@YAXPAD@Z\r
\r
+; var.obj \r
+?var_create@@YA?AW4var_rc_t@@PAPAUvar_st@@@Z\r
+?var_destroy@@YA?AW4var_rc_t@@PAUvar_st@@@Z\r
+?var_config@@YA?AW4var_rc_t@@PAUvar_st@@W4var_config_t@@ZZ\r
+?var_unescape@@YA?AW4var_rc_t@@PAUvar_st@@PBDHPADHH@Z\r
+?var_expand@@YA?AW4var_rc_t@@PAUvar_st@@PBDHPAPADPAHH@Z\r
+?var_strerror@@YAPBDPAUvar_st@@W4var_rc_t@@@Z\r
\r
+; watchdog.obj \r
+?start_watchdog@@YAHXZ\r
+?stop_watchdog@@YAHXZ\r
+?new_watchdog@@YAPAUs_watchdog_t@@XZ\r
+?register_watchdog@@YA_NPAUs_watchdog_t@@@Z\r
\r
+; winapi.obj \r
+?InitWinAPIWrapper@@YAXXZ\r
\r
+; workq.obj \r
index 5849beb8e3e86356a70a6ec9b02955c282e1d8af..c3371e7de1332ae5546e269c77ea3a9b4bf60169 100644 (file)
@@ -1 +1 @@
-1 ICON  "apcupsd.ico"
+1 ICON  "apcupsd.ico"\r
index 67b32633eacae2739b751906c926d3bf532319bd..d0b9abf7c3a55cdf6a72ace727aeb7afc1822c2c 100644 (file)
-#include <winuser.h>
-#include <winver.h>
-#include "winres.h"
-#include "../../version.h"
-
-/* NB: Internationalization of this file will require some work... */
-#define N_(s) s
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icons
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_BACULA              ICON    "bacula.ico"
-IDI_IDLE                ICON    "idle.ico"
-IDI_RUNNING             ICON    "running.ico"
-IDI_JOB_ERROR           ICON    "error.ico"
-IDI_JOB_WARNING         ICON    "warn.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAYMENU MENU
-BEGIN
-    POPUP "tray"
-    BEGIN
-        MENUITEM N_("&Status"),                     ID_STATUS
-        MENUITEM SEPARATOR
-        MENUITEM N_("&About Bacula"),               ID_ABOUT
-        MENUITEM SEPARATOR
-        MENUITEM N_("&Close Bacula"),               ID_CLOSE
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0 //
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E0" // Lang=US English, CharSet=Windows Multiligual
-        BEGIN
-            VALUE "Comments", "by Kern Sibbald\0"
-            VALUE "CompanyName", "            \0"
-            VALUE "FileDescription", "Bacula File daemon for Win32\0"
-            VALUE "FileVersion", VERSION "\0"
-            VALUE "InternalName", "Bacula\0"
-            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2006\0"
-            VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"
-            VALUE "OriginalFilename", "bacula-fd.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Bacula - Win32 Version\0"
-            VALUE "ProductVersion", VERSION
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252 // US English, Multilingual
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-CREATEPROCESS_MANIFEST_RESOURCE_ID     RT_MANIFEST    "bacula-fd.manifest"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BACULABMP           BITMAP  DISCARDABLE     "bacula.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDI_BACULA              "Bacula"
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// About Dialog
-//
-
-IDD_ABOUT DIALOG  0, 0, 250, 145
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About Bacula"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,190,120,50,15
-//  CONTROL         "\3", IDC_BACULABMP,"Static",SS_ICON | SS_CENTERIMAGE |
-//                  SS_SUNKEN,7,5,73,65
-#ifndef HAVE_MINGW
-    CONTROL         IDB_BACULABMP,IDB_BACULABMP,"Static",SS_BITMAP|SS_SUNKEN,7,5,32,32
-#endif
-
-    LTEXT           N_("      by Kern Sibbald"),-1,134,38,78,10
-    LTEXT           N_("For more information, see:"),-1,115,60,100,10
-    LTEXT           "         www.bacula.org",-1,115,70,100,10
-//    LTEXT           "                 ",-1,69,81,100,10
-//    LTEXT           "                 ",-1,90,70,100,10
-    LTEXT           "Copyright (C) 1999-2006, Free Software Foundation Europe e.V.",-1,7,120,175,10
-    LTEXT           N_("Licensed under GNU GPL 2.0."),-1,7,130,175,10
-    RTEXT           N_("Build Date:"),-1,108,24,42,8
-    RTEXT           N_("Bacula Version:"),-1,100,9,50,8
-    LTEXT           VERSION,-1,159,10,65,8
-    LTEXT           BDATE,-1,159,24,65,10
-
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Status Dialog
-//
-
-IDD_STATUS DIALOGEX 0, 0, 411, 244
-STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION N_("Bacula Status")
-FONT 8, "Courier New"
-BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,355,5,51,15
-    EDITTEXT        IDC_TEXTDISPLAY, 2, 2, 350, 240, WS_VSCROLL | WS_HSCROLL | WS_BORDER | ES_READONLY | ES_MULTILINE
-END
+#include <winuser.h>\r
+#include <winver.h>\r
+#include "winres.h"\r
+#include "../../version.h"\r
+\r
+/* NB: Internationalization of this file will require some work... */\r
+#define N_(s) s\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icons\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_BACULA              ICON    "bacula.ico"\r
+IDI_IDLE                ICON    "idle.ico"\r
+IDI_RUNNING             ICON    "running.ico"\r
+IDI_JOB_ERROR           ICON    "error.ico"\r
+IDI_JOB_WARNING         ICON    "warn.ico"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Menu\r
+//\r
+\r
+IDR_TRAYMENU MENU\r
+BEGIN\r
+    POPUP "tray"\r
+    BEGIN\r
+        MENUITEM N_("&Status"),                     ID_STATUS\r
+        MENUITEM SEPARATOR\r
+        MENUITEM N_("&About Bacula"),               ID_ABOUT\r
+        MENUITEM SEPARATOR\r
+        MENUITEM N_("&Close Bacula"),               ID_CLOSE\r
+    END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION 1,1,0,0\r
+ PRODUCTVERSION 1,1,0,0\r
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0 //\r
+#endif\r
+ FILEOS VOS_NT_WINDOWS32\r
+ FILETYPE VFT_APP\r
+ FILESUBTYPE 0\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040904E0" // Lang=US English, CharSet=Windows Multiligual\r
+        BEGIN\r
+            VALUE "Comments", "by Kern Sibbald\0"\r
+            VALUE "CompanyName", "            \0"\r
+            VALUE "FileDescription", "Bacula File daemon for Win32\0"\r
+            VALUE "FileVersion", VERSION "\0"\r
+            VALUE "InternalName", "Bacula\0"\r
+            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2006\0"\r
+            VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"\r
+            VALUE "OriginalFilename", "bacula-fd.exe\0"\r
+            VALUE "PrivateBuild", "\0"\r
+            VALUE "ProductName", "Bacula - Win32 Version\0"\r
+            VALUE "ProductVersion", VERSION\r
+            VALUE "SpecialBuild", "\0"\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x409, 1252 // US English, Multilingual\r
+    END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// RT_MANIFEST\r
+//\r
+CREATEPROCESS_MANIFEST_RESOURCE_ID     RT_MANIFEST    "bacula-fd.manifest"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Bitmap\r
+//\r
+\r
+IDB_BACULABMP           BITMAP  DISCARDABLE     "bacula.bmp"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// String Table\r
+//\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDI_BACULA              "Bacula"\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// About Dialog\r
+//\r
+\r
+IDD_ABOUT DIALOG  0, 0, 250, 145\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "About Bacula"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,190,120,50,15\r
+//  CONTROL         "\3", IDC_BACULABMP,"Static",SS_ICON | SS_CENTERIMAGE |\r
+//                  SS_SUNKEN,7,5,73,65\r
+#ifndef HAVE_MINGW\r
+    CONTROL         IDB_BACULABMP,IDB_BACULABMP,"Static",SS_BITMAP|SS_SUNKEN,7,5,32,32\r
+#endif\r
+\r
+    LTEXT           N_("      by Kern Sibbald"),-1,134,38,78,10\r
+    LTEXT           N_("For more information, see:"),-1,115,60,100,10\r
+    LTEXT           "         www.bacula.org",-1,115,70,100,10\r
+//    LTEXT           "                 ",-1,69,81,100,10\r
+//    LTEXT           "                 ",-1,90,70,100,10\r
+    LTEXT           "Copyright (C) 1999-2006, Free Software Foundation Europe e.V.",-1,7,120,175,10\r
+    LTEXT           N_("Licensed under GNU GPL 2.0."),-1,7,130,175,10\r
+    RTEXT           N_("Build Date:"),-1,108,24,42,8\r
+    RTEXT           N_("Bacula Version:"),-1,100,9,50,8\r
+    LTEXT           VERSION,-1,159,10,65,8\r
+    LTEXT           BDATE,-1,159,24,65,10\r
+\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Status Dialog\r
+//\r
+\r
+IDD_STATUS DIALOGEX 0, 0, 411, 244\r
+STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION N_("Bacula Status")\r
+FONT 8, "Courier New"\r
+BEGIN\r
+    DEFPUSHBUTTON   "&OK",IDOK,355,5,51,15\r
+    EDITTEXT        IDC_TEXTDISPLAY, 2, 2, 350, 240, WS_VSCROLL | WS_HSCROLL | WS_BORDER | ES_READONLY | ES_MULTILINE\r
+END\r
index c9b1e51bec9c4c9bb1ba98bf98fdd3e0510597f7..7b0914b4e71bc4216134c66a6a4c97dc79954ed1 100644 (file)
@@ -488,7 +488,7 @@ diff -ru ..\release\mt-st-0.9b/stinit.def.examples ./stinit.def.examples
 + *
 + * Author: Robert Nelson, May, 2006 <robertn@the-nelsons.org>
 + *
-+ * Version $Id$
++ * Version $Id: mt.patch 3802 2006-12-14 11:41:02Z kerns $
 + *
 + * Copyright (C) 2006 Free Software Foundation Europe e.V.
 + *
index 38f93d3624acdbc3e2ac6b6b7c13af9fc2d0fdc4..e8261e2b181c0eb7b344124feb412f4d92bf7259 100644 (file)
@@ -6,8 +6,8 @@
 + * Released under GNU General Public License V2 or Above
 + * See http://www.gnu.org for more information about the terms of
 + * the GNU General Public License.
-+ * $Date$
-+ * $Revision$
++ * $Date: 2006-08-12 16:18:24 -0700 (Sat, 12 Aug 2006) $
++ * $Revision: 3282 $
 + */
 +
 +#ifndef CONFIG_H
index 35e39f69e41fff568878502685c9fc6f48627236..d22e261119973ac994eed02447077fc0b04999f4 100644 (file)
@@ -32,8 +32,8 @@ Index: scsi_win32.c
 @@ -0,0 +1,353 @@
 +/* Copyright 2006 Robert Nelson <robertn@the-nelsons.org>
 +
-+$Date$
-+$Revision$
++$Date: 2006-07-30 06:32:36 -0700 (Sun, 30 Jul 2006) $
++$Revision: 3200 $
 +
 +  This program is free software; you may redistribute and/or modify it under
 +  the terms of the GNU General Public License Version 2 as published by the
index 0a37cd7c2258e2ea9bf48c82daefc20447c20869..23486191ab4e2158d2d55961a0bde98fc11666d4 100644 (file)
@@ -1,7 +1,7 @@
-Index: SCons/Config/gnu
---- ../release/nsis-2.17-src/SCons/Config/gnu  2006-04-28 08:54:41.000000000 -0700
-+++ SCons/Config/gnu   2006-08-07 18:49:47.000000000 -0700
-@@ -65,7 +65,7 @@
+Index: SCons/Config/gnu\r
+--- ../release/nsis-2.17-src/SCons/Config/gnu  2006-04-28 08:54:41.000000000 -0700\r
++++ SCons/Config/gnu   2006-08-07 18:49:47.000000000 -0700\r
+@@ -65,7 +65,7 @@\r
  cross_env(stub_env)\r
  \r
  if not defenv['DEBUG']:\r
@@ -10,7 +10,7 @@ Index: SCons/Config/gnu
  stub_env.Append(CCFLAGS = '-Wall')                # all warnings\r
  stub_env.Append(CCFLAGS = '-x c')                 # force compile as c\r
  \r
-@@ -82,8 +82,8 @@
+@@ -82,8 +82,8 @@\r
  makensis_env = defenv.Copy()\r
  \r
  if not defenv['DEBUG']:\r
@@ -20,7 +20,7 @@ Index: SCons/Config/gnu
  \r
  conf = FlagsConfigure(makensis_env)\r
  conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@\r
  cross_env(plugin_env)\r
  \r
  if not defenv['DEBUG']:\r
@@ -29,7 +29,7 @@ Index: SCons/Config/gnu
  plugin_env.Append(CCFLAGS = '-Wall')              # level 3 warnings\r
  \r
  if not defenv['DEBUG']:\r
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@\r
  cp_util_env = defenv.Copy()\r
  \r
  if not defenv['DEBUG']:\r
@@ -38,10 +38,10 @@ Index: SCons/Config/gnu
  cp_util_env.Append(CCFLAGS = '-Wall')             # all warnings\r
  \r
  conf = FlagsConfigure(cp_util_env)\r
-Index: Source/build.cpp
---- ../release/nsis-2.17-src/Source/build.cpp  2006-04-14 03:05:01.000000000 -0700
-+++ ./Source/build.cpp 2006-07-31 13:26:38.000000000 -0700
-@@ -2384,7 +2384,7 @@
+Index: Source/build.cpp\r
+--- ../release/nsis-2.17-src/Source/build.cpp  2006-04-14 03:05:01.000000000 -0700\r
++++ ./Source/build.cpp 2006-07-31 13:26:38.000000000 -0700\r
+@@ -2384,7 +2384,7 @@\r
          return PS_ERROR;\r
        }\r
  #ifdef NSIS_CONFIG_CRC_SUPPORT\r
@@ -50,10 +50,10 @@ Index: Source/build.cpp
        firstheader_writer w(&crc_sink);\r
        w.write(&fh);\r
  \r
-Index: Source/build.h
---- ../release/nsis-2.17-src/Source/build.h    2005-04-02 04:04:06.000000000 -0800
-+++ ./Source/build.h   2006-07-31 13:28:44.000000000 -0700
-@@ -38,7 +38,7 @@
+Index: Source/build.h\r
+--- ../release/nsis-2.17-src/Source/build.h    2005-04-02 04:04:06.000000000 -0800\r
++++ ./Source/build.h   2006-07-31 13:28:44.000000000 -0700\r
+@@ -38,7 +38,7 @@\r
  #ifdef NSIS_CONFIG_CRC_SUPPORT\r
  extern "C"\r
  {\r
@@ -62,10 +62,10 @@ Index: Source/build.h
  };\r
  #endif\r
  \r
-Index: Source/crc32.c
---- ../release/nsis-2.17-src/Source/crc32.c    2004-03-12 12:43:54.000000000 -0800
-+++ ./Source/crc32.c   2006-07-31 13:27:12.000000000 -0700
-@@ -3,18 +3,18 @@
+Index: Source/crc32.c\r
+--- ../release/nsis-2.17-src/Source/crc32.c    2004-03-12 12:43:54.000000000 -0800\r
++++ ./Source/crc32.c   2006-07-31 13:27:12.000000000 -0700\r
+@@ -3,18 +3,18 @@\r
  #ifdef NSIS_CONFIG_CRC_SUPPORT\r
  \r
  // this is based on the (slow,small) CRC32 implementation from zlib.\r
@@ -88,10 +88,10 @@ Index: Source/crc32.c
          for (k = 0; k < 8; k++) c = (c >> 1) ^ (c & 1 ? 0xedb88320L : 0);\r
          crc_table[n] = c;\r
        }\r
-Index: Source/DialogTemplate.cpp
---- ../release/nsis-2.17-src/Source/DialogTemplate.cpp 2006-03-24 10:36:24.000000000 -0800
-+++ ./Source/DialogTemplate.cpp        2006-07-31 05:48:44.000000000 -0700
-@@ -93,7 +93,7 @@
+Index: Source/DialogTemplate.cpp\r
+--- ../release/nsis-2.17-src/Source/DialogTemplate.cpp 2006-03-24 10:36:24.000000000 -0800\r
++++ ./Source/DialogTemplate.cpp        2006-07-31 05:48:44.000000000 -0700\r
+@@ -93,7 +93,7 @@\r
      if (IS_INTRESOURCE(x)) { \\r
        *(WORD*)seeker = 0xFFFF; \\r
        seeker += sizeof(WORD); \\r
@@ -100,7 +100,7 @@ Index: Source/DialogTemplate.cpp
        seeker += sizeof(WORD); \\r
      } \\r
      else { \\r
-@@ -629,7 +629,7 @@
+@@ -629,7 +629,7 @@\r
      }\r
    }\r
  \r
@@ -109,10 +109,10 @@ Index: Source/DialogTemplate.cpp
  \r
    // DONE!\r
    return pbDlg;\r
-Index: Source/exehead/fileform.c
---- ../release/nsis-2.17-src/Source/exehead/fileform.c 2005-09-09 09:08:44.000000000 -0700
-+++ ./Source/exehead/fileform.c        2006-07-31 13:26:08.000000000 -0700
-@@ -95,7 +95,7 @@
+Index: Source/exehead/fileform.c\r
+--- ../release/nsis-2.17-src/Source/exehead/fileform.c 2005-09-09 09:08:44.000000000 -0700\r
++++ ./Source/exehead/fileform.c        2006-07-31 13:26:08.000000000 -0700\r
+@@ -95,7 +95,7 @@\r
  static z_stream g_inflate_stream;\r
  #endif\r
  \r
@@ -121,10 +121,10 @@ Index: Source/exehead/fileform.c
  \r
  const char * NSISCALL loadHeaders(int cl_flags)\r
  {\r
-Index: Source/Platform.h
---- ../release/nsis-2.17-src/Source/Platform.h 2006-05-03 08:43:54.000000000 -0700
-+++ ./Source/Platform.h        2006-07-31 05:48:44.000000000 -0700
-@@ -16,15 +16,15 @@
+Index: Source/Platform.h\r
+--- ../release/nsis-2.17-src/Source/Platform.h 2006-05-03 08:43:54.000000000 -0700\r
++++ ./Source/Platform.h        2006-07-31 05:48:44.000000000 -0700\r
+@@ -16,15 +16,15 @@\r
  // basic types\r
  typedef unsigned char BYTE, *PBYTE, *LPBYTE;\r
  typedef unsigned short WORD, *LPWORD;\r
@@ -143,7 +143,7 @@ Index: Source/Platform.h
  typedef long long INT64, LARGE_INTEGER;\r
  typedef unsigned long long UINT64, ULARGE_INTEGER;\r
  typedef int BOOL, *LPBOOL;\r
-@@ -35,13 +35,14 @@
+@@ -35,13 +35,14 @@\r
  typedef const char *LPCCH, *PCSTR, *LPCSTR;\r
  typedef unsigned short WCHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR;\r
  typedef const unsigned short *LPCWCH, *PCWCH, *LPCWSTR, *PCWSTR;\r
@@ -162,7 +162,7 @@ Index: Source/Platform.h
  // bool\r
  #  define FALSE 0\r
  #  define TRUE 1\r
-@@ -129,13 +130,13 @@
+@@ -129,13 +130,13 @@\r
  \r
  #ifndef _WIN32\r
  #  ifndef FIELD_OFFSET\r
@@ -178,7 +178,7 @@ Index: Source/Platform.h
                                       FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \\r
                                       FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )\r
  #  endif\r
-@@ -166,9 +167,9 @@
+@@ -166,9 +167,9 @@\r
  #  define FOF_NOERRORUI 0x0400\r
  #endif\r
  \r
@@ -191,10 +191,10 @@ Index: Source/Platform.h
  \r
  #ifndef IDC_HAND\r
  #  define IDC_HAND MAKEINTRESOURCE(32649)\r
-Index: Source/Plugins.cpp
---- ../release/nsis-2.17-src/Source/Plugins.cpp        2006-04-05 11:42:12.000000000 -0700
-+++ ./Source/Plugins.cpp       2006-07-31 06:50:08.000000000 -0700
-@@ -120,8 +120,8 @@
+Index: Source/Plugins.cpp\r
+--- ../release/nsis-2.17-src/Source/Plugins.cpp        2006-04-05 11:42:12.000000000 -0700\r
++++ ./Source/Plugins.cpp       2006-07-31 06:50:08.000000000 -0700\r
+@@ -120,8 +120,8 @@\r
          DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);\r
          PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);\r
          DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);\r
@@ -205,10 +205,10 @@ Index: Source/Plugins.cpp
          {\r
            const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);\r
            const string signature = dllName + "::" + name;\r
-Index: Source/ResourceEditor.cpp
---- ../release/nsis-2.17-src/Source/ResourceEditor.cpp 2006-04-05 11:40:09.000000000 -0700
-+++ ./Source/ResourceEditor.cpp        2006-07-31 05:48:44.000000000 -0700
-@@ -545,7 +545,7 @@
+Index: Source/ResourceEditor.cpp\r
+--- ../release/nsis-2.17-src/Source/ResourceEditor.cpp 2006-04-05 11:40:09.000000000 -0700\r
++++ ./Source/ResourceEditor.cpp        2006-07-31 05:48:44.000000000 -0700\r
+@@ -545,7 +545,7 @@\r
      rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);\r
  \r
      CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));\r
@@ -217,7 +217,7 @@ Index: Source/ResourceEditor.cpp
      seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);\r
  \r
      for (int i = 0; i < crd->CountEntries(); i++) {\r
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@\r
        rDirE.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;\r
  \r
        CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));\r
@@ -226,7 +226,7 @@ Index: Source/ResourceEditor.cpp
        seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);\r
      }\r
      qDirs.pop();\r
-@@ -582,7 +582,7 @@
+@@ -582,7 +582,7 @@\r
      rDataE.Size = ConvertEndianness(cRDataE->GetSize());\r
  \r
      CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));\r
@@ -235,7 +235,7 @@ Index: Source/ResourceEditor.cpp
      seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);\r
  \r
      qDataEntries.pop();\r
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@\r
    while (!qStrings.empty()) {\r
      CResourceDirectoryEntry* cRDirE = qStrings.front();\r
  \r
@@ -244,7 +244,7 @@ Index: Source/ResourceEditor.cpp
  \r
      char* szName = cRDirE->GetName();\r
      WORD iLen = strlen(szName) + 1;\r
-@@ -626,7 +626,7 @@
+@@ -626,7 +626,7 @@\r
    while (!qDataEntries2.empty()) {\r
      CResourceDataEntry* cRDataE = qDataEntries2.front();\r
      CopyMemory(seeker, cRDataE->GetData(), cRDataE->GetSize());\r
@@ -253,7 +253,7 @@ Index: Source/ResourceEditor.cpp
  \r
      seeker += RALIGN(cRDataE->GetSize(), 8);\r
  \r
-@@ -636,7 +636,7 @@
+@@ -636,7 +636,7 @@\r
    /*\r
     * Set all of the directory entries offsets.\r
     */\r
@@ -262,7 +262,7 @@ Index: Source/ResourceEditor.cpp
  }\r
  \r
  // Sets the offsets in directory entries\r
-@@ -650,7 +650,7 @@
+@@ -650,7 +650,7 @@\r
        SetOffsets(resDir->GetEntry(i)->GetSubDirectory(), newResDirAt);\r
      }\r
      else {\r
@@ -271,7 +271,7 @@ Index: Source/ResourceEditor.cpp
      }\r
    }\r
  }\r
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@\r
  // Returns -1 if can not be found\r
  int CResourceDirectory::Find(char* szName) {\r
    if (IS_INTRESOURCE(szName))\r
@@ -280,7 +280,7 @@ Index: Source/ResourceEditor.cpp
    else\r
      if (szName[0] == '#')\r
        return Find(WORD(atoi(szName + 1)));\r
-@@ -836,7 +836,7 @@
+@@ -836,7 +836,7 @@\r
    if (IS_INTRESOURCE(szName)) {\r
      m_bHasName = false;\r
      m_szName = 0;\r
@@ -289,7 +289,7 @@ Index: Source/ResourceEditor.cpp
    }\r
    else {\r
      m_bHasName = true;\r
-@@ -851,7 +851,7 @@
+@@ -851,7 +851,7 @@\r
    if (IS_INTRESOURCE(szName)) {\r
      m_bHasName = false;\r
      m_szName = 0;\r
@@ -298,10 +298,10 @@ Index: Source/ResourceEditor.cpp
    }\r
    else {\r
      m_bHasName = true;\r
-Index: Source/ResourceEditor.h
---- ../release/nsis-2.17-src/Source/ResourceEditor.h   2006-04-28 08:54:42.000000000 -0700
-+++ ./Source/ResourceEditor.h  2006-07-31 05:48:44.000000000 -0700
-@@ -173,7 +173,7 @@
+Index: Source/ResourceEditor.h\r
+--- ../release/nsis-2.17-src/Source/ResourceEditor.h   2006-04-28 08:54:42.000000000 -0700\r
++++ ./Source/ResourceEditor.h  2006-07-31 05:48:44.000000000 -0700\r
+@@ -173,7 +173,7 @@\r
  \r
    void Destroy();\r
  \r
@@ -310,7 +310,7 @@ Index: Source/ResourceEditor.h
  \r
  private:\r
    IMAGE_RESOURCE_DIRECTORY m_rdDir;\r
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@\r
  \r
    CResourceDataEntry* GetDataEntry();\r
  \r
@@ -319,7 +319,7 @@ Index: Source/ResourceEditor.h
  \r
  private:\r
    bool m_bHasName;\r
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@\r
    DWORD GetSize();\r
    DWORD GetCodePage();\r
  \r
@@ -328,10 +328,10 @@ Index: Source/ResourceEditor.h
  \r
  private:\r
    BYTE* m_pbData;\r
-Index: Source/script.cpp
---- ../release/nsis-2.17-src/Source/script.cpp 2006-03-28 10:22:34.000000000 -0800
-+++ ./Source/script.cpp        2006-07-31 20:56:03.000000000 -0700
-@@ -4748,8 +4748,8 @@
+Index: Source/script.cpp\r
+--- ../release/nsis-2.17-src/Source/script.cpp 2006-03-28 10:22:34.000000000 -0800\r
++++ ./Source/script.cpp        2006-07-31 20:56:03.000000000 -0700\r
+@@ -4748,8 +4748,8 @@\r
            {\r
              struct\r
              {\r
@@ -342,7 +342,7 @@ Index: Source/script.cpp
              } words;\r
              long long ll;\r
            };\r
-@@ -6075,8 +6075,8 @@
+@@ -6075,8 +6075,8 @@\r
          {\r
            struct\r
            {\r
@@ -353,10 +353,10 @@ Index: Source/script.cpp
            } words;\r
            long long ll;\r
          };\r
-Index: Source/util.cpp
---- ../release/nsis-2.17-src/Source/util.cpp   2006-04-28 08:54:42.000000000 -0700
-+++ ./Source/util.cpp  2006-07-31 05:48:44.000000000 -0700
-@@ -312,7 +312,7 @@
+Index: Source/util.cpp\r
+--- ../release/nsis-2.17-src/Source/util.cpp   2006-04-28 08:54:42.000000000 -0700\r
++++ ./Source/util.cpp  2006-07-31 05:48:44.000000000 -0700\r
+@@ -312,7 +312,7 @@\r
    FIX_ENDIAN_INT32_INPLACE(rdEntry.OffsetToData);\r
    MY_ASSERT(!rdEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");\r
  \r
@@ -365,7 +365,7 @@ Index: Source/util.cpp
  \r
    MY_ASSERT((size_t)rdIcons - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");\r
  \r
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@\r
      FIX_ENDIAN_INT32_INPLACE(icoEntry.OffsetToData);\r
  \r
      MY_ASSERT(!icoEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");\r
@@ -374,7 +374,7 @@ Index: Source/util.cpp
      \r
      MY_ASSERT((size_t)rd - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");\r
  \r
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@\r
  \r
      MY_ASSERT(datEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");\r
      \r
@@ -383,7 +383,7 @@ Index: Source/util.cpp
  \r
      MY_ASSERT((size_t)rde - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");\r
  \r
-@@ -355,10 +355,10 @@
+@@ -355,10 +355,10 @@\r
      }\r
  \r
      // Set offset\r
@@ -396,10 +396,10 @@ Index: Source/util.cpp
    }\r
  \r
    LPBYTE seeker = uninstIconData;\r
-Index: Source/writer.cpp
---- ../release/nsis-2.17-src/Source/writer.cpp 2006-03-11 03:13:07.000000000 -0800
-+++ ./Source/writer.cpp        2006-07-31 13:27:37.000000000 -0700
-@@ -64,7 +64,7 @@
+Index: Source/writer.cpp\r
+--- ../release/nsis-2.17-src/Source/writer.cpp 2006-03-11 03:13:07.000000000 -0800\r
++++ ./Source/writer.cpp        2006-07-31 13:27:37.000000000 -0700\r
+@@ -64,7 +64,7 @@\r
  }\r
  \r
  #ifdef NSIS_CONFIG_CRC_SUPPORT\r
@@ -408,10 +408,10 @@ Index: Source/writer.cpp
  \r
  void crc_writer_sink::write_data(const void *data, const size_t size)\r
  {\r
-Index: Source/writer.h
---- ../release/nsis-2.17-src/Source/writer.h   2006-03-11 03:13:07.000000000 -0800
-+++ ./Source/writer.h  2006-07-31 13:27:58.000000000 -0700
-@@ -57,12 +57,12 @@
+Index: Source/writer.h\r
+--- ../release/nsis-2.17-src/Source/writer.h   2006-03-11 03:13:07.000000000 -0800\r
++++ ./Source/writer.h  2006-07-31 13:27:58.000000000 -0700\r
+@@ -57,12 +57,12 @@\r
  #ifdef NSIS_CONFIG_CRC_SUPPORT\r
  class crc_writer_sink : public writer_sink {\r
  public:\r
index 9e735b563508c28db4aa74aaf92ed21f0c7b9358..c57fb447bad5be332303745d887f01275df11036 100644 (file)
@@ -1,37 +1,37 @@
-; PE Builder v3 plug-in INF file for bacula
-; Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
-
-; Thu Dec 09 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
-; ASSIGNMENT OF COPYRIGHT
-; FOR VALUE RECEIVED, D. Scott Barninger hereby sells, transfers and 
-; assigns unto Kern Sibbald, his successors, assigns and personal representatives, 
-; all right, title and interest in and to the copyright in this software.
-; D. Scott Barninger warrants good title to said copyright, that it is 
-; free of all liens, encumbrances or any known claims against said copyright.
-
-; licensed under the GNU GPL v2
-
-[Version]
-Signature= "$Windows NT$"
-
-[PEBuilder]
-Name="Bacula Client"
-Enable=1
-
-[WinntDirectories]
-a="Programs\bacula",3
-
-[SourceDisksFiles]
-files\bacula-fd.exe=a,,1
-files\bacula-fd.conf=a,,1
-files\bconsole.exe=a,,1
-files\bconsole.conf=a,,1
-files\License.txt=a,,1
-files\pthreadVCE.dll=a,,1
-files\msvcr71.dll=a,,1
-files\wx-console.exe=a,,1
-files\wx-console.conf=a,,1
-files\msvcr71.dll=a,,1
-
-[Append]
-nu2menu.xml, bacula_nu2menu.xml
+; PE Builder v3 plug-in INF file for bacula\r
+; Copyright (C) 2004-2006 Free Software Foundation Europe e.V.\r
+\r
+; Thu Dec 09 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>\r
+; ASSIGNMENT OF COPYRIGHT\r
+; FOR VALUE RECEIVED, D. Scott Barninger hereby sells, transfers and \r
+; assigns unto Kern Sibbald, his successors, assigns and personal representatives, \r
+; all right, title and interest in and to the copyright in this software.\r
+; D. Scott Barninger warrants good title to said copyright, that it is \r
+; free of all liens, encumbrances or any known claims against said copyright.\r
+\r
+; licensed under the GNU GPL v2\r
+\r
+[Version]\r
+Signature= "$Windows NT$"\r
+\r
+[PEBuilder]\r
+Name="Bacula Client"\r
+Enable=1\r
+\r
+[WinntDirectories]\r
+a="Programs\bacula",3\r
+\r
+[SourceDisksFiles]\r
+files\bacula-fd.exe=a,,1\r
+files\bacula-fd.conf=a,,1\r
+files\bconsole.exe=a,,1\r
+files\bconsole.conf=a,,1\r
+files\License.txt=a,,1\r
+files\pthreadVCE.dll=a,,1\r
+files\msvcr71.dll=a,,1\r
+files\wx-console.exe=a,,1\r
+files\wx-console.conf=a,,1\r
+files\msvcr71.dll=a,,1\r
+\r
+[Append]\r
+nu2menu.xml, bacula_nu2menu.xml\r
index ccd36dfd5410b94a908ad5da5a529cf63bd3617e..7b41bda25f9c07ec8ea3356181496910067c3da6 100644 (file)
@@ -1,19 +1,19 @@
-<!-- Nu2Menu entry -->
-<!-- Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
-
-<!-- Thu Dec 09 2004 D. Scott Barninger <barninger at fairfieldcomputers.com> -->
-<!-- ASSIGNMENT OF COPYRIGHT -->
-<!-- FOR VALUE RECEIVED, D. Scott Barninger hereby sells, transfers and  -->
-<!-- assigns unto Kern Sibbald, his successors, assigns and personal representatives, --> 
-<!-- all right, title and interest in and to the copyright in this software. -->
-<!-- D. Scott Barninger warrants good title to said copyright, that it is  -->
-<!-- free of all liens, encumbrances or any known claims against said copyright. -->
-
-<!-- licensed under the GNU GPL v2 -->
-<NU2MENU>
-        <MENU ID="Programs">                    
-                <MITEM TYPE="ITEM" DISABLED="@Not(@FileExists(@GetProgramDrive()\Programs\bacula\bacula-fd.exe))" CMD="RUN" FUNC="@Null(@ChangeDir(@GetProgramDrive()\Programs\bacula))@GetProgramDrive()\Programs\bacula\bacula-fd.exe /install">Install Bacula Client Service</MITEM>
-                <MITEM TYPE="ITEM" CMD="RUN" FUNC="net start bacula">Start Bacula Client Service</MITEM>
-                <MITEM TYPE="ITEM" DISABLED="@Not(@FileExists(@GetProgramDrive()\Programs\bacula\wx-console.exe))" CMD="RUN" FUNC="@Null(@ChangeDir(@GetProgramDrive()\Programs\bacula))@GetProgramDrive()\Programs\bacula\wx-console.exe -w b:\">Bacula WX-Console</MITEM>
-        </MENU>
-</NU2MENU>
+<!-- Nu2Menu entry -->\r
+<!-- Copyright (C) 2004-2006 Free Software Foundation Europe e.V.\r
+\r
+<!-- Thu Dec 09 2004 D. Scott Barninger <barninger at fairfieldcomputers.com> -->\r
+<!-- ASSIGNMENT OF COPYRIGHT -->\r
+<!-- FOR VALUE RECEIVED, D. Scott Barninger hereby sells, transfers and  -->\r
+<!-- assigns unto Kern Sibbald, his successors, assigns and personal representatives, --> \r
+<!-- all right, title and interest in and to the copyright in this software. -->\r
+<!-- D. Scott Barninger warrants good title to said copyright, that it is  -->\r
+<!-- free of all liens, encumbrances or any known claims against said copyright. -->\r
+\r
+<!-- licensed under the GNU GPL v2 -->\r
+<NU2MENU>\r
+        <MENU ID="Programs">                    \r
+                <MITEM TYPE="ITEM" DISABLED="@Not(@FileExists(@GetProgramDrive()\Programs\bacula\bacula-fd.exe))" CMD="RUN" FUNC="@Null(@ChangeDir(@GetProgramDrive()\Programs\bacula))@GetProgramDrive()\Programs\bacula\bacula-fd.exe /install">Install Bacula Client Service</MITEM>\r
+                <MITEM TYPE="ITEM" CMD="RUN" FUNC="net start bacula">Start Bacula Client Service</MITEM>\r
+                <MITEM TYPE="ITEM" DISABLED="@Not(@FileExists(@GetProgramDrive()\Programs\bacula\wx-console.exe))" CMD="RUN" FUNC="@Null(@ChangeDir(@GetProgramDrive()\Programs\bacula))@GetProgramDrive()\Programs\bacula\wx-console.exe -w b:\">Bacula WX-Console</MITEM>\r
+        </MENU>\r
+</NU2MENU>\r
index 52966bccda8c4a24417fca7acbecce756cabc63a..9d9ad1ec30443db42e5db48faacb6f544e83d325 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="bsleep"
-       ProjectGUID="{0F56AEB0-14DA-4A80-8962-1F85A17339D0}"
-       RootNamespace="bsleep"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                               DisableSpecificWarnings="4996"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="0"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               DisableSpecificWarnings="4996"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\bsleep.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bsleep"\r
+       ProjectGUID="{0F56AEB0-14DA-4A80-8962-1F85A17339D0}"\r
+       RootNamespace="bsleep"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bsleep.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 8b4978c46678e4913f03e13cae7596d84c56bcb6..854c0938ea274045a71c1074a12a71b151006365 100644 (file)
-@echo off
-REM
-REM
-REM Bacula interface to mtx autoloader
-REM
-REM  $Id$
-REM
-REM  If you set in your Device resource
-REM
-REM  Changer Command = "mtx-changer %c %o %S %a %d"
-REM    you will have the following input to this script:
-REM
-REM  Bacula will always call with all the following arguments, even though
-REM    in some cases, not all are used.
-REM
-REM  mtx-changer "changer-device" "command" "slot" "archive-device" "drive-index"
-REM                     %1           %2       %3          %4             %5
-REM
-REM  for example:
-REM
-REM  mtx-changer Changer0 load 1 Tape0 0
-REM 
-REM  will request to load the first cartidge into drive 0, where
-REM   the changer device is Changer0, and the read/write device
-REM   is Tape0.
-REM
-REM  If you need to an offline, refer to the drive as %4
-REM    e.g.   mt -f %4 offline
-REM
-REM  Many changers need an offline after the unload. Also many
-REM   changers need a sleep 60 after the mtx load.
-REM
-REM  N.B. If you change the script, take care to return either 
-REM   the mtx exit code or a 0. If the script exits with a non-zero
-REM   exit code, Bacula will assume the request failed.
-REM
-
-SET MTX="@bin_dir_cmd@\mtx.exe"
-SET MT="@bin_dir_cmd@\mt.exe"
-SET working_dir=@working_dir_cmd@
-
-SET dbgfile="%working_dir%\mtx.log"
-
-REM to turn on logging, uncomment the following line
-REM copy nul "%working_dir%\mtx.log"
-
-REM
-REM check parameter count on commandline
-REM
-REM Check for special cases where only 2 arguments are needed, 
-REM  all others are a minimum of 5
-REM
-IF "%1" EQU "" goto :param_count_invalid
-IF "%2" EQU "" goto :param_count_invalid
-IF "%2" EQU "list" goto :param_count_valid
-IF "%2" EQU "slots" goto :param_count_valid
-IF "%3" EQU "" goto :param_count_invalid
-IF "%4" EQU "" goto :param_count_invalid
-IF "%5" EQU "" goto :param_count_invalid
-GOTO :param_count_valid
-
-:param_count_invalid
-   echo Insufficient number of arguments given.
-   IF "%2" EQU "" (
-      echo   At least two arguments must be specified.
-   ) else echo   Command expected 5 arguments.
-:usage
-   ECHO.
-   ECHO usage: mtx-changer ctl-device command [slot archive-device drive-index]
-   ECHO        Valid commands are: unload, load, list, loaded, and slots.
-   EXIT /B 1
-
-:param_count_valid
-
-REM Setup arguments
-SET ctl=%1
-SET cmd=%2
-SET slot=%3
-SET device=%4
-SET drive=%5
-
-CALL :debug "Parms: %ctl% %cmd% %slot% %device% %drive%"
-IF "%cmd%" EQU "unload" GOTO :cmdUnload
-IF "%cmd%" EQU "load" GOTO :cmdLoad
-IF "%cmd%" EQU "list" GOTO :cmdList
-IF "%cmd%" EQU "loaded" GOTO :cmdLoaded
-IF "%cmd%" EQU "slots" GOTO :cmdSlots
-GOTO :cmdUnknown
-
-:cmdUnload
-   CALL :debug "Doing mtx -f %ctl% unload %slot% %drive%"
-   %MT% -f %device% eject
-   %MTX% -f %ctl% unload %slot% %drive%
-   SET rtn=%ERRORLEVEL%
-   GOTO :cmdExit
-
-:cmdLoad
-   CALL :debug "Doing mtx -f %ctl% load %slot% %drive%"
-   %MTX% -f %ctl% load %slot% %drive%
-   SET rtn=%ERRORLEVEL%
-   IF ERRORLEVEL 1 GOTO :cmdExit
-REM %MT% -f %device% load
-REM bsleep 5
-   CALL :wait_for_drive %device%
-   GOTO :cmdExit
-
-:cmdList
-   CALL :debug "Doing mtx -f %ctl% -- to list volumes"
-   CALL :make_temp_file
-REM Enable the following if you are using barcodes and need an inventory
-REM   %MTX% -f %ctl% inventory
-   %MTX% -f %ctl% status >%TMPFILE%
-   SET rtn=%ERRORLEVEL%
-   IF ERRORLEVEL 1 GOTO :cmdExit
-   FOR /F "usebackq tokens=3,6 delims==: " %%i in ( `findstr /R /C:" *Storage Element [0-9]*:.*Full" %TMPFILE%` ) do echo %%i:%%j
-   FOR /F "usebackq tokens=7,10" %%i in ( `findstr /R /C:"^Data Transfer Element [0-9]*:Full (Storage Element [0-9]" %TMPFILE%` ) do echo %%i:%%j
-   DEL /F %TMPFILE% >nul 2>&1
-REM
-REM If you have a VXA PacketLoader and the above does not work, try
-REM  turning it off and enabling the following line.
-REM   %MTX% -f %ctl% status | grep " *Storage Element [0-9]*:.*Full" | sed "s/*Storage Element //" | sed "s/Full :VolumeTag=//"
-
-   GOTO :cmdExit
-
-:cmdLoaded
-   CALL :debug "Doing mtx -f %ctl% %drive% -- to find what is loaded"
-   CALL :make_temp_file
-   %MTX% -f %ctl% status >%TMPFILE%
-   SET rtn=%ERRORLEVEL%
-   IF ERRORLEVEL 1 GOTO :cmdExit
-   FOR /F "usebackq tokens=7" %%i in ( `findstr /R /C:"^Data Transfer Element %drive%:Full" %TMPFILE%` ) do echo %%i
-   findstr /R /C:"^Data Transfer Element %drive%:Empty" %TMPFILE% >nul && echo 0
-   DEL /F %TMPFILE% >nul 2>&1
-   GOTO :cmdExit
-
-:cmdSlots
-   CALL :debug "Doing mtx -f %ctl% -- to get count of slots"
-   CALL :make_temp_file
-   %MTX% -f %ctl% status >%TMPFILE%
-   SET rtn=%ERRORLEVEL%
-   IF ERRORLEVEL 1 GOTO :cmdExit
-   FOR /F "usebackq tokens=5" %%i in ( `findstr /R /C:" *Storage Changer" %TMPFILE%` ) do echo %%i
-   DEL /F %TMPFILE% >nul 2>&1
-   GOTO :cmdExit
-
-:cmdExit
-   EXIT /B %rtn%
-
-:cmdUnknown
-   ECHO '%cmd%' is an invalid command.
-   GOTO :usage
-
-REM
-REM log whats done
-REM
-:debug
-   IF NOT EXIST %dbgfile% GOTO :EOF
-   FOR /F "usebackq tokens=2-4,5-7 delims=/:. " %%i in ( '%DATE% %TIME%' ) do SET TIMESTAMP=%%k%%i%%j-%%l:%%m:%%n
-   ECHO %TIMESTAMP% %*>> %dbgfile%
-   GOTO :EOF
-
-REM
-REM Create a temporary file
-REM
-:make_temp_file
-   SET TMPFILE="%working_dir%\mtx.tmp"
-   IF EXIST %TMPFILE% (
-      ECHO Temp file security problem on: %TMPFILE%
-      EXIT /B 1
-   )
-   GOTO :EOF
-
-REM
-REM The purpose of this function to wait a maximum 
-REM   time for the drive. It will return as soon as 
-REM   the drive is ready, or after waiting a maximum 
-REM   of 300 seconds.
-REM
-:wait_for_drive
-   FOR /L %%i IN ( 1, 1, 300 ) DO (
-      %MT% -f %1 status | findstr ONLINE >NUL 2>&1
-      IF %ERRORLEVEL%==0 GOTO :EOF
-      CALL :debug "Device %1 - not ready, retrying..."
-      bsleep 1
-   )
-   CALL :debug "Device %1 - not ready, timed out..."
-   GOTO :EOF
+@echo off\r
+REM\r
+REM\r
+REM Bacula interface to mtx autoloader\r
+REM\r
+REM  $Id: mtx-changer.cmd 3718 2006-12-01 08:45:40Z robertnelson $\r
+REM\r
+REM  If you set in your Device resource\r
+REM\r
+REM  Changer Command = "mtx-changer %c %o %S %a %d"\r
+REM    you will have the following input to this script:\r
+REM\r
+REM  Bacula will always call with all the following arguments, even though\r
+REM    in some cases, not all are used.\r
+REM\r
+REM  mtx-changer "changer-device" "command" "slot" "archive-device" "drive-index"\r
+REM                     %1           %2       %3          %4             %5\r
+REM\r
+REM  for example:\r
+REM\r
+REM  mtx-changer Changer0 load 1 Tape0 0\r
+REM \r
+REM  will request to load the first cartidge into drive 0, where\r
+REM   the changer device is Changer0, and the read/write device\r
+REM   is Tape0.\r
+REM\r
+REM  If you need to an offline, refer to the drive as %4\r
+REM    e.g.   mt -f %4 offline\r
+REM\r
+REM  Many changers need an offline after the unload. Also many\r
+REM   changers need a sleep 60 after the mtx load.\r
+REM\r
+REM  N.B. If you change the script, take care to return either \r
+REM   the mtx exit code or a 0. If the script exits with a non-zero\r
+REM   exit code, Bacula will assume the request failed.\r
+REM\r
+\r
+SET MTX="@bin_dir_cmd@\mtx.exe"\r
+SET MT="@bin_dir_cmd@\mt.exe"\r
+SET working_dir=@working_dir_cmd@\r
+\r
+SET dbgfile="%working_dir%\mtx.log"\r
+\r
+REM to turn on logging, uncomment the following line\r
+REM copy nul "%working_dir%\mtx.log"\r
+\r
+REM\r
+REM check parameter count on commandline\r
+REM\r
+REM Check for special cases where only 2 arguments are needed, \r
+REM  all others are a minimum of 5\r
+REM\r
+IF "%1" EQU "" goto :param_count_invalid\r
+IF "%2" EQU "" goto :param_count_invalid\r
+IF "%2" EQU "list" goto :param_count_valid\r
+IF "%2" EQU "slots" goto :param_count_valid\r
+IF "%3" EQU "" goto :param_count_invalid\r
+IF "%4" EQU "" goto :param_count_invalid\r
+IF "%5" EQU "" goto :param_count_invalid\r
+GOTO :param_count_valid\r
+\r
+:param_count_invalid\r
+   echo Insufficient number of arguments given.\r
+   IF "%2" EQU "" (\r
+      echo   At least two arguments must be specified.\r
+   ) else echo   Command expected 5 arguments.\r
+:usage\r
+   ECHO.\r
+   ECHO usage: mtx-changer ctl-device command [slot archive-device drive-index]\r
+   ECHO        Valid commands are: unload, load, list, loaded, and slots.\r
+   EXIT /B 1\r
+\r
+:param_count_valid\r
+\r
+REM Setup arguments\r
+SET ctl=%1\r
+SET cmd=%2\r
+SET slot=%3\r
+SET device=%4\r
+SET drive=%5\r
+\r
+CALL :debug "Parms: %ctl% %cmd% %slot% %device% %drive%"\r
+IF "%cmd%" EQU "unload" GOTO :cmdUnload\r
+IF "%cmd%" EQU "load" GOTO :cmdLoad\r
+IF "%cmd%" EQU "list" GOTO :cmdList\r
+IF "%cmd%" EQU "loaded" GOTO :cmdLoaded\r
+IF "%cmd%" EQU "slots" GOTO :cmdSlots\r
+GOTO :cmdUnknown\r
+\r
+:cmdUnload\r
+   CALL :debug "Doing mtx -f %ctl% unload %slot% %drive%"\r
+   %MT% -f %device% eject\r
+   %MTX% -f %ctl% unload %slot% %drive%\r
+   SET rtn=%ERRORLEVEL%\r
+   GOTO :cmdExit\r
+\r
+:cmdLoad\r
+   CALL :debug "Doing mtx -f %ctl% load %slot% %drive%"\r
+   %MTX% -f %ctl% load %slot% %drive%\r
+   SET rtn=%ERRORLEVEL%\r
+   IF ERRORLEVEL 1 GOTO :cmdExit\r
+REM %MT% -f %device% load\r
+REM bsleep 5\r
+   CALL :wait_for_drive %device%\r
+   GOTO :cmdExit\r
+\r
+:cmdList\r
+   CALL :debug "Doing mtx -f %ctl% -- to list volumes"\r
+   CALL :make_temp_file\r
+REM Enable the following if you are using barcodes and need an inventory\r
+REM   %MTX% -f %ctl% inventory\r
+   %MTX% -f %ctl% status >%TMPFILE%\r
+   SET rtn=%ERRORLEVEL%\r
+   IF ERRORLEVEL 1 GOTO :cmdExit\r
+   FOR /F "usebackq tokens=3,6 delims==: " %%i in ( `findstr /R /C:" *Storage Element [0-9]*:.*Full" %TMPFILE%` ) do echo %%i:%%j\r
+   FOR /F "usebackq tokens=7,10" %%i in ( `findstr /R /C:"^Data Transfer Element [0-9]*:Full (Storage Element [0-9]" %TMPFILE%` ) do echo %%i:%%j\r
+   DEL /F %TMPFILE% >nul 2>&1\r
+REM\r
+REM If you have a VXA PacketLoader and the above does not work, try\r
+REM  turning it off and enabling the following line.\r
+REM   %MTX% -f %ctl% status | grep " *Storage Element [0-9]*:.*Full" | sed "s/*Storage Element //" | sed "s/Full :VolumeTag=//"\r
+\r
+   GOTO :cmdExit\r
+\r
+:cmdLoaded\r
+   CALL :debug "Doing mtx -f %ctl% %drive% -- to find what is loaded"\r
+   CALL :make_temp_file\r
+   %MTX% -f %ctl% status >%TMPFILE%\r
+   SET rtn=%ERRORLEVEL%\r
+   IF ERRORLEVEL 1 GOTO :cmdExit\r
+   FOR /F "usebackq tokens=7" %%i in ( `findstr /R /C:"^Data Transfer Element %drive%:Full" %TMPFILE%` ) do echo %%i\r
+   findstr /R /C:"^Data Transfer Element %drive%:Empty" %TMPFILE% >nul && echo 0\r
+   DEL /F %TMPFILE% >nul 2>&1\r
+   GOTO :cmdExit\r
+\r
+:cmdSlots\r
+   CALL :debug "Doing mtx -f %ctl% -- to get count of slots"\r
+   CALL :make_temp_file\r
+   %MTX% -f %ctl% status >%TMPFILE%\r
+   SET rtn=%ERRORLEVEL%\r
+   IF ERRORLEVEL 1 GOTO :cmdExit\r
+   FOR /F "usebackq tokens=5" %%i in ( `findstr /R /C:" *Storage Changer" %TMPFILE%` ) do echo %%i\r
+   DEL /F %TMPFILE% >nul 2>&1\r
+   GOTO :cmdExit\r
+\r
+:cmdExit\r
+   EXIT /B %rtn%\r
+\r
+:cmdUnknown\r
+   ECHO '%cmd%' is an invalid command.\r
+   GOTO :usage\r
+\r
+REM\r
+REM log whats done\r
+REM\r
+:debug\r
+   IF NOT EXIST %dbgfile% GOTO :EOF\r
+   FOR /F "usebackq tokens=2-4,5-7 delims=/:. " %%i in ( '%DATE% %TIME%' ) do SET TIMESTAMP=%%k%%i%%j-%%l:%%m:%%n\r
+   ECHO %TIMESTAMP% %*>> %dbgfile%\r
+   GOTO :EOF\r
+\r
+REM\r
+REM Create a temporary file\r
+REM\r
+:make_temp_file\r
+   SET TMPFILE="%working_dir%\mtx.tmp"\r
+   IF EXIST %TMPFILE% (\r
+      ECHO Temp file security problem on: %TMPFILE%\r
+      EXIT /B 1\r
+   )\r
+   GOTO :EOF\r
+\r
+REM\r
+REM The purpose of this function to wait a maximum \r
+REM   time for the drive. It will return as soon as \r
+REM   the drive is ready, or after waiting a maximum \r
+REM   of 300 seconds.\r
+REM\r
+:wait_for_drive\r
+   FOR /L %%i IN ( 1, 1, 300 ) DO (\r
+      %MT% -f %1 status | findstr ONLINE >NUL 2>&1\r
+      IF %ERRORLEVEL%==0 GOTO :EOF\r
+      CALL :debug "Device %1 - not ready, retrying..."\r
+      bsleep 1\r
+   )\r
+   CALL :debug "Device %1 - not ready, timed out..."\r
+   GOTO :EOF\r
index ffc1c9416dfa9c8a293c720f11c88804d048343a..8296f138ed83152fb6daddfcda0adf0c738277dc 100644 (file)
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity 
-    version="1.0.0.0" 
-    processorArchitecture="X86" 
-    name="Bacula.Bacula-sd" 
-    type="win32" /> 
-  <description>Bacula Storage daemon for Win32</description> 
-  <dependency> 
-    <dependentAssembly> 
-      <assemblyIdentity 
-        type="win32" 
-        name="Microsoft.Windows.Common-Controls" 
-        version="6.0.0.0" 
-        processorArchitecture="X86" 
-        publicKeyToken="6595b64144ccf1df" 
-        language="*" /> 
-    </dependentAssembly> 
-  </dependency> 
-</assembly> 
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> \r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> \r
+  <assemblyIdentity \r
+    version="1.0.0.0" \r
+    processorArchitecture="X86" \r
+    name="Bacula.Bacula-sd" \r
+    type="win32" /> \r
+  <description>Bacula Storage daemon for Win32</description> \r
+  <dependency> \r
+    <dependentAssembly> \r
+      <assemblyIdentity \r
+        type="win32" \r
+        name="Microsoft.Windows.Common-Controls" \r
+        version="6.0.0.0" \r
+        processorArchitecture="X86" \r
+        publicKeyToken="6595b64144ccf1df" \r
+        language="*" /> \r
+    </dependentAssembly> \r
+  </dependency> \r
+</assembly> \r
+\r
index 5849beb8e3e86356a70a6ec9b02955c282e1d8af..c3371e7de1332ae5546e269c77ea3a9b4bf60169 100644 (file)
@@ -1 +1 @@
-1 ICON  "apcupsd.ico"
+1 ICON  "apcupsd.ico"\r
index 72f86f03dfb0f5442c2f5612f51cd83a102b94d6..a9de8f2edaad4c69f98d4aa925463a6a339322a7 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="baculasd"
-       ProjectGUID="{F5F063F8-11A1-475A-82E2-19759BB40B25}"
-       RootNamespace="baculasd"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\Debug/baculasd.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib atlsd.lib"
-                               OutputFile="$(OutDir)/bacula-sd.exe"
-                               LinkIncremental="0"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"
-                               IgnoreDefaultLibraryNames="msvcrt"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               SuppressStartupBanner="true"
-                               OutputFile=".\Debug/baculasd.bsc"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       UseOfATL="1"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\Release/baculasd.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=""
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib atls.lib"
-                               OutputFile="$(OutDir)\bacula-sd.exe"
-                               LinkIncremental="0"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"
-                               DelayLoadDLLs="$(NOINHERIT)"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               SuppressStartupBanner="true"
-                               OutputFile=".\Release/baculasd.bsc"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\mtops.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\status.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\stored.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath=".\winabout.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winmain.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath=".\winservice.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath=".\winstat.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\wintray.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\..\stored\block.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\bsr.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\dev.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\protos.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\record.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\reserve.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\stored.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\stored\stored_conf.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winabout.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winbacula.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winres.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winservice.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winstat.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\wintray.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath=".\bacula-sd.manifest"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\bacula.bmp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\bacula.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\error.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\idle.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\running.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\warn.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\winres.rc"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="baculasd"\r
+       ProjectGUID="{F5F063F8-11A1-475A-82E2-19759BB40B25}"\r
+       RootNamespace="baculasd"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TypeLibraryName=".\Debug/baculasd.tlb"\r
+                               HeaderFileName=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib atlsd.lib"\r
+                               OutputFile="$(OutDir)/bacula-sd.exe"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
+                               IgnoreDefaultLibraryNames="msvcrt"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               SuppressStartupBanner="true"\r
+                               OutputFile=".\Debug/baculasd.bsc"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       UseOfATL="1"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TypeLibraryName=".\Release/baculasd.tlb"\r
+                               HeaderFileName=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib atls.lib"\r
+                               OutputFile="$(OutDir)\bacula-sd.exe"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
+                               DelayLoadDLLs="$(NOINHERIT)"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               SuppressStartupBanner="true"\r
+                               OutputFile=".\Release/baculasd.bsc"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\mtops.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\status.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\stored.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winabout.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winmain.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winservice.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winstat.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\wintray.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\stored\block.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\bsr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\dev.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\protos.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\record.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\reserve.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\stored.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\stored\stored_conf.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winabout.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winbacula.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winres.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winservice.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winstat.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\wintray.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bacula-sd.manifest"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bacula.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bacula.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\error.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\idle.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\running.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\warn.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\winres.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 95b5236077d106ee4f0596baf91a1b08a1c6ff7d..425817d2aa44b6ddbeed3027eaf049ba393a3a8c 100644 (file)
-#include <winuser.h>
-#include <winver.h>
-#include "winres.h"
-#include "../../../version.h"
-
-/* NB: Internationalization of this file will require some work... */
-#define N_(s) s
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icons
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_BACULA              ICON    "bacula.ico"
-IDI_IDLE                ICON    "idle.ico"
-IDI_RUNNING             ICON    "running.ico"
-IDI_JOB_ERROR           ICON    "error.ico"
-IDI_JOB_WARNING         ICON    "warn.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAYMENU MENU
-BEGIN
-    POPUP "tray"
-    BEGIN
-        MENUITEM N_("&Status"),                     ID_STATUS
-        MENUITEM SEPARATOR
-        MENUITEM N_("&About Bacula"),               ID_ABOUT
-        MENUITEM SEPARATOR
-        MENUITEM N_("&Close Bacula"),               ID_CLOSE
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0 //
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E0" // Lang=US English, CharSet=Windows Multiligual
-        BEGIN
-            VALUE "Comments", "by Kern Sibbald\0"
-            VALUE "CompanyName", "            \0"
-            VALUE "FileDescription", "Bacula Storage daemon for Win32\0"
-            VALUE "FileVersion", VERSION "\0"
-            VALUE "InternalName", "Bacula\0"
-            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2006\0"
-            VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"
-            VALUE "OriginalFilename", "bacula-sd.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Bacula - Win32 Version\0"
-            VALUE "ProductVersion", VERSION
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252 // US English, Multilingual
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-CREATEPROCESS_MANIFEST_RESOURCE_ID     RT_MANIFEST    "bacula-sd.manifest"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BACULABMP           BITMAP  "bacula.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDI_BACULA              "Bacula"
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// About Dialog
-//
-
-IDD_ABOUT DIALOG  0, 0, 250, 145
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About Bacula"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,190,120,50,15
-//  CONTROL         "\3", IDC_BACULABMP,"Static",SS_ICON | SS_CENTERIMAGE |
-//                  SS_SUNKEN,7,5,73,65
-#ifndef HAVE_MINGW
-    CONTROL         IDB_BACULABMP,IDB_BACULABMP,"Static",SS_BITMAP|SS_SUNKEN,7,5,32,32
-#endif
-
-    LTEXT           N_("      by Kern Sibbald"),-1,134,38,78,10
-    LTEXT           N_("For more information, see:"),-1,115,60,100,10
-    LTEXT           "         www.bacula.org",-1,115,70,100,10
-//    LTEXT           "                 ",-1,69,81,100,10
-//    LTEXT           "                 ",-1,90,70,100,10
-    LTEXT           "Copyright (C) 1999-2006, Kern Sibbald",-1,7,120,175,10
-    LTEXT           N_("Licensed under GNU GPL 2.0."),-1,7,130,175,10
-    RTEXT           N_("Build Date:"),-1,108,24,42,8
-    RTEXT           N_("Bacula Version:"),-1,100,9,50,8
-    LTEXT           VERSION,-1,159,10,65,8
-    LTEXT           BDATE,-1,159,24,65,10
-
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Status Dialog
-//
-
-IDD_STATUS DIALOGEX 0, 0, 411, 244
-STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION N_("Bacula Status")
-FONT 8, "Courier New"
-BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,355,5,51,15
-    EDITTEXT        IDC_TEXTDISPLAY, 2, 2, 350, 240, WS_VSCROLL | WS_HSCROLL | WS_BORDER | ES_READONLY | ES_MULTILINE
-END
+#include <winuser.h>\r
+#include <winver.h>\r
+#include "winres.h"\r
+#include "../../../version.h"\r
+\r
+/* NB: Internationalization of this file will require some work... */\r
+#define N_(s) s\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icons\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_BACULA              ICON    "bacula.ico"\r
+IDI_IDLE                ICON    "idle.ico"\r
+IDI_RUNNING             ICON    "running.ico"\r
+IDI_JOB_ERROR           ICON    "error.ico"\r
+IDI_JOB_WARNING         ICON    "warn.ico"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Menu\r
+//\r
+\r
+IDR_TRAYMENU MENU\r
+BEGIN\r
+    POPUP "tray"\r
+    BEGIN\r
+        MENUITEM N_("&Status"),                     ID_STATUS\r
+        MENUITEM SEPARATOR\r
+        MENUITEM N_("&About Bacula"),               ID_ABOUT\r
+        MENUITEM SEPARATOR\r
+        MENUITEM N_("&Close Bacula"),               ID_CLOSE\r
+    END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION 1,1,0,0\r
+ PRODUCTVERSION 1,1,0,0\r
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0 //\r
+#endif\r
+ FILEOS VOS_NT_WINDOWS32\r
+ FILETYPE VFT_APP\r
+ FILESUBTYPE 0\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040904E0" // Lang=US English, CharSet=Windows Multiligual\r
+        BEGIN\r
+            VALUE "Comments", "by Kern Sibbald\0"\r
+            VALUE "CompanyName", "            \0"\r
+            VALUE "FileDescription", "Bacula Storage daemon for Win32\0"\r
+            VALUE "FileVersion", VERSION "\0"\r
+            VALUE "InternalName", "Bacula\0"\r
+            VALUE "LegalCopyright", "Copyright Free Software Foundation Europe e.V., 1999-2006\0"\r
+            VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"\r
+            VALUE "OriginalFilename", "bacula-sd.exe\0"\r
+            VALUE "PrivateBuild", "\0"\r
+            VALUE "ProductName", "Bacula - Win32 Version\0"\r
+            VALUE "ProductVersion", VERSION\r
+            VALUE "SpecialBuild", "\0"\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x409, 1252 // US English, Multilingual\r
+    END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// RT_MANIFEST\r
+//\r
+CREATEPROCESS_MANIFEST_RESOURCE_ID     RT_MANIFEST    "bacula-sd.manifest"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Bitmap\r
+//\r
+\r
+IDB_BACULABMP           BITMAP  "bacula.bmp"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// String Table\r
+//\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDI_BACULA              "Bacula"\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// About Dialog\r
+//\r
+\r
+IDD_ABOUT DIALOG  0, 0, 250, 145\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "About Bacula"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,190,120,50,15\r
+//  CONTROL         "\3", IDC_BACULABMP,"Static",SS_ICON | SS_CENTERIMAGE |\r
+//                  SS_SUNKEN,7,5,73,65\r
+#ifndef HAVE_MINGW\r
+    CONTROL         IDB_BACULABMP,IDB_BACULABMP,"Static",SS_BITMAP|SS_SUNKEN,7,5,32,32\r
+#endif\r
+\r
+    LTEXT           N_("      by Kern Sibbald"),-1,134,38,78,10\r
+    LTEXT           N_("For more information, see:"),-1,115,60,100,10\r
+    LTEXT           "         www.bacula.org",-1,115,70,100,10\r
+//    LTEXT           "                 ",-1,69,81,100,10\r
+//    LTEXT           "                 ",-1,90,70,100,10\r
+    LTEXT           "Copyright (C) 1999-2006, Kern Sibbald",-1,7,120,175,10\r
+    LTEXT           N_("Licensed under GNU GPL 2.0."),-1,7,130,175,10\r
+    RTEXT           N_("Build Date:"),-1,108,24,42,8\r
+    RTEXT           N_("Bacula Version:"),-1,100,9,50,8\r
+    LTEXT           VERSION,-1,159,10,65,8\r
+    LTEXT           BDATE,-1,159,24,65,10\r
+\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Status Dialog\r
+//\r
+\r
+IDD_STATUS DIALOGEX 0, 0, 411, 244\r
+STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION N_("Bacula Status")\r
+FONT 8, "Courier New"\r
+BEGIN\r
+    DEFPUSHBUTTON   "&OK",IDOK,355,5,51,15\r
+    EDITTEXT        IDC_TEXTDISPLAY, 2, 2, 350, 240, WS_VSCROLL | WS_HSCROLL | WS_BORDER | ES_READONLY | ES_MULTILINE\r
+END\r
index 26245695179399d6adb15bcd62146620c9c8d014..345f1956a52da7f593943c25df5b8fc248cf0a67 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="postest"
-       ProjectGUID="{208D3989-794B-47A2-9D04-D7AEE1524078}"
-       RootNamespace="postest"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       UseOfATL="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="pthreadVCE.lib wsock32.lib atlsd.lib"
-                               LinkIncremental="0"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../../../depkgs-win32/pthreads/debug"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32"
-                               StringPooling="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="pthreadVCE.lib wsock32.lib atls.lib"
-                               LinkIncremental="1"
-                               AdditionalLibraryDirectories="../../../../../depkgs-win32/pthreads/debug"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\postest.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="postest"\r
+       ProjectGUID="{208D3989-794B-47A2-9D04-D7AEE1524078}"\r
+       RootNamespace="postest"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfATL="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pthreadVCE.lib wsock32.lib atlsd.lib"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-win32/pthreads/debug"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pthreadVCE.lib wsock32.lib atls.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-win32/pthreads/debug"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\postest.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 5d070ea1310d2a950832cfa5169e6c8877e536f7..97fb96b12446a45ca61414824f679cf438c36f05 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="bsmtp"
-       ProjectGUID="{AB67F297-8491-4515-8E52-BFF5340EC242}"
-       RootNamespace="bsmtp"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="0"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\debug"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="0"
-                               AdditionalLibraryDirectories="..\..\release"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\..\tools\bsmtp.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bsmtp"\r
+       ProjectGUID="{AB67F297-8491-4515-8E52-BFF5340EC242}"\r
+       RootNamespace="bsmtp"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\debug"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="..\..\release"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\tools\bsmtp.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index dd150699fc4b55aa4491b7ff975501c71ec3d39d..d847d39e6b51e161f93fb00e1aa05f2703276e72 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="dbcheck"
-       ProjectGUID="{85696E20-777A-41F6-BC00-2E7AB375B171}"
-       RootNamespace="dbcheck"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="bacula_cats.lib"
-                               LinkIncremental="0"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\debug"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="bacula_cats.lib"
-                               LinkIncremental="0"
-                               AdditionalLibraryDirectories="..\..\release"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\..\tools\dbcheck.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\dird\dird_conf.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\dird\inc_conf.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\..\dird\run_conf.c"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\..\dird\dird_conf.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="dbcheck"\r
+       ProjectGUID="{85696E20-777A-41F6-BC00-2E7AB375B171}"\r
+       RootNamespace="dbcheck"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="bacula_cats.lib"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\debug"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="bacula_cats.lib"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="..\..\release"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\tools\dbcheck.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\dird\dird_conf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\dird\inc_conf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\dird\run_conf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\dird\dird_conf.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 11a54d74fca4da1e0c3bc1cbf5f92342725dacb1..3afa5ca31d5bbfa8309c1d160580520567fa5145 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="scsilist"
-       ProjectGUID="{56D8C233-610E-4EE4-A73A-72CEF1C6A33A}"
-       RootNamespace="scsilist"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       UseOfMFC="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               PreprocessorDefinitions="WINVER=0x0400;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="4"
-                               Detect64BitPortabilityProblems="true"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="0"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       UseOfMFC="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="4"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="WINVER=0x0400;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="4"
-                               Detect64BitPortabilityProblems="true"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="advapi32.lib"
-                               LinkIncremental="0"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\ScsiDeviceList.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\scsilist.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\ScsiDeviceList.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="scsilist"\r
+       ProjectGUID="{56D8C233-610E-4EE4-A73A-72CEF1C6A33A}"\r
+       RootNamespace="scsilist"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WINVER=0x0400;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="0"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               PreprocessorDefinitions="WINVER=0x0400;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="advapi32.lib"\r
+                               LinkIncremental="0"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\ScsiDeviceList.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\scsilist.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\ScsiDeviceList.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index ef25e4796a22d47b2ff80f579590a3a781211b87..773a748d10d251919419d0d58e447c40495b59d8 100644 (file)
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity 
-    version="1.0.0.0" 
-    processorArchitecture="X86" 
-    name="Bacula.WX-Console" 
-    type="win32" /> 
-  <description>Bacula wx Console for Win32</description> 
-  <dependency> 
-    <dependentAssembly> 
-      <assemblyIdentity 
-        type="win32" 
-        name="Microsoft.Windows.Common-Controls" 
-        version="6.0.0.0" 
-        processorArchitecture="X86" 
-        publicKeyToken="6595b64144ccf1df" 
-        language="*" /> 
-    </dependentAssembly> 
-  </dependency> 
-</assembly> 
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> \r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> \r
+  <assemblyIdentity \r
+    version="1.0.0.0" \r
+    processorArchitecture="X86" \r
+    name="Bacula.WX-Console" \r
+    type="win32" /> \r
+  <description>Bacula wx Console for Win32</description> \r
+  <dependency> \r
+    <dependentAssembly> \r
+      <assemblyIdentity \r
+        type="win32" \r
+        name="Microsoft.Windows.Common-Controls" \r
+        version="6.0.0.0" \r
+        processorArchitecture="X86" \r
+        publicKeyToken="6595b64144ccf1df" \r
+        language="*" /> \r
+    </dependentAssembly> \r
+  </dependency> \r
+</assembly> \r
+\r