Author Topic: Next build  (Read 4755 times)

0 Members and 1 Guest are viewing this topic.

Offline Inquisitor

Back, exhausted.

SCP Meeting this weekend ;) I'll email the list, gonna ask you all to respond and say whether you can make it, you all know who you are :)
No signature.

 

Offline penguin

  • Eudyptes codus
  • 28
  • Still alive.
Regarding stable/release builds, here are a few options:

Option 1:

We could have a seperate stable branch in CVS (actually this would probably be the "main" branch, so that if someone checks out the source without providing a specific release or branch tag, what they would get would be the most recent "stable" version).  We would also have a "development" branch -- or maybe several branches (but probably not more than one active branch concurrently).  

So right now we'd be working on the "prerelease_3_3" branch;the head of the main branch would correspond to release 3.2.  When everything's in order and we're ready to release 3.3, we would merge it with the main branch, test and tag the mainline with "fs2_open_3_3," and then create a new "prerelease_3_4" branch, and the old prerelease branch becomes inactive.


Option 2:

Another alternative is to keep a single branch, just tag more frequently than we do now -- tagging "subreleases" instead of just releases.  That way if you checkout with no options, you are not guaranteed to get a stable copy; if you want a stable copy, you checkout or export a particular release (e.g., "cvs export -r fs2_open_3_3_21 fs2_open")
your source code slave

 

Offline EdrickV

  • Valued
  • 29
    • http://members.aol.com/HunterComputers
I think that idea 1 would work better the other way around: The default branch would be the development one, since that is the one that would be used the most. (Who, besides developers, will download the source code via the confusing CVS when there is a pre-compiled exe available? :) )
Ground - "Let me help you out, you're clear to taxi any way you can, to any runway you see."

Mesh Gallery/Downloads:
http://members.aol.com/ArisKalzar/Gallery.html
Turreting 101:
http://members.aol.com/EdrickV/FS2/Turreting.html

http://members.aol.com/HunterComputers

  

Offline Inquisitor

I'd like to look over bugzilla, prioritize and assign anything that hasn't been, and get ready for a 3.3 release.
No signature.