Re: Proton Port for Windows
On Wed, 2012-11-14 at 09:19 -0500, Mary Hinton wrote: > ... > I'd like to share the status of the Windows port of the proton code. > ... > In the meantime, I would like to have a public place to put the port so that > others can join in with the Windows version. > > What is the best way to do this using git so that I don't interfere with the > current codebase? > I'd recommend using github (http://github.com). Essentially the process would be: * Fork the apache/qpid-proton repository * Clone the git repo on your local machine. * Create a local branch at the last sync point call it * Check in changes to which correspond to your windows patches - do this so that each change makes some sense by itself (preferably they successfully compile at least). * Push the branch from you local machine to github Github has some fairly competent windows tools at this point which are aimed at taking much of the confusion away from using git on windows. There is some fairly good online documentation about git - you can probably get to it from the help in github. Andrew
Re: Proton Port for Windows
[List added back in, because this is generally useful information] On Thu, 2012-11-15 at 09:41 -0500, Mary Hinton wrote: > Wanted to check a little more on how the github works. If I push a branch to > github, does it just stay in the github? > Do I have to worry about the Apache subversion process picking up what I push > to the github? > Or does the Apache just pick up the information in the github from those who > have permission to commit? The picture is strictly one way, like this: Apache svn -> Apache git mirror -> Github git mirror -/-> Private fork If you want to change the Apache upstream you can only do it by directly checking into the Apach svn repo. I don't think you have access to that so you needn't worry. The arrow is broken between the github mirror and your private fork because it doesn't update automatically after the point you make the fork on github. When you push changes to your private fork on github you make those changes public, but only for those that are looking at *your* fork specifically. Hopes that helps. Andrew
Re: Proton Port for Windows
Is it possible to have a look at the Windows port? I wouldn't mind even if it is a simple tgz/zip snapshot. Thanks, Ljupco On 14 November 2012 15:19, Mary Hinton wrote: > Hi everyone, > > > > I'd like to share the status of the Windows port of the proton code. > > > > The last rebase of the proton dll codebase was this Saturday, Nov. 10th. > > > > I haven't updated to the latest python tests yet, but currently, the port > is > running and passing most of the python tests. > > Totals: 119 tests, 105 passed, 6 skipped, 0 ignored, 8 failed > > > > I can run proton in both client and server mode and pass the messages > between the client/server proton executables. > > > > It will be a while for all the Jiras for the port to be discussed and > implemented to merge the two ports. I tried to maintain the code to keep > the > two versions working, but haven't actually tested my version on Linux yet. > There are #ifdef's around areas that are specific to each port. A lot of > these #ifdef's can be merged when the proton group decides on the best way > to handle the specific areas. > > > > In the meantime, I would like to have a public place to put the port so > that > others can join in with the Windows version. > > What is the best way to do this using git so that I don't interfere with > the > current codebase? > > > > Thanks, > > Mary Hinton > >
RE: Proton Port for Windows
Sure, it may take a while to get the proton group's approval for a merge. In the meantime, I have a snapshot of the Windows port at github. protonWinSnap is a snapshot of the code and protonWin will be the one used to add patches for the proton community to check out. To see the Windows port running, use this branch https://github.com/MaryDHinton/qpid-proton/tree/protonWinSnap To compile and run this code, all you should need to do is: Select the zip button on the page above and extract the code. Select the proton.sln file in the proton-c folder and open it in Visual Studio 2010. Compile the qpid-proton and proton projects. Go to the Debug folder and run proton (the debug version is the only mode set up, the release will have to be set up). You should be able to see messages passed between a proton client and server. The patches will be added to this branch as they become available: https://github.com/MaryDHinton/qpid-proton/commits/protonWin Let me know how it works for you. Mary Hinton -Original Message- From: Ljupco Taseski [mailto:t...@digiverse.si] Sent: Friday, November 30, 2012 5:45 AM To: proton@qpid.apache.org Cc: m.hin...@nc.rr.com Subject: Re: Proton Port for Windows Is it possible to have a look at the Windows port? I wouldn't mind even if it is a simple tgz/zip snapshot. Thanks, Ljupco On 14 November 2012 15:19, Mary Hinton wrote: > Hi everyone, > > > > I'd like to share the status of the Windows port of the proton code. > > > > The last rebase of the proton dll codebase was this Saturday, Nov. 10th. > > > > I haven't updated to the latest python tests yet, but currently, the > port is running and passing most of the python tests. > > Totals: 119 tests, 105 passed, 6 skipped, 0 ignored, 8 failed > > > > I can run proton in both client and server mode and pass the messages > between the client/server proton executables. > > > > It will be a while for all the Jiras for the port to be discussed and > implemented to merge the two ports. I tried to maintain the code to > keep the two versions working, but haven't actually tested my version > on Linux yet. > There are #ifdef's around areas that are specific to each port. A lot > of these #ifdef's can be merged when the proton group decides on the > best way to handle the specific areas. > > > > In the meantime, I would like to have a public place to put the port > so that others can join in with the Windows version. > > What is the best way to do this using git so that I don't interfere > with the current codebase? > > > > Thanks, > > Mary Hinton > >
Re: Proton Port for Windows
Thanks! protonWinSnap works fine for me, at least from what I have seen so far. If I understood correctly, protonWinSnap will be kept up to date until the merge to the main codebase is done, and that protonWin is meant only for patch reviews? Regards, Ljupco On 30 November 2012 14:27, Mary Hinton wrote: > Sure, it may take a while to get the proton group's approval for a merge. > In the meantime, I have a snapshot of the Windows port at github. > > protonWinSnap is a snapshot of the code and protonWin will be the one used > to add patches for the proton community to check out. > > To see the Windows port running, use this branch > https://github.com/MaryDHinton/qpid-proton/tree/protonWinSnap > > To compile and run this code, all you should need to do is: > > Select the zip button on the page above and extract the code. > Select the proton.sln file in the proton-c folder and open it in Visual > Studio 2010. > Compile the qpid-proton and proton projects. > Go to the Debug folder and run proton (the debug version is the only mode > set up, the release will have to be set up). > > You should be able to see messages passed between a proton client and > server. > > The patches will be added to this branch as they become available: > https://github.com/MaryDHinton/qpid-proton/commits/protonWin > > Let me know how it works for you. > Mary Hinton > > -Original Message- > From: Ljupco Taseski [mailto:t...@digiverse.si] > Sent: Friday, November 30, 2012 5:45 AM > To: proton@qpid.apache.org > Cc: m.hin...@nc.rr.com > Subject: Re: Proton Port for Windows > > Is it possible to have a look at the Windows port? > > I wouldn't mind even if it is a simple tgz/zip snapshot. > > > Thanks, Ljupco >
RE: Proton Port for Windows
I'm glad protonWinSnap worked for you. You're right about protonWin. It is just for patch reviews and will not compile in Windows without all the patches added to the code. I won't be able to keep protonWinSnap as up to date as I would like, but if it gets too far out of date, let me know and I will try to rebase the code with the current proton codebase. Right now, I'm trying to get the amqpd.dll broker plug-in (a project created within QPID) to load. To get the new AMQP 1.0 (includes proton) to compile, I had to change some code and don't have everything resolved yet. Mary Hinton From: Ljupco Taseski [mailto:t...@digiverse.si] Sent: Tuesday, December 04, 2012 11:35 AM To: Mary Hinton Cc: proton@qpid.apache.org Subject: Re: Proton Port for Windows Thanks! protonWinSnap works fine for me, at least from what I have seen so far. If I understood correctly, protonWinSnap will be kept up to date until the merge to the main codebase is done, and that protonWin is meant only for patch reviews? Regards, Ljupco On 30 November 2012 14:27, Mary Hinton wrote: Sure, it may take a while to get the proton group's approval for a merge. In the meantime, I have a snapshot of the Windows port at github. protonWinSnap is a snapshot of the code and protonWin will be the one used to add patches for the proton community to check out. To see the Windows port running, use this branch https://github.com/MaryDHinton/qpid-proton/tree/protonWinSnap To compile and run this code, all you should need to do is: Select the zip button on the page above and extract the code. Select the proton.sln file in the proton-c folder and open it in Visual Studio 2010. Compile the qpid-proton and proton projects. Go to the Debug folder and run proton (the debug version is the only mode set up, the release will have to be set up). You should be able to see messages passed between a proton client and server. The patches will be added to this branch as they become available: https://github.com/MaryDHinton/qpid-proton/commits/protonWin Let me know how it works for you. Mary Hinton -Original Message- From: Ljupco Taseski [mailto:t...@digiverse.si] Sent: Friday, November 30, 2012 5:45 AM To: proton@qpid.apache.org Cc: m.hin...@nc.rr.com Subject: Re: Proton Port for Windows Is it possible to have a look at the Windows port? I wouldn't mind even if it is a simple tgz/zip snapshot. Thanks, Ljupco