[Xerte-dev] Re: Players and alternative formats

Pat Lockley patrick.lockley at googlemail.com
Thu Nov 22 11:53:48 GMT 2012 

So

I check out a clean trunk

I then merge 1.9 into trunk

test this code

then commit


On Thu, Nov 22, 2012 at 11:44 AM, Tom Reijnders <reijnders at tor.nl> wrote:

>  Hold on....
>
> How and what are you going to commit to trunk?
>
> This is how svn merge is supposed to work.
>
> 1. Make sure all your changes are somewhere on a branch
> 2. Checkout a clean copy of the branch you want to merg in and where you
> want your code to end up (in your case: trunk)
> 3. svn merge the branch with your code into that clean chackout. Fix
> conficts, test, do whatever is needed to make this work.
> 4. Now you can commit 3. (in this case commit into trunk)
>
> Do NOT copy your changes over your local trunk and commit then, because
> now you cannot verify conflicts and you risk throwing away other peoples
> fixes.
>
> Sorry if this was already clear to you...
>
> Tom
>
> Op 22-11-2012 12:04, Pat Lockley schreef:
>
> Ok, so I rename 1.9 to be 1.85, then commit to trunk
>
> and then
>
> the next zip is branch 1.9 and the trunk is always the "next working
> version"
>
> If I want to wander off in my own direction again I should make a folder
> in branches called Pat or some such
>
>
> On Thu, Nov 22, 2012 at 10:58 AM, Julian Tenney <
> Julian.Tenney at nottingham.ac.uk> wrote:
>
>>  The trunk is where all my changes / fixes have been going…
>>
>>
>>
>> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Pat Lockley
>> *Sent:* 22 November 2012 10:32
>>
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: Players and alternative formats
>>
>>
>>
>> Right, so here is my process
>>
>> Copy trunk into 1.8
>> I can commit all of my work into trunk.
>> Effectively abandon 1.9 - which I could rename 1.85?
>>
>> THEN
>>
>> 1.9 branch is the 1.9 zip, and trunk becomes everyone's latest code?
>>
>>
>>
>> On Thu, Nov 22, 2012 at 10:00 AM, Tom Reijnders <reijnders at tor.nl> wrote:
>>
>> and trunk is newer than 1.8...
>>
>> Op 22-11-2012 10:52, Julian Tenney schreef:
>>
>>  Trunk is the zip
>>
>>
>>
>> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [
>> mailto:xerte-dev-bounces at lists.nottingham.ac.uk<xerte-dev-bounces at lists.nottingham.ac.uk>]
>> *On Behalf Of *Pat Lockley
>> *Sent:* 22 November 2012 09:01
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: Players and alternative formats
>>
>>
>>
>> Maybe I crossed my own wires
>>
>>
>>
>> Is 1.8 the zip, or is trunk the zip?
>>
>>
>>
>> Last time trunk was the zip and 1.8 was the next version?
>>
>> On 22 Nov 2012, at 07:23, Tom Reijnders <reijnders at tor.nl> wrote:
>>
>>  We are, aren't we? We do have a 1.8 branch.
>> And we should make a branch for the december 7 release. And fixes should
>> go in there as well as trunk.
>>
>> It is a bit unfortunate that your branch is called 1.9, that should have
>> been pats_1.9. But, we can work around that, perhaps even renaming your
>> branch.
>>
>> Tom
>>
>> Op 22-11-2012 0:06, Pat Lockley schreef:
>>
>>  Also, should we move to a more formal trunk way of working where the
>> branches are old releases?
>>
>>
>>
>> On Wed, Nov 21, 2012 at 10:42 PM, Pat Lockley <
>> patrick.lockley at googlemail.com> wrote:
>>
>> I don't get the process here though and there is a lot of core I can't
>> test - no ldap, no multiuser and sharing and so on. Could the sandbox
>> switch to 1.9?
>>
>> Alternatively, I could commit into 1.8 as I suspect I've changed maybe 10
>> files (if that)
>>
>>
>> On 21 Nov 2012, at 22:32, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
>> wrote:
>>
>> > well, I think it will be for you to attempt to merge, and when you have
>> code in files that have changed since you branched, it's going to be down
>> to you to make sure your new code doesn't break anything that has changed
>> since you branched. I don't think too much has - you can also get a log of
>> each file so you can step through changes that have been mde to that file.
>> I'm guessing that to ull this off, you'll have changed some core stuff, but
>> I don't know how much. From our point ofview the only thing that has
>> changed is the html5 stuff, and that is mostly client side. My own changes
>> are client side, but might have fixed the odd PHP thing.
>> >
>> > Ron, Tom and David are the most likely to be able to comment on any PHP
>> changes since 1.8 they have made.
>> >
>> > Probably worth trying at first into a dummy folder or something 'safe',
>> just to see how things pan out?
>> > ________________________________________
>> > 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: 21 November 2012 17:47
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Re: Players and alternative formats
>> >
>> > i've never merged before........
>> >
>> >
>> > On Wed, Nov 21, 2012 at 4:42 PM, Julian Tenney <
>> Julian.Tenney at nottingham.ac.uk<mailto:Julian.Tenney at nottingham.ac.uk>>
>> wrote:
>> > I don’t think so. LTI just lets you open a door into the application.
>> >
>> > I’d rather deal with this now, than later when it’s more complicated.
>> >
>> > Why not try merging, and see if it looks gribbly?
>> >
>> > From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk>] On Behalf Of Pat Lockley
>> > Sent: 21 November 2012 16:36
>> >
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Re: Players and alternative formats
>> >
>> > Could do, and just leave out the new modules?
>> >
>> > The changes I discussed don't exist in 1.9 just yet - would later in
>> week.
>> >
>> > I need to list what's changed for the purposes of testing, but am a bit
>> worried that since the 1.9 branch was made a lot of new stuff has joined
>> 1.8 (LTI for example) and I might undo some stuff? I can't see it clashing,
>> but....
>> >
>> > On Wed, Nov 21, 2012 at 3:58 PM, Julian Tenney <
>> Julian.Tenney at nottingham.ac.uk<mailto:Julian.Tenney at nottingham.ac.uk>>
>> wrote:
>> > Why don’t you merge in your mod stuff, it won’t make a lot of odds to
>> most people, but will allow some cool stuff later… most people won’t see
>> any difference, right?
>> >
>> >
>> > From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk>] On Behalf Of Pat Lockley
>> > Sent: 21 November 2012 15:53
>> >
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Re: Players and alternative formats
>> >
>> > i could, but is the php in 1.8 svn?
>> >
>> > It isn't a lot of php (an if statement or two)
>> >
>> > On Wed, Nov 21, 2012 at 3:16 PM, Julian Tenney <
>> Julian.Tenney at nottingham.ac.uk<mailto:Julian.Tenney at nottingham.ac.uk>>
>> wrote:
>> > Could you do the php side? In the wizard we can add a parameter to the
>> LO playback=”flash” which can be updated to playback=”html” for people who
>> want to experiment with the beta.
>> >
>> > Then in the wizard we can do
>> >
>> > If (set as flash or undefined) //do it flash style
>> >
>> > Else
>> >
>> > //do it html5 style
>> >
>> > Appreciate the flash side is probably easier than the PHP side…
>> >
>> > From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk>] On Behalf Of Pat Lockley
>> > Sent: 21 November 2012 14:45
>> >
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Re: Players and alternative formats
>> >
>> > -- Flash side --
>> >
>> > put a radio button in the editor
>> > add an extra parameter to the url generation code (event handler for
>> the play button)
>> >
>> > -- php side --
>> >
>> > Edit preview and play .php to check for this new $_GET and then branch
>> >
>> > -- .htaccess side --
>> >
>> > Mod the reg exp
>> >
>> > On Wed, Nov 21, 2012 at 1:37 PM, Julian Tenney <
>> Julian.Tenney at nottingham.ac.uk<mailto:Julian.Tenney at nottingham.ac.uk>>
>> wrote:
>> > Time is of the essence for the 1.9 drop because we want to get that
>> done by 30th November, so I like what you’re saying, but wonder if it can
>> be done in time…?
>> >
>> > From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk>] On Behalf Of Pat Lockley
>> > Sent: 21 November 2012 13:29
>> >
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Re: Players and alternative formats
>> >
>> > Well it depends on what we call "now"
>> >
>> >
>> > It's a bit roadmappy, but for 1.9 you'd not have html_play.php and
>> play.php, but one play.php which would then switch on the variable set
>> (within the module folder).
>> >
>> > You'd have an option somewhere of setting "HTML5" somehow (perhaps a
>> radio box on the editor?) which would then send a request to set this
>> session to be "HTML5" and all previews from then on would be HTML5 mode.
>> >
>> > Then you add an extension to the current play rule in htaccess to
>> support a "third" variable, so play_560_html would play the template in
>> HTML5 mode. In the future, play_560_scorm would do the scorm export. As
>> long as play_560_[a-z]+ was handled in the php play code for that module
>> you could do whatever you wanted to do.
>> >
>> > In theory you could also have preview_560_html as well
>> >
>> > It seems neater to me, but this is me speaking from my cave.
>> >
>> > Oooh a flint.
>> >
>> > On Wed, Nov 21, 2012 at 12:57 PM, Julian Tenney <
>> Julian.Tenney at nottingham.ac.uk<mailto:Julian.Tenney at nottingham.ac.uk>>
>> wrote:
>> > I like to generalise solutions too. What would the implications be for
>> what we have now?
>> >
>> > From: xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk> [mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk<mailto:
>> xerte-dev-bounces at lists.nottingham.ac.uk>] On Behalf Of Pat Lockley
>> > Sent: 21 November 2012 12:43
>> > To: For Xerte technical developers
>> > Subject: [Xerte-dev] Players and alternative formats
>> >
>> > Hello all,
>> >
>> > This is a message from deep inside modularisation caves so it might not
>> apply to all.
>> >
>> > I have a semi working google maps making template, and when it "plays"
>> at present it draws a map using the google maps AP
>>
>>   _______________________________________________
>> 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
>>
>>
>>
>> --
>>
>> --
>>
>>
>>
>> Tom Reijnders
>>
>> TOR Informatica
>>
>> Chopinlaan 27
>>
>> 5242HM Rosmalen
>>
>> Tel: 073 5226191
>>
>> Fax: 073 5226196
>>
>>
>>
>>
>>
>>
>> _______________________________________________
>> 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 listXerte-dev at lists.nottingham.ac.ukhttp://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
> --
> --
>
> Tom Reijnders
> TOR Informatica
> Chopinlaan 27
> 5242HM Rosmalen
> Tel: 073 5226191
> Fax: 073 5226196
>
>
>
>
>
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20121122/7af63cec/attachment-0001.html>

More information about the Xerte-dev mailing list