Hello JBQ,
The input I've got regarding "OPENCORE" from your last mail is
"opencore 2.x is supported only in master and all the other branches/tags
are based out of opencore 1.x". My local repo is initailized using "repo
init -u git://android.git.kernel.org/platform/manifest.git -b
android-sdk-1.5_r1", I do see the OPENCORE git is checked out with respect
to "android-sdk-1.5_r1" tag. As I'm in the process of porting the source
code corresponds to "android-sdk-1.5_r1 TAG", I would like get some answers
for the following queries.
1. Assume I have some third party OMX plugins that have been ported for
"opencore" sources release as part of "android-1.1" version, what would be
best appraoch while migrating to "android-sdk-1.5_r1", should I move to
opencore-1.x or stay with opencore-1.x ?
2. How exactly do you differentiate between opencore-1.x and opencore-2.x
in terms of features (for example video encoding capability) ?
3. Would it be a good idea to manually checkout "master" in opencore in
the "android-sdk-1.5_r1" repo ? Will this break the build or loose some
features ?
4. Is there any documentation that deal with related points ? If any,
please let me know.
5. Is there any specific reason to stick to opencore-1.x in
"android-sdk-1.5_r1 tag" though the master has been migrated to opencore-2.x
?
Warm Regards,
Anil
On Tue, Apr 28, 2009 at 1:54 AM, Jean-Baptiste Queru <[email protected]>wrote:
>
> There are conceptually 3 development branches: cupcake, donut and
> master (though with git + repo the notion of codeline is very
> different from e.g. svn/cvs or perforce).
>
> For practical purposes for the Android Open-Source Project, master
> branched from 1.0 last October, and around the same time cupcake
> branched from 1.0 inside Google. Cupcake only contains changes that
> were developed through Google's internal branch (with extremely few
> contributions brought from the outside).
>
> donut is in the process of being branched from cupcake (it should
> logically have come from master, but technical reasons within Google
> forced us to branch from cupcake instead).
>
> The various android-1.5 tags mark different points in time along the
> cupcake history for the different releases (1.5 sdk preview, 1.5 for
> devices, 1.5 sdk). As tags, those are fixed, so there's nothing to
> "follow".
>
> Moving between branches in repo is hard. If the two branches are
> *very* close to one another (e.g. cupcake vs the 1.5 variants), it's
> possible, but anything else is going to fail at this point as there's
> already been too much drift.
>
> If you're interested in OpenCORE, you should definitely be using
> master, as it's the only one that has OpenCORE 2.x and all the other
> branches and tags have OpenCORE 1.x.
>
> JBQ
>
> On Mon, Apr 27, 2009 at 11:46 AM, archaic <[email protected]> wrote:
> >
> > I am trying to get a picture of the branching strategy you are using.
> > I can now see an android-1.5 branch (and a tag)
> > is it the end result of cupcake merged to master (HEAD?) and re-
> > branched?
> > assuming the development branch will switch regularly as in the case
> > from cupcake to android-1.5, is it easy to move from one branch to
> > another in repo/git checkout?
> > (I am mostly familiar to CVS terminology, I probably am not refering
> > to correct repo commands)
> >
> > just to make sure : is android-1.5 the latest development branch to
> > follow?
> > I am mostly interested in OpenCORE and it seems to be moving forward
> > quite rapidly so I need to stay close to it.
> >
> > thanks
> > -arcin
> >
> >
> > On Apr 15, 3:51 pm, Jean-Baptiste Queru <[email protected]> wrote:
> >> Technically, if you download it with repo sync (which is the preferred
> >> method), you'll actually have all versions on your machine.
> >>
> >> Any of the branches (release-1.0, cupcake, master) can build the
> >> entire system, but you'll get different versions. Right now, I'd
> >> suggest to start with cupcake, and to follow its progress.
> >>
> >> JBQ
> >>
> >>
> >>
> >> On Wed, Apr 15, 2009 at 11:04 AM, John Write <[email protected]> wrote:
> >>
> >> > Hi JBQ,
> >>
> >> > I am asking this on as Generally...
> >>
> >> > If I wann to dowload the Android Source, in this case which one I need
> to download. Master or cupcake branch.. If I download the cupcake alone.. is
> it possible for me to build the whole Android Build
> >>
> >> > thx
> >> > John
> >>
> >> > On Wed, Apr 15, 2009 at 7:27 PM, Jean-Baptiste Queru <
> [email protected]> wrote:
> >>
> >> >> Cupcake is the branch that has been supporting the development of
> >> >> Android 1.5. Its current state precisely matches the preview 1.5 SDK,
> >> >> minus the proprietary bits in the SDK (and we're planning to tag it
> >> >> for future reference).
> >>
> >> >> The donut branch in the open-source tree is currently unmaintained,
> >> >> and you should ignore it at the moment (it should probably be deleted
> >> >> at this point and get re-created when appropriate). Donut is the
> >> >> codename for what comes immediately after cupcake.
> >>
> >> >> Master is the mainline. Future major releases will be branched out of
> it.
> >>
> >> >> Release-1.0 loosely matches the 1.0 release. Given the progress on
> >> >> 1.5, you can start to consider 1.0 as being outdated.
> >>
> >> >> Other branches might exist or have existed for specific tasks, and
> are
> >> >> typically private to the people working on those tasks.
> >>
> >> >> JBQ
> >>
> >> >> On Tue, Apr 14, 2009 at 10:40 PM, John Cola <[email protected]>
> wrote:
> >>
> >> >> > Hi all
> >> >> > Waht are those branches other than master?
> >> >> > I only know cupcake, are there anyother else?
> >>
> >> >> > BR
> >> >> > John
> >>
> >> >> --
> >> >> Jean-Baptiste M. "JBQ" Queru
> >> >> Android Engineer, Google.
> >>
> >> >> Questions sent directly to me that have no reason for being private
> >> >> will likely get ignored or forwarded to a public forum with no
> further
> >> >> warning.
> >>
> >> --
> >> Jean-Baptiste M. "JBQ" Queru
> >> Android Engineer, Google.
> >>
> >> Questions sent directly to me that have no reason for being private
> >> will likely get ignored or forwarded to a public forum with no further
> >> warning.
> > >
> >
>
>
>
> --
> Jean-Baptiste M. "JBQ" Queru
> Android Engineer, Google.
>
> Questions sent directly to me that have no reason for being private
> will likely get ignored or forwarded to a public forum with no further
> warning.
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"android-framework" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/android-framework?hl=en
-~----------~----~----~----~------~----~------~--~---
