[Box Backup-dev] COMMIT r718 - in box/trunk: . test/bbackupd/testfiles

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-08-07 20:53:12 +0000 (Mon, 07 Aug 2006)
New Revision: 718

Added:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf.in
Removed:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf
Modified:
   box/trunk/configure.ac
Log:
* test/bbackupd/testfiles/bbackupd.conf
* test/bbackupd/testfiles/bbackupd.conf.in
* configure.ac
- Define @PERL_NATIVE@ to "perl" on Win32, @PERL@ on other platforms
- Automatically generate test/bbackupd/testfiles/bbackupd.conf with 
  autoconf substitution of @PERL_NATIVE@


Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-08-06 14:26:51 UTC (rev 717)
+++ box/trunk/configure.ac	2006-08-07 20:53:12 UTC (rev 718)
@@ -26,14 +26,21 @@
   # Use -rdynamic if we have gcc. This is needed for backtrace
   AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
 fi
-AC_PATH_PROG([PERL], [perl], [no])
-if test "x$PERL" != "xno"; then
-  AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
-else
-  AC_MSG_ERROR([[perl executable was not found]])
-fi
 
+AC_PATH_PROG([PERL], [perl], [AC_MSG_ERROR([[perl executable was not found]])])
 
+case $target_os in
+mingw*) 
+	AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["perl"], [Command to run Perl])
+	PERL_NATIVE=perl
+	AC_SUBST([PERL_NATIVE])
+	;;
+*)
+	AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], 
+		[Location of the perl executable])
+	;;
+esac
+
 ### Checks for libraries.
 
 if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then

Deleted: box/trunk/test/bbackupd/testfiles/bbackupd.conf
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-08-06 14:26:51 UTC (rev 717)
+++ box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-08-07 20:53:12 UTC (rev 718)
@@ -1,50 +0,0 @@
-
-CertificateFile = testfiles/clientCerts.pem
-PrivateKeyFile = testfiles/clientPrivKey.pem
-TrustedCAsFile = testfiles/clientTrustedCAs.pem
-
-KeysFile = testfiles/bbackupd.keys
-
-DataDirectory = testfiles/bbackupd-data
-
-StoreHostname = localhost
-AccountNumber = 0x01234567
-
-UpdateStoreInterval = 3
-MinimumFileAge = 4
-MaxUploadWait = 24
-
-FileTrackingSizeThreshold = 1024
-DiffingUploadSizeThreshold = 1024
-
-MaximumDiffingTime = 8
-
-ExtendedLogging = yes
-
-CommandSocket = testfiles/bbackupd.sock
-
-NotifyScript = @PERL@ testfiles/notifyscript.pl
-
-Server
-{
-	PidFile = testfiles/bbackupd.pid
-}
-
-BackupLocations
-{
-	Test1
-	{
-		Path = testfiles/TestDir1
-
-		ExcludeFile = testfiles/TestDir1/excluded_1
-		ExcludeFile = testfiles/TestDir1/excluded_2
-		ExcludeFilesRegex = \.excludethis$
-		ExcludeFilesRegex = EXCLUDE
-		AlwaysIncludeFile = testfiles/TestDir1/dont.excludethis
-		ExcludeDir = testfiles/TestDir1/exclude_dir
-		ExcludeDir = testfiles/TestDir1/exclude_dir_2
-		ExcludeDirsRegex = not_this_dir
-		AlwaysIncludeDirsRegex = ALWAYSINCLUDE
-	}
-}
-

Copied: box/trunk/test/bbackupd/testfiles/bbackupd.conf.in (from rev 717, box/trunk/test/bbackupd/testfiles/bbackupd.conf)
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-08-06 14:26:51 UTC (rev 717)
+++ box/trunk/test/bbackupd/testfiles/bbackupd.conf.in	2006-08-07 20:53:12 UTC (rev 718)
@@ -0,0 +1,50 @@
+
+CertificateFile = testfiles/clientCerts.pem
+PrivateKeyFile = testfiles/clientPrivKey.pem
+TrustedCAsFile = testfiles/clientTrustedCAs.pem
+
+KeysFile = testfiles/bbackupd.keys
+
+DataDirectory = testfiles/bbackupd-data
+
+StoreHostname = localhost
+AccountNumber = 0x01234567
+
+UpdateStoreInterval = 3
+MinimumFileAge = 4
+MaxUploadWait = 24
+
+FileTrackingSizeThreshold = 1024
+DiffingUploadSizeThreshold = 1024
+
+MaximumDiffingTime = 8
+
+ExtendedLogging = yes
+
+CommandSocket = testfiles/bbackupd.sock
+
+NotifyScript = @PERL_NATIVE@ testfiles/notifyscript.pl
+
+Server
+{
+	PidFile = testfiles/bbackupd.pid
+}
+
+BackupLocations
+{
+	Test1
+	{
+		Path = testfiles/TestDir1
+
+		ExcludeFile = testfiles/TestDir1/excluded_1
+		ExcludeFile = testfiles/TestDir1/excluded_2
+		ExcludeFilesRegex = \.excludethis$
+		ExcludeFilesRegex = EXCLUDE
+		AlwaysIncludeFile = testfiles/TestDir1/dont.excludethis
+		ExcludeDir = testfiles/TestDir1/exclude_dir
+		ExcludeDir = testfiles/TestDir1/exclude_dir_2
+		ExcludeDirsRegex = not_this_dir
+		AlwaysIncludeDirsRegex = ALWAYSINCLUDE
+	}
+}
+