Skip to content

Conversation

pierrejoye
Copy link

First fix to restore Windows support.

By the way, what do you think about merging php 5&7 in one branch and two separate folders:

  • php5
  • php7
  • config.m4
  • config.w32
  • readme...
    etc...

Doing so will allow cleaner versioning and support for semver. That will also make it very easy for build automation and release under pickle/composer (or existing pecl).

I can prepare a PR to do it if you like to, that would be awesome.

@pierrejoye
Copy link
Author

Also fixed the build now while being at it.

Mainly invalid declarations (php 5.x does not support c99)

@michael-grunder
Copy link
Member

I quite like your idea of merging the php7 code into develop this way. Ideally I would love to have just one branch but that will take ages to complete properly.

I think that would be a good solution for the next release.

I'll see about getting this and your other pull request merged and then hopefully we can get some people who have windows machines to verify that it works properly (being full hipster I don't have a windows box) :)

Mike

@pierrejoye
Copy link
Author

hi,

Thanks for looking at these PRs :)

Let me know (or I will see the notifications :) and I can do a PR to create
one branch for both. Maybe keep master for that then?

I could do it this week still :)

Thanks for your work!

On Wed, Mar 16, 2016 at 12:37 AM, Michael Grunder [email protected]
wrote:

I quite like your idea of merging the php7 code into develop this way.
Ideally I would love to have just one branch but that will take ages to
complete properly.

I think that would be a good solution for the next release.

I'll see about getting this and your other pull request merged and then
hopefully we can get some people who have windows machines to verify that
it works properly (being full hipster I don't have a windows box) :)

Mike


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#758 (comment)

Pierre

@pierrejoye | http://www.libgd.org

@yatsukhnenko
Copy link
Member

@pierrejoye, could you squash your commits into one and rebase it onto develop brunch?

@pierrejoye
Copy link
Author

Is it not possible to do that in GitHub directly now? The squash part.

Also I won't have the time until December to sync this patch with another
branch.

Cheers

On Nov 21, 2016 2:48 AM, "Pavlo Yatsukhnenko" [email protected]
wrote:

@pierrejoye https://github.com/pierrejoye, could you squash your
commits into one and rebase it onto develop brunch?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#758 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AARPKBjm9qsLLT3lfReyhC6vJ1T_UURJks5rAKPxgaJpZM4HuXbJ
.

@yatsukhnenko
Copy link
Member

yatsukhnenko commented Sep 5, 2017

@michael-grunder do we need this changes?

@yatsukhnenko
Copy link
Member

Probably no. Reopen if I'm wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants