Parameterize depkgs directory

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9015 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 171b5fe15c75f11175ac1a5b6bdd468b2daa3bfd..0c8dce21292cb3d0f7e6722874b64943ce7a5b22 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -86,6 +86,7 @@ bsmtp:
 Makefile.inc:
        @echo Creating $@
        $(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
+       TOPDIR=$${DEPKGS:-$${TOPDIR}}; \
        if test "$(WIN64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
                BINDIR=$${TOPDIR}/cross-tools/mingw-w64/bin; \
                INCDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/include; \

diff --git a/bacula/src/win32/README.mingw b/bacula/src/win32/README.mingw
index 1adbfb351998488af7d07ef355021ba031356388..0aaf20f5a34bdce904920eb927b266c19680a722 100644 (file)
--- a/bacula/src/win32/README.mingw
+++ b/bacula/src/win32/README.mingw
@@ -15,17 +15,21 @@ We expect that there may be problems on systems other than Linux where you
 are pretty much on your own.  However, we will try to provide responses to
 your questions on the bacula-devel list, but we can't guarantee anything.
 
+Note: the environment variable DEPKGS must point to a directory that
+contains: depkgs-mingw32 depkgs-mingw-w64 and cross-tools
+
 Directory Structure
 =====================
 The new directory structure is:
 
-  bacula-top                 Top level directory -- any name
+ xxx  (any directory)
     bacula                   Top level Bacula source directory -- any name
       src
         win32                Main directory where Windows version is built.
 
     docs                     Top level Bacula documentation directory
 
+ yyy (any directory, but pointed to by the DEPKGS environment variable)
     depkgs-mingw32 (MinGW32) 3rd Party Dependencies for MinGW32 build
       bin              --    NOTE!  depkgs-msvc is no longer suppored
       include            |

diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def
index e70c7958a948419883fdd5b47b6b567caa9cb24a..44d3321588fe151fac27b6fe22c9bbf7afb1cd8d 100644 (file)
--- a/bacula/src/win32/cats/bacula_cats.def
+++ b/bacula/src/win32/cats/bacula_cats.def
@@ -1,153 +1,155 @@
-LIBRARY bacula_cats.dll\r
-EXPORTS\r
- \r
-; sql.o\r
-_Z10_db_unlockPKciP4B_DB\r
-_Z11db_strerrorP4B_DB\r
-_Z11list_dashesP4B_DBPFvPvPKcES1_\r
-_Z11list_resultP3JCRP4B_DBPFvPvPKcES3_11e_list_type\r
-_Z16db_int64_handlerPviPPc\r
-_Z18db_end_transactionP3JCRP4B_DB\r
-_Z18get_sql_record_maxP3JCRP4B_DB\r
-_Z19split_path_and_fileP3JCRP4B_DBPKc\r
-_Z20check_tables_versionP3JCRP4B_DB\r
-_Z20db_start_transactionP3JCRP4B_DB\r
-_Z23db_open_batch_connexionP3JCRP4B_DB\r
-_Z7db_initP3JCRPKcS2_S2_S2_S2_iS2_i\r
-_Z7QueryDBPKciP3JCRP4B_DBPc\r
-_Z8DeleteDBPKciP3JCRP4B_DBPc\r
-_Z8InsertDBPKciP3JCRP4B_DBPc\r
-_Z8UpdateDBPKciP3JCRP4B_DBPc\r
-_Z8_db_lockPKciP4B_DB\r
-_ZN9dbid_listC1Ev\r
-_ZN9dbid_listC2Ev\r
-_ZN9dbid_listD1Ev\r
-_ZN9dbid_listD2Ev\r
-_Z13_dbg_print_dbP3JCRP6_iobuf\r
- \r
-; sql_create.o\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
-_Z23db_create_device_recordP3JCRP4B_DBP10DEVICE_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
-_Z27db_write_batch_file_recordsP3JCR\r
-_Z32db_create_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR\r
- \r
-; sql_delete.o\r
-_Z21db_delete_pool_recordP3JCRP4B_DBP8POOL_DBR\r
-_Z21db_purge_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
-_Z22db_delete_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
- \r
-; sql_find.o\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
-_Z27db_find_last_job_start_timeP3JCRP4B_DBP7JOB_DBRPPci\r
- \r
-; sql_get.o\r
-_Z15db_get_pool_idsP3JCRP4B_DBPiPPj\r
-_Z16db_get_file_listP3JCRP4B_DBPcPFiPviPS3_ES4_\r
-_Z16db_get_media_idsP3JCRP4B_DBP9MEDIA_DBRPiPPj\r
-_Z17db_get_client_idsP3JCRP4B_DBPiPPj\r
-_Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR\r
-_Z18db_get_int_handlerPviPPc\r
-_Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR\r
-_Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list\r
-_Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
-_Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR\r
-_Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR\r
-_Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR\r
-_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRPc\r
-_Z23db_get_job_volume_namesP3JCRP4B_DBjPPc\r
-_Z23db_get_num_pool_recordsP3JCRP4B_DB\r
-_Z24db_get_num_media_recordsP3JCRP4B_DB\r
-_Z28db_get_job_volume_parametersP3JCRP4B_DBjPP10VOL_PARAMS\r
-_Z29db_get_file_attributes_recordP3JCRP4B_DBPcP7JOB_DBRP8FILE_DBR\r
- \r
-; sql_list.o\r
-_Z22db_list_copies_recordsP3JCRP4B_DBjPcPFvPvPKcES4_11e_list_type\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
-_Z22db_list_joblog_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type\r
-_Z24db_list_jobmedia_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type\r
- \r
-; sql_update.o\r
-_Z15db_update_statsP3JCRP4B_DBx\r
-_Z19db_mark_file_recordP3JCRP4B_DByj\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_DByPci\r
- \r
-_Z11db_get_typev\r
-_Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_\r
-_Z13db_next_indexP3JCRP4B_DBPcS3_\r
-_Z16db_escape_stringP3JCRP4B_DBPcS3_i\r
-_Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i\r
-_Z16db_open_databaseP3JCRP4B_DB\r
-_Z17db_close_databaseP3JCRP4B_DB\r
-_Z17db_thread_cleanupv\r
-\r
-db_type DATA\r
-client_backups DATA\r
-list_pool DATA\r
-drop_deltabs DATA\r
-create_deltabs DATA\r
-create_delindex 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_copy_del DATA\r
-select_job DATA\r
-count_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
-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
+LIBRARY bacula_cats.dll
+EXPORTS
+ 
+; sql.o
+_Z10_db_unlockPKciP4B_DB
+_Z11db_strerrorP4B_DB
+_Z11list_dashesP4B_DBPFvPvPKcES1_
+_Z11list_resultP3JCRP4B_DBPFvPvPKcES3_11e_list_type
+_Z16db_int64_handlerPviPPc
+_Z18db_end_transactionP3JCRP4B_DB
+_Z18get_sql_record_maxP3JCRP4B_DB
+_Z19split_path_and_fileP3JCRP4B_DBPKc
+_Z20check_tables_versionP3JCRP4B_DB
+_Z20db_start_transactionP3JCRP4B_DB
+_Z23db_open_batch_connexionP3JCRP4B_DB
+_Z7db_initP3JCRPKcS2_S2_S2_S2_iS2_i
+_Z7QueryDBPKciP3JCRP4B_DBPc
+_Z8DeleteDBPKciP3JCRP4B_DBPc
+_Z8InsertDBPKciP3JCRP4B_DBPc
+_Z8UpdateDBPKciP3JCRP4B_DBPc
+_Z8_db_lockPKciP4B_DB
+_ZN9dbid_listC1Ev
+_ZN9dbid_listC2Ev
+_ZN9dbid_listD1Ev
+_ZN9dbid_listD2Ev
+_Z13_dbg_print_dbP3JCRP6_iobuf
+ 
+; sql_create.o
+_Z20db_create_job_recordP3JCRP4B_DBP7JOB_DBR
+_Z21db_create_pool_recordP3JCRP4B_DBP8POOL_DBR
+_Z22db_create_media_recordP3JCRP4B_DBP9MEDIA_DBR
+_Z23db_create_client_recordP3JCRP4B_DBP10CLIENT_DBR
+_Z23db_create_device_recordP3JCRP4B_DBP10DEVICE_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
+_Z27db_write_batch_file_recordsP3JCR
+_Z32db_create_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR
+ 
+; sql_delete.o
+_Z21db_delete_pool_recordP3JCRP4B_DBP8POOL_DBR
+_Z21db_purge_media_recordP3JCRP4B_DBP9MEDIA_DBR
+_Z22db_delete_media_recordP3JCRP4B_DBP9MEDIA_DBR
+ 
+; sql_find.o
+_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
+_Z27db_find_last_job_start_timeP3JCRP4B_DBP7JOB_DBRPPci
+ 
+; sql_get.o
+_Z15db_get_pool_idsP3JCRP4B_DBPiPPj
+_Z16db_get_file_listP3JCRP4B_DBPcPFiPviPS3_ES4_
+_Z16db_get_media_idsP3JCRP4B_DBP9MEDIA_DBRPiPPj
+_Z17db_get_client_idsP3JCRP4B_DBPiPPj
+_Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR
+_Z18db_get_int_handlerPviPPc
+_Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR
+_Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list
+_Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR
+_Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR
+_Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR
+_Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR
+_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRPc
+_Z23db_get_job_volume_namesP3JCRP4B_DBjPPc
+_Z23db_get_num_pool_recordsP3JCRP4B_DB
+_Z24db_get_num_media_recordsP3JCRP4B_DB
+_Z28db_get_job_volume_parametersP3JCRP4B_DBjPP10VOL_PARAMS
+_Z29db_get_file_attributes_recordP3JCRP4B_DBPcP7JOB_DBRP8FILE_DBR
+ 
+; sql_list.o
+_Z22db_list_copies_recordsP3JCRP4B_DBjPcPFvPvPKcES4_11e_list_type
+_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
+_Z22db_list_joblog_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type
+_Z24db_list_jobmedia_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type
+ 
+; sql_update.o
+_Z15db_update_statsP3JCRP4B_DBx
+_Z19db_mark_file_recordP3JCRP4B_DByj
+_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_DByPci
+ 
+_Z11db_get_typev
+_Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_
+_Z13db_next_indexP3JCRP4B_DBPcS3_
+_Z16db_escape_stringP3JCRP4B_DBPcS3_i
+_Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i
+_Z16db_open_databaseP3JCRP4B_DB
+_Z17db_close_databaseP3JCRP4B_DB
+_Z17db_thread_cleanupv
+
+db_type DATA
+client_backups DATA
+list_pool DATA
+drop_deltabs DATA
+create_deltabs DATA
+create_delindex 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_copy_del DATA
+select_job DATA
+count_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
+cleanup_created_job DATA
+cleanup_running_job DATA