I think it is almost impossible to rebase under these circumstances. BTW, there was an unforeseen problem -- "aux" appears to be special file on windows. Hence I had to rename that directory to "auxiliary"...
Jose On 2/15/08, Keith Whitwell <[EMAIL PROTECTED]> wrote: > OK, I found I had to merge rather than rebase in order to get my changes > into the new organization -- apologies for the bubble in the history. > > Keith > > > José Fonseca wrote: > > Just to let you know that the first step, file shuffling, is finished. > > > > The rest will take more time but changes are less pervasive. Once you > > update any private branches to the new directory layout, you should be > > able to keep working as usual. > > > > Here's a quick summary of the changes you might need to do: > > - move your source files to the directory layout described below; > > - update the TOP dirs in your Makefiles; > > - update the include paths, replacing "-I src/mesa/pipe" to "-I > > src/gallium/include -I src/gallium/drivers -I src/gallium/aux"; > > - remove "pipe/" prefix from from all includes *except* "pipe/p_*.h" > > includes. > > > > Jose > > > > On Thu, 2008-02-14 at 15:38 +0900, José Fonseca wrote: > >> I'll dedicate some time now to reorganize gallium's code & build process. > This is > >> stuff which has been discussed internally at TG several times, but this > time I > >> want to get it done. > >> > >> My objectives are: > >> - leaner and more easy to understand/navigate source tree > >> - reduce (or even eliminate) merges between private branches of the > common gallium parts > >> - help keep the gallium tree portable, by keeping things separate. > >> > >> My plan is: > >> > >> 1. Physically separate gallium source code from mesa code. This will be > the > >> final layout: > >> > >> - src/mesa > >> - src/gallium > >> - state_tracker > >> - ogl > >> - ... > >> - drivers > >> - i915simple > >> - i965simple > >> - cell > >> - ... > >> - winsys > >> - dri > >> - intel > >> - ... > >> - xlib > >> - ... > >> - aux > >> - tgsi > >> - draw > >> - pipebuffer > >> - llvm > >> - cso_cache > >> - ... > >> > >> i.e., give a subdir in src/gallium to each gallium architectural layer. > >> > >> 2. Eliminate mesa includes out of the gallium source code from > >> everything but mesa's state_tracker (and eventually some winsys). > >> > >> 3. Using scons, enhance the build system to support all platforms we are > interested (i.e., linux and win32, atm), > >> > >> 4. Teach the build system how to pick and build pipe/winsys drivers > >> outside of the tree. > >> > >> Jose > >> > >> > > > > > > > ------------------------------------------------------------------------- > > This SF.net email is sponsored by: Microsoft > > Defy all challenges. Microsoft(R) Visual Studio 2008. > > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > > -- > > _______________________________________________ > > Dri-devel mailing list > > Dri-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/dri-devel > > > > > ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
