Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 3.2.1 #4511

Closed
wants to merge 17 commits into from
Closed

Release 3.2.1 #4511

wants to merge 17 commits into from

Conversation

waneck
Copy link
Member

@waneck waneck commented Aug 31, 2015

No description provided.

waneck and others added 17 commits August 3, 2015 06:35
@waneck
[cs] Do not add explicit interfaces as their real fields' overload
fd39983 
Closes HaxeFoundation#4363

(cherry picked from commit e5e422d)
@waneck
[java] Make sure that all properties for java.lang.* stubs are extern
b41619e 
Closes HaxeFoundation#4235

(cherry picked from commit c942509)
@waneck
[java/cs] Enable -dce no testing
96be178 
(cherry picked from commit c01c3dc)
@waneck
[cs] Really fix HaxeFoundation#4363
e5da054 
(cherry picked from commit 9e63a1b)
@waneck
[cs/java] Consider KExpr as Dynamic
d64f140 
Closes HaxeFoundation#4286

(cherry picked from commit 4004d7d)
@waneck
[cs] Check params array by length. Closes HaxeFoundation#4407
f54dc96 
(cherry picked from commit 3c9fc5d)
@waneck
[java/cs] Correctly restrict adding the abstract's own type params
ed94bd0 
To only the non-static functions

Closes HaxeFoundation#4460
Closes HaxeFoundation#4459

(cherry picked from commit 9990279)
@andyli
[SauceLabs] OSX 10.6 is no longer supported by SauceLabs
0844834
@andyli
[AppVeyor] use the default image
9d7a14b 
to allow faster builds when the update is available: http://www.appveyor.com/blog/2015/06/23/new-oss-build-environment-and-xamarin-support
@andyli
tweak unit test timeout
3bf4a6a 
because IEs...
@waneck
[js/flash] Don't trigger the slice problem
eb2771b 
(cherry picked from commit 280deac)
@andyli @waneck
[C#] fixed error CS1560
accce79 
(cherry picked from commit 6d0ca2d)
@waneck
Make the generic interface extern if the original class is extern as …
63099cf 
…well

Closes HaxeFoundation#4457

(cherry picked from commit e606373)
@hughsando
[cpp] Do not rely in reflection to make interfaces work for non-first…
408dda0 
… interface parents
@hughsando
Fix setting of static variables via reflection when class has no memb…
b51ae91 
…er variables. Closes HaxeFoundation/hxcpp#251
@Simn @waneck
[cpp] make sure StringMap's h field is kept if we use StringMap
5c1a8b0 
(cherry picked from commit 7ff9b21)
@waneck
Update release version and CHANGES.txt
62e7fa4
@Simn
Copy link
Member

Simn commented Aug 31, 2015

The changes look alright, my only concern is that this might cause chaos between our development and master branches when we try to do our next release.

@waneck
Copy link
Member Author

waneck commented Aug 31, 2015

Okay, I've done a small test development branch and made the merges from 3.2.1 master. The only conflicts we got were on CHANGES.txt and main.ml (because of version variable) - which are expected. Once we make the 3.2.1 release, I'll merge the changes back to development - so we won't get those conflicts anymore.

Is everyone happy with the changes? I'm thinking about making the release tonight - after I get sorted out the install bug on Mac "El Capitan"

@waneck
Copy link
Member Author

waneck commented Aug 31, 2015

For reference, the merged back version of master/development is at https://github.com/waneck/haxe/tree/dev-test

@skial skial mentioned this pull request Sep 2, 2015
Merged
@andyli
Copy link
Member

andyli commented Oct 5, 2015

It has been a month... Are there any remaining blocking issue?

@waneck
Copy link
Member Author

waneck commented Oct 5, 2015

No. I'm sorry, it was just me who had no time lately. I'll do it this
weekend.

On Mon, Oct 5, 2015, 4:10 AM Andy Li notifications@github.com wrote:

It has been a month... Are there any remaining blocking issue?

—
Reply to this email directly or view it on GitHub
#4511 (comment).

@andyli
Copy link
Member

andyli commented Oct 5, 2015

Great! Thanks for your effort, @waneck!

@aduros
Copy link
Contributor

aduros commented Oct 6, 2015

Can you please cherry pick c6597af into this release to fix the #4490 regression?

@andyli
Copy link
Member

andyli commented Oct 7, 2015

@aduros I forgot about it, sorry about that! Will do so.

@waneck This PR is made to merge from waneck:master to HF:master. Should it merge from HF:haxe-3.2.1 instead?
Btw, if I try to merge HF:haxe-3.2.1 and HF:development into HF:master, there will be merge conflict in gencpp... I suppose resolving using all of HF:development will work.

Well, git merge...
git merge

@derRaab
Copy link
Contributor

derRaab commented Oct 9, 2015

Just a quick reminder since I came across it:
On Mac OS X El Capitan Haxe itself has to move to /usr/local/lib AND haxelib needs a new default location: /usr/local/lib/haxe/lib (I think)

@waneck waneck closed this Oct 12, 2015
@waneck
Copy link
Member Author

waneck commented Oct 12, 2015

@andyli you're right; we should merge from the haxe-3.2.1 branch. I'll do it right now

@waneck
Copy link
Member Author

waneck commented Oct 12, 2015

I've just made the release. It's available at http://haxe.org/download/version/3.2.1/ . Please let me know if you find any problems - I'll promote it to the current version / announce it later at Monday night

@jangdan
Copy link

jangdan commented Oct 12, 2015

@waneck #4585

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@waneck @Simn @andyli @aduros @derRaab @jangdan @hughsando