Sounds like the Mesa directory re-org should happen sooner, rather than later.


I've been doing some research into CVS and it looks like there are two approaches to doing the re-org:

1. Use the usual cvs add/remove/commit commands to move everything around. This would work, but it would be pretty tedious and we'd sort of lose the CVS histories.

2. Download the nightly CVS tarball to my machine, reorganize it, then upload it to SourceForge and have the SF admins install it as the new CVS tree. The one issue with this approach is that it would effect all CVS branches. A benefit would be the ability to _really_ remove the old, empty directories.

I prefer option 2.

My first step would be to wrap-up version 5.0.2 (bug fix release) and get that out of the way.

That would leave the embedded-* branches. Do those of you working on those branches have any concerns?

Below is the latest proposal for the new tree layout. Comments?

-Brian



Mesa/
        docs/                   - documentation

        include/
                GL/             - OpenGL public headers
                        gl.h
                        glext.h
                        glx.h
                        glxext.h
                        glu.h
                        ...

        src/
                glu/
                        sgi/                    - SGI GLU code (C++)
                        mesa/                   - old Mesa GLU code (C)
                        mini/                   - subset GLU for embedded

                glut/
                        glx/                    - GLUT based on GLX
                        beos/                   - GLUT for BeOS
                        dos/                    - GLUT for DOS
                        ggi/                    - GLUT for GGI

                widgets/                        - SGI widget code

                mesa/
                        glapi/
                                glapi*.[ch]     - dispatcher files
                                APIspec file                            
                                gl*.py          - Python API scripts
                        main/                   - core Mesa sources
                                attrib.c
                                context.c
                                enable.c
                                ...
                                CPU detection code
                        transform/              - was tnl
                                t_*.[ch]
                                X86/3Dnow code
                        transform_dd/           - TCL templates for drivers
                                t_dd_*.[ch]
                        math/                   - math/vector routines
                                m_*.[ch]
                        swrast/                 - s/w rasterization
                                s_*.[ch]
                                mmx_blend.S
                        swsetup/                - was swrast_setup
                                ss_*.[ch]
                        arraycache/             - vertex array stuff
                                ac_*.[ch]
                        drivers/
                                common/         - reusable driver code
                                X11/            - X11 (XMesa) driver
                                osmesa/         - OSMesa drier
                                swfbdev/        - software fbdev driver
                                radeon/         - DRI/fbdev driver
                                radeon-es/      - subset radeon fbdev driver
                                r200/             ...
                                mga/            - DRI/fbdev driver
                                windows/
                                beos/
                                ggi/
                                glide/          - was FX driver
                                dos/
                        miniglx/                - MiniGLX libGL.so
                        dri/                    - es dri code

                kernel/                         - kernel drivers, modules
                        agpgart-2.5/
                        drm/
                        radeon/
                        radeonfb/
                        radeonfb-2.5/

                miniglx/                        - subset GLX API


        progs/
                xdemos/         - Xlib / GLX demos
                demos/          - existing Mesa demos
                redbook/        - OpenGL redbook programs
                samples/        - SGI sample progs
                test/           - tests, omitted from tarball
                images/         - sample images for demos
                BeOS/           - old BeOS demos
                ggi/            - GGI progs
                windml/         - WindML progs
                util/           - utility functions, etc.

        lib/                    - compiled libraries


        bin/                    - shell scripts, etc.


Reply via email to