cppunit-devel

[Cppunit-devel] Re: [CppUnit] New repository layout...

[Bastiaan B. <bas...@li...>]

Baptiste Lepilleur wrote:

>     I just obtained the new version of cppunit. I must say the layout is
> much cleaner.
>

Thanks, that was the intent. The only change I consider to do next is move
cppunit/* to src/framework and add other dirs under src for extensions.

>
>     Yet, the file "estring.h" is missing. I assumed it was supposed to be in
> /cppunit since its an implementation file.
>

Ah, yes, I see, I somehow managed to make it disappear from CVS during the move
of the other *.h files. Thanks for the notice.

OK, I see I really have to get some sleep now. I'll reply to the rest of the
mail tomorrow, sorry.

Good night,

Bastiaan


>
>     Two patches are attached, both are based on CVS HEAD:
>         vc6 => compilation for VC++
>         registry => fix the registry bug,  remove it from the test case
> constructors, and the example has been updated not to use the registry
> anymore.
>
>     The patches includes the missing file "estring.h".
>

>
>     Here is what the vc6 patch to:
>
>     The libraries are generated in /cppunit/lib as
>         cppunit.lib for the release version (optimization turned on, no
> debug info and linking against the static libc).
>         cppunitd.lib for the debug version (no optimization, debug info,
> linking against the dynamic libc).
>
>     The /cppunit/lib directory is automatically created by VC++ at compile
> time, so there is no need to create it in the repository.
>
>     A workspace and project have been created for cppunit in the /cppunit
> directory.
>     A workspace has been created in the /examples directory, and include the
> hierarchy project, and the cppunit project. The hierarchy project depends on
> the cppunit project and the library will be automatically build (so you just
> need to open the examples workspace and run).
>     A workspace and project have been created for the hierarchy example.
>
>     I have some questions regarding the use of diff & patch:
> diff -Naur cppunit-orig cppunit > cppunit.patch
>     generates the patch, but I need to remove the CVS directories before. Is
> there an simple way to do that ?
>      How do you make patch which contains some binary data (bitmap & icons
> for the graphic test runner).
>
>   How do you apply a patch? understand: what are the magic options ;-) ?
>
>   I guess the next step would be:
>   - adding Michael's Feather framework/extensions back into the project.
> What should be the physical layout ? include/cppunit/extensions ?
>   - adding the graphic test runner (extensions are required).
>
>     Let me know when this is integrated, so I can test the integrated
> project to check if everything went well.
>
>     Baptiste.
> ---
> Baptiste Lepilleur <gai...@fr...>   http://gaiacrtn.free.fr/index.html
> Author of The Text Reformatter, a tool for fanfiction readers and writers.
> Language: English, French (Well, I'm French).
>
>   ------------------------------------------------------------------------
>                            Name: cppunit-vc6.patch.gz
>    cppunit-vc6.patch.gz    Type: application/x-compressed
>                        Encoding: base64
>
>                                 Name: cppunit-registry.patch.gz
>    cppunit-registry.patch.gz    Type: application/x-compressed
>                             Encoding: base64

[Cppunit-devel] Re: [CppUnit] New repository layout...

[Bastiaan B. <bas...@li...>]

Baptiste Lepilleur wrote:

>     I just obtained the new version of cppunit. I must say the layout is
> much cleaner.
>
>     Yet, the file "estring.h" is missing. I assumed it was supposed to be in
> /cppunit since its an implementation file.
>
>     Two patches are attached, both are based on CVS HEAD:
>         vc6 => compilation for VC++
>         registry => fix the registry bug,  remove it from the test case
> constructors, and the example has been updated not to use the registry
> anymore.
>
>     The patches includes the missing file "estring.h".
>
>     Here is what the vc6 patch to:
>
>     The libraries are generated in /cppunit/lib as
>         cppunit.lib for the release version (optimization turned on, no
> debug info and linking against the static libc).
>         cppunitd.lib for the debug version (no optimization, debug info,
> linking against the dynamic libc).
>
>     The /cppunit/lib directory is automatically created by VC++ at compile
> time, so there is no need to create it in the repository.
>
>     A workspace and project have been created for cppunit in the /cppunit
> directory.
>     A workspace has been created in the /examples directory, and include the
> hierarchy project, and the cppunit project. The hierarchy project depends on
> the cppunit project and the library will be automatically build (so you just
> need to open the examples workspace and run).
>     A workspace and project have been created for the hierarchy example.
>

OK, I've merged this patch, it's in CVS now.
A note for if you add project files in the future:
simply adding them to CVS will not ensure that they end up in the dist tarball
as well. To get them in, they need to be added to the EXTRA_DIST variable in
the Makefile.am file in the same directory. For example cppunit/Makefile.am
contains:

EXTRA_DIST = cppunit.dsw cppunit.dsp

I've had a tendency to forget this myself, see the log4cpp 0.2.4 release for
example :-(

>
>     I have some questions regarding the use of diff & patch:
> diff -Naur cppunit-orig cppunit > cppunit.patch
>     generates the patch, but I need to remove the CVS directories before. Is
> there an simple way to do that ?
>      How do you make patch which contains some binary data (bitmap & icons
> for the graphic test runner).
>
>   How do you apply a patch? understand: what are the magic options ;-) ?
>

That's easy:

cd topdir
patch -p1 < improvement.patch

The '-pN' option will strip N slashes from the front of filenames. So with -p1,
cppunit/cppunit/cppunit.dsp becomes cppunit/cppunit.dsp.


>
>   I guess the next step would be:
>   - adding Michael's Feather framework/extensions back into the project.
> What should be the physical layout ? include/cppunit/extensions ?

That makes sense. Same as X11/extensions

>
>   - adding the graphic test runner (extensions are required).
>
>     Let me know when this is integrated, so I can test the integrated
> project to check if everything went well.
>

I didn't have a look at the registry patch yet, I'll let you know when I have.

Bastiaan


>
>     Baptiste.
> ---
> Baptiste Lepilleur <gai...@fr...>   http://gaiacrtn.free.fr/index.html
> Author of The Text Reformatter, a tool for fanfiction readers and writers.
> Language: English, French (Well, I'm French).
>
>   ------------------------------------------------------------------------
>                            Name: cppunit-vc6.patch.gz
>    cppunit-vc6.patch.gz    Type: application/x-compressed
>                        Encoding: base64
>
>                                 Name: cppunit-registry.patch.gz
>    cppunit-registry.patch.gz    Type: application/x-compressed
>                             Encoding: base64

Re: [Cppunit-devel] Re: [CppUnit] New repository layout...

[Baptiste L. <bl...@cl...>]

> OK, I've merged this patch, it's in CVS now.

    I checked it out. There has been a problem. Each line of the new file
(dsp,dsw) ends with "\r\r\n" instead of "\r\n". My guess is that the unix
version of patch did not recognize the diff file has being a windows format
file, and created the new text file in the windows format on the unix
machine. I'll submit the next patch in the unix format, and hopefully it
will correct that problem.
    Also, the patch for cppunit/examples/hierarchy/main.cpp is missing.

    Baptiste.

---
Baptiste Lepilleur <gai...@fr...>   http://gaiacrtn.free.fr/index.html
Author of The Text Reformatter, a tool for fanfiction readers and writers.
Language: English, French (Well, I'm French).