[Pharo-project] Philippe's WebClient patches
Hi guys Philippe sent me these patches that apparently did not get into the webclient trunk. I will integrate them later with our fork since it does not seem possible otherwise. Stef
Anyway here are my patches.
Cheers Philippe
I just had a quick look (comparing pmm's latest package with 1.2 latest) and the merge should be feasable: there are some style differences (asString vs printString) some of my fixes are later/better, some of him are better... It is really amazing that somebody else also put in this effort (a good thing for Pharo though) On 25 Aug 2010, at 09:43, Stéphane Ducasse wrote:
Hi guys
Philippe sent me these patches that apparently did not get into the webclient trunk. I will integrate them later with our fork since it does not seem possible otherwise.
Stef
Anyway here are my patches.
Cheers Philippe <WebClient-Core-pmm.54.mcz><WebClient-Core-pmm.59.mcz><WebClient-Core-pmm.60.mcz><WebClient-Core-pmm.61.mcz><WebClient-Core-pmm.67.mcz><WebClient-Core-pmm.68.mcz>
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Ok sven could publish the merge in the inbox? Since you know your changes, else I will have to understand both :)
I just had a quick look (comparing pmm's latest package with 1.2 latest) and the merge should be feasable: there are some style differences (asString vs printString) some of my fixes are later/better, some of him are better...
It is really amazing that somebody else also put in this effort (a good thing for Pharo though)
On 25 Aug 2010, at 09:43, Stéphane Ducasse wrote:
Hi guys
Philippe sent me these patches that apparently did not get into the webclient trunk. I will integrate them later with our fork since it does not seem possible otherwise.
Stef
Anyway here are my patches.
Cheers Philippe <WebClient-Core-pmm.54.mcz><WebClient-Core-pmm.59.mcz><WebClient-Core-pmm.60.mcz><WebClient-Core-pmm.61.mcz><WebClient-Core-pmm.67.mcz><WebClient-Core-pmm.68.mcz>
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
I was afraid you were going to ask that ;-) OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did... On 25 Aug 2010, at 12:39, Stéphane Ducasse wrote:
Ok sven could publish the merge in the inbox? Since you know your changes, else I will have to understand both :)
On Aug 25, 2010, at 1:56 PM, Sven Van Caekenberghe wrote:
I was afraid you were going to ask that ;-)
but I'm easy going no :)
OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did...
Philippe? else I will do it. Stef
This is the merged version: http://www.squeaksource.com/ADayAtTheBeach/WebClient-Core-SvenVanCaekenbergh... ==================== Summary ==================== Name: WebClient-Core-SvenVanCaekenberghe.72 Author: SvenVanCaekenberghe Time: 25 August 2010, 5:22:16 pm UUID: 952161b4-521e-48fe-9338-ba90805327e3 Ancestors: WebClient-Core-StephaneDucasse.71, WebClient-Core-pmm.68 Merged changed contributed by Philippe Marschall 3 failures, 1 error; but these are different ones ;-) I guess these should be fixable, but I had little time. Now Andreas is already 3 version further (all committed yesterday) .... Sven On 25 Aug 2010, at 14:04, Stéphane Ducasse wrote:
On Aug 25, 2010, at 1:56 PM, Sven Van Caekenberghe wrote:
I was afraid you were going to ask that ;-)
but I'm easy going no :)
OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did...
Philippe? else I will do it.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Excellent! No stress we will batch the improvements :) I do not see it as running after, more doing my little market of improvements. Everything is in the stance. ;D Stef On Aug 25, 2010, at 5:31 PM, Sven Van Caekenberghe wrote:
This is the merged version:
http://www.squeaksource.com/ADayAtTheBeach/WebClient-Core-SvenVanCaekenbergh...
==================== Summary ====================
Name: WebClient-Core-SvenVanCaekenberghe.72 Author: SvenVanCaekenberghe Time: 25 August 2010, 5:22:16 pm UUID: 952161b4-521e-48fe-9338-ba90805327e3 Ancestors: WebClient-Core-StephaneDucasse.71, WebClient-Core-pmm.68
Merged changed contributed by Philippe Marschall
3 failures, 1 error; but these are different ones ;-) I guess these should be fixable, but I had little time.
Now Andreas is already 3 version further (all committed yesterday) ....
Sven
On 25 Aug 2010, at 14:04, Stéphane Ducasse wrote:
On Aug 25, 2010, at 1:56 PM, Sven Van Caekenberghe wrote:
I was afraid you were going to ask that ;-)
but I'm easy going no :)
OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did...
Philippe? else I will do it.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
On 25.08.2010 14:04, Stéphane Ducasse wrote:
On Aug 25, 2010, at 1:56 PM, Sven Van Caekenberghe wrote:
I was afraid you were going to ask that ;-)
but I'm easy going no :)
OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did...
Philippe?
Done. Some context for other people: The patches make Seaside on WebClient and Websockets work in Pharo 1.1 without any overrides or loading any other code. Currently I'm down to one multipart test failure. Cheers Philippe
On 08/26/2010 07:45 AM, Sven Van Caekenberghe wrote:
On 26 Aug 2010, at 07:39, Philippe Marschall wrote:
Currently I'm down to one multipart test failure.
Did you start from the latest 1.2 merged version ?
Nope, from Andreas' version. I'm on 1.1 an that's what I'm targeting. Cheers Philippe
On 26 Aug 2010, at 08:54, Philippe Marschall wrote:
Nope, from Andreas' version. I'm on 1.1 an that's what I'm targeting.
That's not good, this way we're working next to each other. Couldn't our port of WebClient-Core be made compatible with both 1.1 and 1.2 ? It's bad enough that the original author is not really interested in the Pharo port, but we should at least work together. Sven
Philippe it would be better to target 1.2 since we will probably to go in beta end of sept or before if the list I sent is integrated. Stef
Currently I'm down to one multipart test failure.
Did you start from the latest 1.2 merged version ?
Nope, from Andreas' version. I'm on 1.1 an that's what I'm targeting.
Cheers Philippe
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
participants (4)
-
Philippe Marschall -
Philippe Marschall -
Stéphane Ducasse -
Sven Van Caekenberghe