Changeset 20

Timestamp:

24/10/2005 13:13:22 (7 years ago)

Author:

ben

Message:

Forgot a few minor changes to be compatible with 0.09 import

Location:

box/ben/box0_08

Files:

• lib/backupclient/BackupStoreFile.h (modified) (1 diff)
• lib/common/Box.h (modified) (1 diff)
• lib/common/BoxPortsAndFiles.h (modified) (2 diffs)
• modules.txt (modified) (1 diff)

box/ben/box0_08/lib/backupclient/BackupStoreFile.h

@@ -23 +23 @@
         int64_t mTotalFileStreamSize;
 } BackupStoreFileStats;
-
-// BOX_PRIVATE_BEGIN
-// Interal builds don't have backwards compatibility
-#define BOX_DISABLE_BACKWARDS_COMPATIBILITY_BACKUPSTOREFILE
-// BOX_PRIVATE_END
 
 // --------------------------------------------------------------------------

box/ben/box0_08/lib/common/Box.h

@@ -83 +83 @@
         #define EXCEPTION_CODENAMES_EXTENDED
         #define EXCEPTION_CODENAMES_EXTENDED_WITH_DESCRIPTION
-        
-        // But in private builds, these get disabled
-        // BOX_PRIVATE_BEGIN
-        #undef EXCEPTION_CODENAMES_EXTENDED
-        #undef EXCEPTION_CODENAMES_EXTENDED_WITH_DESCRIPTION
-        // BOX_PRIVATE_END
+
 #endif
 

box/ben/box0_08/lib/common/BoxPortsAndFiles.h

@@ -13 +13 @@
 #define BOX_PORT_BASE           2200
 
-// BOX_PRIVATE_BEGIN
-
-// Locator daemon
-#define BOX_PORT_BLOCATORD                                      (BOX_PORT_BASE+0)
-#define BOX_FILE_BLOCATORD                                      "/etc/box/blocatord.conf"
-
-// BOX_PRIVATE_END
-
 // Backup store daemon
 #define BOX_PORT_BBSTORED                                       (BOX_PORT_BASE+1)
@@ -34 +26 @@
 #define BOX_FILE_RAIDFILE_DEFAULT_CONFIG        "/etc/box/raidfile.conf"
 
-// BOX_PRIVATE_BEGIN
-
-// smbpasswd authentication daemon (courier-imap authdaemon compatible)
-#define BOX_PORT_BAUTHSMBPWD                            (BOX_PORT_BASE+2)
-#define BOX_FILE_BAUTHSMBPWD_DEFAULT_CONFIG     "/etc/box/bauthsmbpwd.conf"
-
-// Message default config location
-#define BOX_FILE_BOXMSG_DEFAULT_CONFIG          "/etc/box/boxmsg.conf"
-
-// Message daemons
-#define BOX_FILE_BMSGD_DEFAULT_CONFIG           "/etc/box/bmsgd.conf"
-#define BOX_FILE_BMSGRECVD_DEFAULT_CONFIG       "/etc/box/bmsgrecvd.conf"
-#define BOX_PORT_BMSGRECVD                                      (BOX_PORT_BASE+3)
-
-// BOX_PRIVATE_END
-
 #endif // BOXPORTSANDFILES__H
 

box/ben/box0_08/modules.txt

@@ -48 +48 @@
 # END_IF_DISTRIBUTION
 
-# BOX_PRIVATE_BEGIN
-
-# Authentication for mail systems
-bin/bauthsmbpwd         lib/server      -lcrypto
-test/bauthsmbpwd        bin/bauthsmbpwd lib/server
-
-# message passing system
-
-lib/boxaddress
-lib/boxmsg                      lib/crypto      lib/server      lib/boxaddress
-lib/boxmsgserver        lib/server
-bin/bmsgd                       lib/boxmsg      lib/boxmsgserver
-bin/bmsgrecvd           lib/boxmsg      lib/server      lib/boxmsgserver
-test/boxmsg                     lib/boxmsg      bin/bmsgd       bin/bmsgrecvd
-
-# Setup system
-
-lib/setup
-bin/bconfigcompiler     lib/setup
-test/setup                      lib/setup       bin/bconfigcompiler
-
-# BOX_PRIVATE_END
-
-# IF_DISTRIBUTION(boxwaf)
-
-# database interface
-lib/dbdriver
-lib/dbdrv_sqlite        lib/dbdriver    -lsqlite
-lib/dbdrv_mysql         lib/dbdriver    -lmysqlclient
-# explicitly include the dbdriver module for when no drivers are compiled in
-lib/database            lib/dbdriver    lib/dbdrv_sqlite        lib/dbdrv_mysql
-test/database           lib/database
-
-# web application system
-
-lib/httpserver          lib/server
-test/httpserver         lib/httpserver
-lib/webappframework     lib/httpserver
-test/webappframework    lib/webappframework     lib/database
-
-# END_IF_DISTRIBUTION
-