[Box Backup-commit] COMMIT r1420 - box/chris/merge

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-03-10 19:35:38 +0000 (Sat, 10 Mar 2007)
New Revision: 1420

Modified:
   box/chris/merge/modules.txt
   box/chris/merge/parcels.txt
Log:
Fixes for cross-compiling from Ubuntu Breezy (refs #3, merges [573])


Modified: box/chris/merge/modules.txt
===================================================================
--- box/chris/merge/modules.txt	2007-03-10 19:26:02 UTC (rev 1419)
+++ box/chris/merge/modules.txt	2007-03-10 19:35:38 UTC (rev 1420)
@@ -10,6 +10,7 @@
 # Generic support code and modules
 
 OMIT:mingw32
+OMIT:mingw32msvc
 OMIT:CYGWIN
 lib/raidfile
 END-OMIT
@@ -24,6 +25,7 @@
 test/compress		lib/compress	lib/win32
 
 OMIT:mingw32
+OMIT:mingw32msvc
 test/basicserver	lib/server	lib/win32
 OMIT:CYGWIN
 test/raidfile		lib/raidfile	lib/intercept
@@ -36,6 +38,7 @@
 lib/backupclient	lib/server	lib/crypto	lib/compress
 
 OMIT:mingw32
+OMIT:mingw32msvc
 OMIT:CYGWIN
 lib/backupstore		lib/server	lib/raidfile	lib/backupclient
 bin/bbstored		lib/raidfile	lib/server	lib/backupstore	lib/backupclient	lib/win32
@@ -48,6 +51,7 @@
 bin/bbackupctl		lib/server	lib/backupclient	lib/win32
 
 OMIT:mingw32
+OMIT:mingw32msvc
 OMIT:CYGWIN
 test/backupstore	bin/bbstored	bin/bbstoreaccounts lib/server lib/backupstore lib/backupclient lib/raidfile
 test/backupstorefix	bin/bbstored	bin/bbstoreaccounts	lib/backupstore	lib/raidfile	bin/bbackupquery	bin/bbackupd

Modified: box/chris/merge/parcels.txt
===================================================================
--- box/chris/merge/parcels.txt	2007-03-10 19:26:02 UTC (rev 1419)
+++ box/chris/merge/parcels.txt	2007-03-10 19:35:38 UTC (rev 1420)
@@ -9,16 +9,20 @@
 	bin bbackupctl
 	script bin/bbackupd/bbackupd-config
 
-ONLY:mingw32
+ONLY:mingw32,mingw32msvc
 	script bin/bbackupd/win32/installer.iss 
 	script bin/bbackupd/win32/ReadMe.txt 
 	script bin/bbackupd/win32/bbackupd.conf
+END-ONLY
+
+ONLY:mingw32
 	script /bin/mgwz.dll
 	script /bin/mingwm10.dll
 	optional script /bin/pcreposix.dll
 END-ONLY
 
 OMIT:mingw32
+OMIT:mingw32msvc
 OMIT:CYGWIN
 
 backup-server