kes Move source tar files for depkgs-mingw32 to www.bacula.org so

     that the URLs don't change and so that the developers will all
     work off the same copy. Rebuild from scrach.

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

diff --git a/bacula/src/win32/External-mingw32 b/bacula/src/win32/External-mingw32
index be0dd50dfc3eac9b19fd74e2b9ab499c156e4d03..9b6f9cd554fe5e1fc178f79c8f4e928a2574b036 100644 (file)
--- a/bacula/src/win32/External-mingw32
+++ b/bacula/src/win32/External-mingw32
@@ -1,44 +1,65 @@
+# 
 # This file provides information about the External dependencies required by
 # Bacula.
-#
+#  
 # There are four fields delimited by |.  Only the first two fields are 
 # required.  The other two are used when the top level directory of the
 # archive is not the same as the file name with any suffixes removed.
-#
+# 
 # Field 1 is the name of the dependency.  It is used to define the
 # name of the three variables which are assigned the values of fields 2 to 4.
-#
+# 
 # Field 2 is the URL of the archive.  It is assigned to the variable
 # URL_[field1].
-#
+#  
 # Field 3 is the top directory of the archive or the name of a directory that
 # must be created and the archive extracted into it.  It is assigned to the 
 # variable DIR_[field1].
-#
+# 
 # Field 4 indicates if the directory specified in field 3 must be created 
 # first and the archive extracted into it.  It is assigned to the variable
 # MKD_[field1]
-#
-ZLIB|http://www.zlib.net/zlib-1.2.3.tar.gz
-#ZLIB|http://superb-west.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.3.tar.gz
-PCRE|http://superb-west.dl.sourceforge.net/sourceforge/pcre/pcre-6.3.tar.bz2
-PTHREADS|ftp://sources.redhat.com/pub/pthreads-win32/pthreads-snap-2004-06-22.tar.gz
-OPENSSL|http://www.openssl.org/source/openssl-0.9.8b.tar.gz
-MYSQL|http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-noinstall-5.0.27-win32.zip|mysql-5.0.27-win32
-POSTGRESQL|ftp://ftp2.us.postgresql.org/postgresql/source/v8.1.4/postgresql-base-8.1.4.tar.bz2|postgresql-8.1.4
-SQLITE|http://www.sqlite.org/sqlite-3.3.8.tar.gz
-WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.tar.gz
-SCONS|http://superb-west.dl.sourceforge.net/sourceforge/scons/scons-0.96.92.tar.gz
-NSIS_BIN|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17.zip
-NSIS_SRC|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17-src.tar.bz2
-MTX|http://superb-west.dl.sourceforge.net/sourceforge/mtx/mtx-1.3.9.tar.gz
-#MT|ftp://ftp.ibiblio.org/pub/linux/system/backup/mt-st-0.9b.tar.gz
-MT|http://www.ibiblio.org/pub/linux/system/backup/mt-st-0.9b.tar.gz
-SED|ftp://mirrors.kernel.org/gnu/sed/sed-4.1.5.tar.gz
-STAB2CV|http://superb-west.dl.sourceforge.net/sourceforge/stab2cv/stab2cv-0.1.tar.bz2
-CMD_UTILS|http://superb-west.dl.sourceforge.net/sourceforge/cmd-utils/cmd-utils-0.1.tar.gz
-DVD_RW_TOOLS|http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz
-#CDRTOOLS|ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a22.tar.bz2
-MKISOFS|http://fy.chalmers.se/~appro/linux/DVD+RW/tools/win32/mkisofs.exe
-DVD_RW_TOOLS|http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz
-Qt4|ftp://ftp.trolltech.com/qt/source/qt-win-opensource-src-4.3.0.zip
+# 
+CMD_UTILS|http://www.bacula.org/depkgs-mingw32/cmd-utils-0.1.tar.gz
+DVD_RW_TOOLS|http://www.bacula.org/depkgs-mingw32/dvd+rw-tools-7.0.tar.gz
+MKISOFS|http://www.bacula.org/depkgs-mingw32/mkisofs.exe
+MT|http://www.bacula.org/depkgs-mingw32/mt-st-0.9b.tar.gz
+MTX|http://www.bacula.org/depkgs-mingw32/mtx-1.3.9.tar.gz
+MYSQL|http://www.bacula.org/depkgs-mingw32/mysql-noinstall-5.0.27-win32.zip|mysql-5.0.27-win32
+NSIS_BIN|http://www.bacula.org/depkgs-mingw32/nsis-2.17.zip
+NSIS_SRC|http://www.bacula.org/depkgs-mingw32/nsis-2.17-src.tar.bz2
+OPENSSL|http://www.bacula.org/depkgs-mingw32/openssl-0.9.8b.tar.gz
+PCRE|http://www.bacula.org/depkgs-mingw32/pcre-6.3.tar.bz2
+POSTGRESQL|http://www.bacula.org/depkgs-mingw32/postgresql-base-8.1.4.tar.bz2|postgresql-8.1.4
+PTHREADS|http://www.bacula.org/depkgs-mingw32/pthreads-snap-2004-06-22.tar.gz
+SCONS|http://www.bacula.org/depkgs-mingw32/scons-0.96.92.tar.gz
+SED|http://www.bacula.org/depkgs-mingw32/sed-4.1.5.tar.gz
+SQLITE|http://www.bacula.org/depkgs-mingw32/sqlite-3.3.17.tar.gz
+STAB2CV|http://www.bacula.org/depkgs-mingw32/stab2cv-0.1.tar.bz2
+WX|http://www.bacula.org/depkgs-mingw32/wxWidgets-2.7.0.tar.gz
+ZLIB|http://www.bacula.org/depkgs-mingw32/zlib-1.2.3.tar.gz
+# 
+# 
+# Original file locations
+# 
+# CDRTOOLS|ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a22.tar.bz2
+# CMD_UTILS|http://superb-west.dl.sourceforge.net/sourceforge/cmd-utils/cmd-utils-0.1.tar.gz
+# DVD_RW_TOOLS|http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz
+# MKISOFS|http://fy.chalmers.se/~appro/linux/DVD+RW/tools/win32/mkisofs.exe
+# MT|http://www.ibiblio.org/pub/linux/system/backup/mt-st-0.9b.tar.gz
+# MTX|http://superb-west.dl.sourceforge.net/sourceforge/mtx/mtx-1.3.9.tar.gz
+# MYSQL|http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-noinstall-5.0.27-win32.zip|mysql-5.0.27-win32
+# NSIS_BIN|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17.zip
+# NSIS_SRC|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17-src.tar.bz2
+# OPENSSL|http://www.openssl.org/source/openssl-0.9.8b.tar.gz
+# PCRE|http://superb-west.dl.sourceforge.net/sourceforge/pcre/pcre-6.3.tar.bz2
+# POSTGRESQL|ftp://ftp2.us.postgresql.org/postgresql/source/v8.1.4/postgresql-base-8.1.4.tar.bz2|postgresql-8.1.4
+# PTHREADS|ftp://sources.redhat.com/pub/pthreads-win32/pthreads-snap-2004-06-22.tar.gz
+# Qt4|ftp://ftp.trolltech.com/qt/source/qt-win-opensource-src-4.3.0.zip
+# SCONS|http://superb-west.dl.sourceforge.net/sourceforge/scons/scons-0.96.92.tar.gz
+# SED|ftp://mirrors.kernel.org/gnu/sed/sed-4.1.5.tar.gz
+# SQLITE|http://www.sqlite.org/sqlite-3.3.8.tar.gz
+# SQLITE|http://www.sqlite.org/sqlite-3.3.17.tar.gz
+# STAB2CV|http://superb-west.dl.sourceforge.net/sourceforge/stab2cv/stab2cv-0.1.tar.bz2
+# WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.tar.gz
+# ZLIB|http://www.zlib.net/zlib-1.2.3.tar.gz

