[Scummvm-devel] Branch - please read carefullys

Max Horn max at quendi.de
Mon May 5 08:15:04 CEST 2003


Hello folks!


The branch is reality now, with tag "branch-0-4-0". I recommend that 
everybody working on it makes a second separate checkout of it, 
parallel to your normal trunk checkout which you use for everyday work. 
On Unix-like systems the command for that would be like this:

   cvs -d :ext:USERNAME at cvs.scummvm.sourceforge.net:/cvsroot/scummvm co 
-r branch-0-4-0 -d scummvm-0.4.0 scummvm

This will make a fresh checkout of the branch in a directory called  
"scummvm-0.4.0". A simply way to get a change from the trunk into the 
branch is to copy the modified file over its corresponding alter ego in 
the branch checkout; then you can run "cvs diff" or commit or whatever 
else.

The branch currently has version "0.4.0pre". I ask all porters to 
modify there project/resource/etc. files to this version; before the 
actual release we'll do that again, going to "0.4.0".

The trunk will be changed to version 0.4.1cvs, to mark it as being 
newer than the branch. So porters should make that change, too. Just 
make sure you don't mix up the branch and the trunk while making these 
changes (if you keep around two separate dirs for each, that'll help 
you a lot).

Additionally, we decided that we do not want to include the very 
incomplete (and somewhat crashy ;-) BASS support in this release. As 
such I disabled it in the main Makefile; porters will have to ensure 
their build system disables it, too (just remove it from your project 
file / Makefile / whatever, and add a #define DISABLE_SKY; for GCC that 
works by adding -DDISABLE_SKY to the CPPFLAGS.).

Later today I am going to revert to the old fmopl code in the branch 
for now. The NEWS file still has to be updated slightly.


Reminder: the actual release is planned for next sunday, there is still 
time to get any vital fixes in there before hand, and to do testing. If 
you want to make pre-release builds available to your platform testers, 
you should base those on the branch, of course. And if you can think of 
anything else of relevance, please speak up now, not 10 minutes before 
the actual release ;-)

Cheers,

Max





More information about the Scummvm-devel mailing list