Created attachment 25328 [details]
Example patch for dmake

The previous patch is MSVC only and has to be adapted for the other OSs but
shows what has to be done.

Created attachment 33777 [details]
Patch for dmake/

Committed to dmake43p01.

@ause: Please verify!

Oops, typo:

+++ dmake/dmake.c       2 Feb 2006 04:48:34 -0000
@@ -713,7 +713,7 @@
 
       vfprintf( stderr, fmt, args );
       putc( '\n', stderr );
-      if( errflg && !Continue ) Quit(0) );
+      if( errflg && !Continue ) Quit(0);
    }
 }
 
Fixed!

@vq: Thanks for the fix!  I applied the patch manually and it builds fine for me
without the warnings that I had previously.
However, I notice that you say you've committed the patch to dmake43p01.  It
wasn't in the sources that I checked out, so I've obviously pulled the wrong
sources down.
I used the cws_src680_dmake43p01 branch when I got the sources, which is what I
was using last year when when I last did a build of dmake.
What is the current branch that I should be using, and moreover, how can I find
out for myself what the current branch is so that I don't have to keep asking in
the future?

Hi Steve!

Yes, I committed to cws_src680_dmake43p01. It is still the current branch as it
didn't get integrated yet into HEAD. Maybe anoncvs was not yet synchronized
with the "developers" cvs. It's running on a different server to lessen the load.

Please try again and if it is still missing complain loudly ;)

You can also check <http://tools.openoffice.org/source/browse/tools/dmake/>.
This link should be always up to date.

BTW, can you please check that I didn't break anything for your setup. See
ChangeLog and NEWS file, I fixed a few more things and hope that everything
still works outside of OpenOffice.org.

I'll try to keep <http://tools.openoffice.org/dmake/> up to date if the current
branch changes. But feel free to ask.

OK, I got it from anoncvs now, so it must have just been lagging behind a bit.

It still builds cleanly for me and seems to work OK building perl (I'll give it
more of a thrashing later), but it seems to have one slight hiccup when
(re)building itself.

Steps to reproduce are as follows:

1. Run "make win95-vpp40".  This works fine (using VC++ 6.0 on WinXP).
2. Copy dmake.exe and startup/ from source tree to C:\dmake
3. Delete dmake.exe and objects/ from source tree
4. Run "C:\dmake\dmake.exe".

The last step recompiles all the object files and relinks the executable, but
then throws out this error:

dmake.exe:  Error: -- `..\..\..startup/template.mk' not found, and can't be made

I'm not sure why yet, as I haven't had time to look into it.

In my previous build of dmake (using sources taken from the same CVS branch on
06 Jun 2005) dmake.exe was able to (re)build itself without this error.

I also tried using that old dmake build to build the new dmake sources that I've
just checked out and that works fine without the error, so it does look like a
problem with the new dmake.exe.

Should I log this under a new issue number?

.

.