diff --git a/bacula/src/win32/README.mingw32 b/bacula/src/win32/README.mingw32
index 8ad7d12a27270c1234abf7ad1cd9f22a5e10916a..2b748245f4e19cd00ccf89d0cce20ff201772c0a 100644 (file)
--- a/bacula/src/win32/README.mingw32
+++ b/bacula/src/win32/README.mingw32
@@ -48,12 +48,16 @@ If that link doesn't work then go to http://www.microsoft.com and search for
 
         "download volume shadow copy service sdk"
 
+we are currently using version 7.2 released 8/3/2005.
+
 Normally the files will be installed in:
 
         c:\Program Files\Microsoft\VSSSDK72
 
 You only need to copy everything under the c:\Program Files\Microsoft\VSSSDK72\inc
-directory into .../depkgs-mingw32/vss/inc.
+directory into .../depkgs-mingw32/vss/inc.  In doing so, please ensure that
+the case in maintained on the directory and filenames -- some contain uppercase 
+characters !!!
 
 The above only needs to be done once unless we change the cross-tools
 or the dependencies versions.  In general, you can run the script multiple

diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32
index 233a351b0155ca953e660af21afd594a499fdeaa..8acba04bea9cc8bf90072ec1f26d9be936b4a6e6 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw32
+++ b/bacula/src/win32/build-depkgs-mingw32
@@ -63,6 +63,7 @@ export PATH=${BIN_DIR}:${PATH}
 
 OLD_IFS=${IFS};IFS="|";
 while read package url dir mkd; do
+        echo "Got package ${package}"
         case ${package} in
         \#*) ;;
         *) eval "URL_${package}=${url};DIR_${package}=${dir};MKD_${package}=${mkd}";;
@@ -75,6 +76,7 @@ get_source()
         URL=$1
         SRC_DIR=$2
         MAKE_DIR=$3
+        echo "Processing ${URL}"
         ARCHIVE=`basename ${URL}`
         
         case ${ARCHIVE} in
@@ -486,10 +488,10 @@ process_dvd_rw_tools()
                 >patch.log
                 do_patch dvd+rw-tools.patch
         fi
-        echo Building dvd+rw-tools
+        echo "Building dvd+rw-tools"
         m4 -DOS=XMINGW32 Makefile.m4 | make -f - dvd+rw-tools >make.log 2>&1
-        echo Installing dvd+rw-tools
-        m4 -DOS=XMINGW32 Makefile.m4 | make -f - prefix=${DEPPKG_DIR} install >>make.log 2>&1
+        echo "Installing dvd+rw-tools"
+        m4 -DOS=XMINGW32 Makefile.m4 | make -f - prefix=${DEPPKG_DIR} manprefix=${DEPPKG_DIR} install >>make.log 2>&1
 }
 
 process_qt4()
@@ -517,7 +519,7 @@ then
         process_cmd_utils
         process_mkisofs
         process_dvd_rw_tools
-        process_qt4
+#       process_qt4
 else
         for dependency in "$@"
         do