[Box Backup-dev] [PATCH] Win32 merge [01] bbackupd.conf

[Martin Ebourne]

On Mon, 2006-08-07 at 22:02 +0100, Chris Wilson wrote:
> Hi Martin,
> 
> On Mon, 7 Aug 2006, Martin Ebourne wrote:
> > Chris Wilson <chris at qwirx.com> wrote:
> >>  In the recent changes to auto-generating Perl files, it seems that an
> >>  @PERL@ template was inserted into a unit test configuration file, which
> >>  is not auto-generated as far as I can tell. This breaks the unit tests.
> >>  The attached patch should fix it as long as perl is on your PATH.
> >
> > I'm replying to the original patch emails but reviewing the patches as they 
> > currently stand in the chris/merge tree. eg. For this one the final solution 
> > was quite different.
> [...]
> > This one is good to merge. [And this is so obviously right I don't think you 
> > need to wait for Ben - always good to start with a rule and then break it 
> > immediately. :-)]
> 
> OK, merged. (I hope this is what you reviewed :-)

Er, no actually it's not!

I'm a bit confused. I reviewed what was in the chris/merge branch as I
thought you requested. The related change in that appeared to be rename
bbackupd.conf to bbackupd.conf.in and apply this patch:

--- trunk/configure.ac	2006-08-07 22:14:16.000000000 +0100
+++ merge/configure.ac	2006-08-07 22:12:26.000000000 +0100
@@ -220,6 +221,7 @@
                    lib/server/makeprotocol.pl
                    runtest.pl
                    test/backupstorefix/testfiles/testbackupstorefix.pl
+                   test/bbackupd/testfiles/bbackupd.conf
                    test/bbackupd/testfiles/extcheck1.pl
                    test/bbackupd/testfiles/extcheck2.pl
                    test/bbackupd/testfiles/notifyscript.pl])

I can see how that works and fixes it. I don't see how the change you've
commited fixes it though, you've not even added bbackupd.conf to the
list of files to substitute. And what you have committed doesn't match
what's in your merge branch.

Not sure what PERL_NATIVE is in aid of either. Can you explain it a bit?
Is the idea for mingw that the compile and unit tests take place under
unix (hence the native perl) but the exe & other scripts run under
windows?

Cheers,

Martin.