[Xerte-dev] Re: Next Release

Pat Lockley patrick.lockley at googlemail.com
Thu Mar 1 13:18:21 GMT 2012 

the age isn't relevant, it'll be the content clashing.

I would export trunk, 1.7 and 1.8 first
then do diffs across trunk and 1.7
merge the same files

then see what is different, and accept those.

Make that release candidate 1

test that (as that is "logic changes").

When that works

Merge 1.7 into 1.8

this is "structural changes"

test that.

On Thu, Mar 1, 2012 at 1:13 PM, Julian Tenney
<Julian.Tenney at nottingham.ac.uk> wrote:
> Does it matter which way you go - presumably it updates to the latest files in each repository.
>
> Can I mess this up?
>
> -----Original Message-----
> From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley
> Sent: 01 March 2012 10:06
> To: For Xerte technical developers
> Subject: [Xerte-dev] Re: Next Release
>
> i would guess 1.8 into 1.7 and 1.7 into trunk.
>
> 1.8 into 1.7 will be the bigger issue
>
> I'd also consider making release candidates before hand
>
> On Thu, Mar 1, 2012 at 9:59 AM, Julian Tenney
> <Julian.Tenney at nottingham.ac.uk> wrote:
>> So I try and integrate 1.8 into trunk ad ignore 1.7? Or 1.7 into 1.8 and then 1.8 into trunk? Or all three into 1.81?
>>
>> Hmm.
>>
>> -----Original Message-----
>> From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley
>> Sent: 01 March 2012 09:59
>> To: For Xerte technical developers
>> Subject: [Xerte-dev] Re: Next Release
>>
>> i've not committed anything bar 1.8
>>
>> I guess the SVN shows changes?
>>
>> On Thu, Mar 1, 2012 at 9:57 AM, Julian Tenney
>> <Julian.Tenney at nottingham.ac.uk> wrote:
>>> We have the trunk, and 1.7 and 1.8. I thought trunk is what we were currently zipping up, so what's the best approach.
>>>
>>> I'm happy to press the buttons, but I'm not sure I have a lot of insight as to what's actually happening with the code...
>>>
>>> I'll re make all the templates stuff from the xerte SVN, so not worried about that, it's just the php stuff.
>>>
>>> -----Original Message-----
>>> From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Julian Tenney
>>> Sent: 29 February 2012 22:02
>>> To: For Xerte technical developers
>>> Subject: [Xerte-dev] Re: Next Release
>>>
>>> lets try and do this by the end of next week.
>>>
>>> ________________________________________
>>> From: xerte-dev-bounces at lists.nottingham.ac.uk [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley [patrick.lockley at googlemail.com]
>>> Sent: 29 February 2012 20:42
>>> To: For Xerte technical developers
>>> Subject: [Xerte-dev] Re: Next Release
>>>
>>> Do a diff across the two (I think tortoise has a branch or commit or
>>> merge or something).
>>>
>>> The logic is merge 1.7 into 1.8, expect 1.8 to then break (i would guess)
>>>
>>> Freeze 1.7 and then fix 1.8.
>>>
>>> Then 1.8 goes into trunk, and 1.9 is made for "developing"
>>>
>>> On Wed, Feb 29, 2012 at 8:34 PM, Julian Tenney
>>> <Julian.Tenney at nottingham.ac.uk> wrote:
>>>>>1.7 / trunk and 1.8 are massively out of sync I'd guess.
>>>> I'm not sure either. How do we resolve this? I don't see much need to change
>>>> anything o the web-app / php side from now on in, other than your sessions
>>>> idea, I'm not aware of anything being worked on. So we can start getting to
>>>> a good source now?
>>>>
>>>> ________________________________
>>>> From: xerte-dev-bounces at lists.nottingham.ac.uk
>>>> [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Dave Burnett
>>>> [d_b_burnett at hotmail.com]
>>>> Sent: 29 February 2012 20:31
>>>> To: xerte-dev at lists.nottingham.ac.uk
>>>> Subject: [Xerte-dev] Re: Next Release
>>>>
>>>>
>>>> Would you keep selling caves on the San Andreas fault if you knew an
>>>> earthquake was imminent?
>>>> ;-)
>>>>
>>>>
>>>>
>>>>> Date: Wed, 29 Feb 2012 20:28:47 +0000
>>>>> From: patrick.lockley at googlemail.com
>>>>> To: xerte-dev at lists.nottingham.ac.uk
>>>>> Subject: [Xerte-dev] Re: Next Release
>>>>>
>>>>> I think more I was saying, nothing is obsolete, you could live in a
>>>>> cave if you wanted to, but some people like doors, but doors need a
>>>>> little work.
>>>>>
>>>>> 1.7 / trunk and 1.8 are massively out of sync I'd guess.
>>>>>
>>>>> On Wed, Feb 29, 2012 at 8:22 PM, Julian Tenney
>>>>> <Julian.Tenney at nottingham.ac.uk> wrote:
>>>>> > As long as we're close, we can manage it. Thanks.
>>>>> >
>>>>> > ________________________________
>>>>> > From: xerte-dev-bounces at lists.nottingham.ac.uk
>>>>> > [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Kemp Johnathan
>>>>> > [johnathan.kemp at ntlworld.com]
>>>>> > Sent: 29 February 2012 15:13
>>>>> >
>>>>> > To: For Xerte technical developers
>>>>> > Subject: [Xerte-dev] Re: Next Release
>>>>> >
>>>>> > It may be a bit tight to get all the Connector pages done by then but I
>>>>> > will
>>>>> > give it a go. If they arrive a few days later can I still sneak them in?
>>>>> >
>>>>> > Before I do any more on the routed pages I will finish off the work on
>>>>> > the
>>>>> > existing templates now that the work on the xwd is finished.
>>>>> >
>>>>> > The biggest issue I can see is the one of passing the name value from
>>>>> > the
>>>>> > xml data to be displayed as the page title and to populate the toc. Will
>>>>> > this all be done in the supporting swf files or will it be necessary to
>>>>> > alter the model files?
>>>>> >
>>>>> > Kind regards
>>>>> >
>>>>> > Johnathan
>>>>> >
>>>>> > On 29 February 2012 14:37, Julian Tenney
>>>>> > <Julian.Tenney at nottingham.ac.uk>
>>>>> > wrote:
>>>>> >>
>>>>> >> Hi,
>>>>> >>
>>>>> >> I'd really like to get the next version done for 30th March, so I
>>>>> >> reckon
>>>>> >> that gives a little bit of time to add any new bits and pieces, and
>>>>> >> then,
>>>>> >> from Monday 5th March we concentrate on testing what's there and
>>>>> >> putting
>>>>> >> that straight. The testing needs to complete by around 23rd (or more or
>>>>> >> less) so we can start thinking about making the builds etc.
>>>>> >>
>>>>> >> Is that OK with everyone?
>>>>> >>
>>>>> >> As a heads up, after that we are going to be looking at developing the
>>>>> >> html5 runtime, for the next six months at least. We need to think hard
>>>>> >> about
>>>>> >> how to best manage any new functionality to the existing system whilst
>>>>> >> we
>>>>> >> develop that. I would like to put a line in the sand that says after
>>>>> >> this
>>>>> >> build, play_560 will have an example of every page template in it (this
>>>>> >> will
>>>>> >> be my contribution to the testing), and the html5 runtime will
>>>>> >> (eventually)
>>>>> >> handle every page type in the build. What's going to be hard is having
>>>>> >> people adding new templates whilst we try and replicate the
>>>>> >> functionality in
>>>>> >> the new stuff.
>>>>> >>
>>>>> >> In the long term, we also need to give some more serious thought to the
>>>>> >> implications of where we are going, because at some point, the HTML5
>>>>> >> runtime
>>>>> >> will become the primary delivery system, and we have to look to a
>>>>> >> future
>>>>> >> where xerte is not part of the toolkits ecosystem at all. Finger in the
>>>>> >> air,
>>>>> >> I'd say that's 18 months - 2 years away, but maybe less.
>>>>> >>
>>>>> >> Once we get stuck into the new HTML5 stuff, we won't be looking to
>>>>> >> spend
>>>>> >> any time on the existing interface, accessibility, etc, but will deal
>>>>> >> with
>>>>> >> it all 'on the other side' as it were. After April I won't be looking
>>>>> >> to
>>>>> >> increase the number of templates in the main distribution.
>>>>> >>
>>>>> >> One of the biggest challenges of all this is to come up with some
>>>>> >> sensible
>>>>> >> framework for the javascript / css etc that will make it easy for
>>>>> >> developers
>>>>> >> to add new templates in the future. I still anticipate the xwd driving
>>>>> >> the
>>>>> >> wizard form, and therefore some xml payload being delivered to your
>>>>> >> code -
>>>>> >> somehow - for you to use to drive your templates, but we haven't even
>>>>> >> started to really think about that just yet.
>>>>> >>
>>>>> >> Thanks for all the work since September,
>>>>> >>
>>>>> >> J
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >> -----Original Message-----
>>>>> >> From: Tenney Julian
>>>>> >> Sent: 22 February 2012 13:04
>>>>> >> To: For Xerte technical developers
>>>>> >> Subject: RE: [Xerte-dev] Xerte 2.18 State of play
>>>>> >>
>>>>> >> Thanks very much Jonathan, that's brilliant
>>>>> >> ________________________________________
>>>>> >> From: xerte-dev-bounces at lists.nottingham.ac.uk
>>>>> >> [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Kemp Johnathan
>>>>> >> [johnathan.kemp at ntlworld.com]
>>>>> >> Sent: 22 February 2012 12:51
>>>>> >> To: Xerte Developers Discussion List
>>>>> >> Subject: [Xerte-dev] Xerte 2.18 State of play
>>>>> >>
>>>>> >> The setting of a time frame for the next release of Xerte certainly
>>>>> >> serves
>>>>> >> to focus the mind.
>>>>> >>
>>>>> >> I have taken the liberty of trying to pull together a list of what I
>>>>> >> think
>>>>> >> still needs doing or deciding upon, and what has been agreed or
>>>>> >> completed. I
>>>>> >> am not trying to tread on anyones toes, or take over management of the
>>>>> >> project. I just want to be sure that everything is covered, that there
>>>>> >> are
>>>>> >> no misunderstandings or differences in expectation, so that the project
>>>>> >> delivers on time.
>>>>> >>
>>>>> >> I will upload the list to the Xerte svn in the pageWizards folder as
>>>>> >> "Project State of Play.rtf" and have attached a copy here for
>>>>> >> convenience.
>>>>> >>
>>>>> >> I am sure I will have missed somethings off the list, so please feel
>>>>> >> free
>>>>> >> to edit the version in the svn so that we can all keep up to date on
>>>>> >> progress.
>>>>> >>
>>>>> >> As people complete things perhaps they could update the document
>>>>> >> accordingly in the svn.
>>>>> >>
>>>>> >> Kind regards
>>>>> >>
>>>>> >> Johnathan
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >> _______________________________________________
>>>>> >> Xerte-dev mailing list
>>>>> >> Xerte-dev at lists.nottingham.ac.uk
>>>>> >> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>>>> >>
>>>>> >> This message and any attachment are intended solely for the addressee
>>>>> >> and
>>>>> >> may contain confidential information. If you have received this message
>>>>> >> in
>>>>> >> error, please send it back to me, and immediately delete it.   Please
>>>>> >> do not
>>>>> >> use, copy or disclose the information contained in this message or in
>>>>> >> any
>>>>> >> attachment.  Any views or opinions expressed by the author of this
>>>>> >> email do
>>>>> >> not necessarily reflect the views of the University of Nottingham.
>>>>> >>
>>>>> >> This message has been checked for viruses but the contents of an
>>>>> >> attachment
>>>>> >> may still contain software viruses which could damage your computer
>>>>> >> system:
>>>>> >> you are advised to perform your own checks. Email communications with
>>>>> >> the
>>>>> >> University of Nottingham may be monitored as permitted by UK
>>>>> >> legislation.
>>>>> >>
>>>>> >
>>>>> >
>>>>> > This message and any attachment are intended solely for the addressee
>>>>> > and
>>>>> > may contain confidential information. If you have received this message
>>>>> > in
>>>>> > error, please send it back to me, and immediately delete it. Please do
>>>>> > not
>>>>> > use, copy or disclose the information contained in this message or in
>>>>> > any
>>>>> > attachment. Any views or opinions expressed by the author of this email
>>>>> > do
>>>>> > not necessarily reflect the views of the University of Nottingham.
>>>>> >
>>>>> > This message has been checked for viruses but the contents of an
>>>>> > attachment
>>>>> > may still contain software viruses which could damage your computer
>>>>> > system:
>>>>> > you are advised to perform your own checks. Email communications with
>>>>> > the
>>>>> > University of Nottingham may be monitored as permitted by UK
>>>>> > legislation.
>>>>> >
>>>>> >
>>>>> > _______________________________________________
>>>>> > Xerte-dev mailing list
>>>>> > Xerte-dev at lists.nottingham.ac.uk
>>>>> > http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>>>> >
>>>>> > This message and any attachment are intended solely for the addressee
>>>>> > and
>>>>> > may contain confidential information. If you have received this message
>>>>> > in
>>>>> > error, please send it back to me, and immediately delete it.   Please do
>>>>> > not
>>>>> > use, copy or disclose the information contained in this message or in
>>>>> > any
>>>>> > attachment.  Any views or opinions expressed by the author of this email
>>>>> > do
>>>>> > not necessarily reflect the views of the University of Nottingham.
>>>>> >
>>>>> > This message has been checked for viruses but the contents of an
>>>>> > attachment
>>>>> > may still contain software viruses which could damage your computer
>>>>> > system:
>>>>> > you are advised to perform your own checks. Email communications with
>>>>> > the
>>>>> > University of Nottingham may be monitored as permitted by UK
>>>>> > legislation.
>>>>> >
>>>>> >
>>>>>
>>>>> _______________________________________________
>>>>> Xerte-dev mailing list
>>>>> Xerte-dev at lists.nottingham.ac.uk
>>>>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>>>
>>>> This message and any attachment are intended solely for the addressee and
>>>> may contain confidential information. If you have received this message in
>>>> error, please send it back to me, and immediately delete it. Please do not
>>>> use, copy or disclose the information contained in this message or in any
>>>> attachment. Any views or opinions expressed by the author of this email do
>>>> not necessarily reflect the views of the University of Nottingham.
>>>>
>>>> This message has been checked for viruses but the contents of an attachment
>>>> may still contain software viruses which could damage your computer system:
>>>> you are advised to perform your own checks. Email communications with the
>>>> University of Nottingham may be monitored as permitted by UK legislation.
>>>>
>>>>
>>>> _______________________________________________
>>>> Xerte-dev mailing list
>>>> Xerte-dev at lists.nottingham.ac.uk
>>>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>>>
>>>> This message and any attachment are intended solely for the addressee and
>>>> may contain confidential information. If you have received this message in
>>>> error, please send it back to me, and immediately delete it.   Please do not
>>>> use, copy or disclose the information contained in this message or in any
>>>> attachment.  Any views or opinions expressed by the author of this email do
>>>> not necessarily reflect the views of the University of Nottingham.
>>>>
>>>> This message has been checked for viruses but the contents of an attachment
>>>> may still contain software viruses which could damage your computer system:
>>>> you are advised to perform your own checks. Email communications with the
>>>> University of Nottingham may be monitored as permitted by UK legislation.
>>>>
>>>>
>>>
>>> _______________________________________________
>>> Xerte-dev mailing list
>>> Xerte-dev at lists.nottingham.ac.uk
>>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>> _______________________________________________
>>> Xerte-dev mailing list
>>> Xerte-dev at lists.nottingham.ac.uk
>>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>>
>>> _______________________________________________
>>> Xerte-dev mailing list
>>> Xerte-dev at lists.nottingham.ac.uk
>>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev

More information about the Xerte-dev mailing list