I will also commit each block of changes a folder at a time, so people can see what has changed and then test accordingly<br><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 22, 2012 at 10:32 AM, Pat Lockley <span dir="ltr"><<a href="mailto:patrick.lockley@googlemail.com" target="_blank">patrick.lockley@googlemail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Right, so here is my process<br><br>Copy trunk into 1.8<br>I can commit all of my work into trunk.<br>Effectively abandon 1.9 - which I could rename 1.85?<br>
<br>THEN<br><br>1.9 branch is the 1.9 zip, and trunk becomes everyone's latest code?<div class="HOEnZb"><div class="h5"><br>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 22, 2012 at 10:00 AM, Tom Reijnders <span dir="ltr"><<a href="mailto:reijnders@tor.nl" target="_blank">reijnders@tor.nl</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
and trunk is newer than 1.8...<br>
<br>
<div>Op 22-11-2012 10:52, Julian Tenney
schreef:<br>
</div><div><div>
<blockquote type="cite">
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">Trunk
is the zip<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
<div>
<div style="border:none;border-top:solid #b5c4df 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal" style="margin-left:36.0pt"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <b>On
Behalf Of </b>Pat Lockley<br>
<b>Sent:</b> 22 November 2012 09:01<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: Players and alternative
formats<u></u><u></u></span></p>
</div>
</div>
<p class="MsoNormal" style="margin-left:36.0pt"><u></u> <u></u></p>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">Maybe I
crossed my own wires<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">Is 1.8 the
zip, or is trunk the zip?<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal" style="margin-right:0cm;margin-bottom:12.0pt;margin-left:36.0pt">Last
time trunk was the zip and 1.8 was the next version?<br>
<br>
On 22 Nov 2012, at 07:23, Tom Reijnders <<a href="mailto:reijnders@tor.nl" target="_blank">reijnders@tor.nl</a>>
wrote:<u></u><u></u></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<p class="MsoNormal" style="margin-right:0cm;margin-bottom:12.0pt;margin-left:36.0pt">We
are, aren't we? We do have a 1.8 branch.<br>
And we should make a branch for the december 7 release.
And fixes should go in there as well as trunk.<br>
<br>
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.<br>
<br>
Tom<u></u><u></u></p>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">Op
22-11-2012 0:06, Pat Lockley schreef:<u></u><u></u></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal" style="margin-left:36.0pt">Also,
should we move to a more formal trunk way of working
where the branches are old releases? <u></u><u></u></p>
<div>
<p class="MsoNormal" style="margin-right:0cm;margin-bottom:12.0pt;margin-left:36.0pt"><u></u> <u></u></p>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">On
Wed, Nov 21, 2012 at 10:42 PM, Pat Lockley <<a href="mailto:patrick.lockley@googlemail.com" target="_blank">patrick.lockley@googlemail.com</a>>
wrote:<u></u><u></u></p>
<p class="MsoNormal" style="margin-left:36.0pt">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?<br>
<br>
Alternatively, I could commit into 1.8 as I suspect
I've changed maybe 10 files (if that)<u></u><u></u></p>
<div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><br>
On 21 Nov 2012, at 22:32, Julian Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>
wrote:<br>
<br>
> 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.<br>
><br>
> Ron, Tom and David are the most likely to
be able to comment on any PHP changes since 1.8
they have made.<br>
><br>
> Probably worth trying at first into a dummy
folder or something 'safe', just to see how
things pan out?<br>
> ________________________________________<br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>]
On Behalf Of Pat Lockley [<a href="mailto:patrick.lockley@googlemail.com" target="_blank">patrick.lockley@googlemail.com</a>]<br>
> Sent: 21 November 2012 17:47<br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and
alternative formats<br>
><br>
> i've never merged before........<br>
><br>
><br>
> On Wed, Nov 21, 2012 at 4:42 PM, Julian
Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a><mailto:<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> I don’t think so. LTI just lets you open a
door into the application.<br>
><br>
> I’d rather deal with this now, than later
when it’s more complicated.<br>
><br>
> Why not try merging, and see if it looks
gribbly?<br>
><br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 16:36<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and
alternative formats<br>
><br>
> Could do, and just leave out the new
modules?<br>
><br>
> The changes I discussed don't exist in 1.9
just yet - would later in week.<br>
><br>
> 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....<br>
><br>
> On Wed, Nov 21, 2012 at 3:58 PM, Julian
Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a><mailto:<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> 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?<br>
><br>
><br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 15:53<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and
alternative formats<br>
><br>
> i could, but is the php in 1.8 svn?<br>
><br>
> It isn't a lot of php (an if statement or
two)<br>
><br>
> On Wed, Nov 21, 2012 at 3:16 PM, Julian
Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a><mailto:<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> 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.<br>
><br>
> Then in the wizard we can do<br>
><br>
> If (set as flash or undefined) //do it
flash style<br>
><br>
> Else<br>
><br>
> //do it html5 style<br>
><br>
> Appreciate the flash side is probably
easier than the PHP side…<br>
><br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 14:45<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and
alternative formats<br>
><br>
> -- Flash side --<br>
><br>
> put a radio button in the editor<br>
> add an extra parameter to the url
generation code (event handler for the play
button)<br>
><br>
> -- php side --<br>
><br>
> Edit preview and play .php to check for
this new $_GET and then branch<br>
><br>
> -- .htaccess side --<br>
><br>
> Mod the reg exp<br>
><br>
> On Wed, Nov 21, 2012 at 1:37 PM, Julian
Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a><mailto:<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> 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…?<br>
><br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 13:29<br>
><br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Re: Players and
alternative formats<br>
><br>
> Well it depends on what we call "now"<br>
><br>
><br>
> 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).<br>
><br>
> 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.<br>
><br>
> 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.<br>
><br>
> In theory you could also have
preview_560_html as well<br>
><br>
> It seems neater to me, but this is me
speaking from my cave.<br>
><br>
> Oooh a flint.<br>
><br>
> On Wed, Nov 21, 2012 at 12:57 PM, Julian
Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a><mailto:<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>>
wrote:<br>
> I like to generalise solutions too. What
would the implications be for what we have now?<br>
><br>
> From: <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>
[mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a><mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>>]
On Behalf Of Pat Lockley<br>
> Sent: 21 November 2012 12:43<br>
> To: For Xerte technical developers<br>
> Subject: [Xerte-dev] Players and
alternative formats<br>
><br>
> Hello all,<br>
><br>
> This is a message from deep inside
modularisation caves so it might not apply to
all.<br>
><br>
> I have a semi working google maps making
template, and when it "plays" at present it
draws a map using the google maps AP<u></u><u></u></p>
</div>
</div>
</div>
</div>
</blockquote>
</div>
</blockquote>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<p class="MsoNormal" style="margin-left:36.0pt">_______________________________________________<br>
Xerte-dev mailing list<br>
<a href="mailto:Xerte-dev@lists.nottingham.ac.uk" target="_blank">Xerte-dev@lists.nottingham.ac.uk</a><br>
<a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><u></u><u></u></p>
</div>
</blockquote>
</div>
<br>
<fieldset></fieldset>
<br>
<pre>_______________________________________________
Xerte-dev mailing list
<a href="mailto:Xerte-dev@lists.nottingham.ac.uk" target="_blank">Xerte-dev@lists.nottingham.ac.uk</a>
<a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
</blockquote>
<br>
</div></div><div><pre cols="72">--
--
Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196
</pre>
<br>
<br><br>
</div></div>
<br>_______________________________________________<br>
Xerte-dev mailing list<br>
<a href="mailto:Xerte-dev@lists.nottingham.ac.uk" target="_blank">Xerte-dev@lists.nottingham.ac.uk</a><br>
<a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
<br></blockquote></div><br></div>
</div></div></blockquote></div><br></div>