From 34bce104ec297dd092f0c2b356c8533ba29c30fc Mon Sep 17 00:00:00 2001 From: Juan Facorro Date: Sat, 12 Jan 2019 11:11:15 +0100 Subject: Update to icon with better resolution --- lib/wx/c_src/wxe_ps_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c index 4b3b47a80b..a01d12647e 100644 --- a/lib/wx/c_src/wxe_ps_init.c +++ b/lib/wx/c_src/wxe_ps_init.c @@ -80,7 +80,7 @@ void * wxe_ps_init2() { } // Load and set icon NSMutableString *file = [[NSMutableString alloc] init]; - [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo64.png"]; + [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo128.png"]; NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file]; [NSApp setApplicationIconImage: icon]; }; -- cgit v1.2.3 From 0589cf1e48df6efa72b4f9c41cecde73d17fe4e9 Mon Sep 17 00:00:00 2001 From: Juan Facorro Date: Sat, 12 Jan 2019 11:46:03 +0100 Subject: Enable setting custom application icon for Mac OS X through environment variable --- lib/wx/c_src/wxe_ps_init.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c index a01d12647e..62c7c51c13 100644 --- a/lib/wx/c_src/wxe_ps_init.c +++ b/lib/wx/c_src/wxe_ps_init.c @@ -64,6 +64,10 @@ void * wxe_ps_init2() { size_t app_len = 127; char app_title_buf[128]; char * app_title; + size_t app_icon_len = 1023; + char app_icon_buf[1024]; + char * app_icon; + // Setup and enable gui pool = [[NSAutoreleasePool alloc] init]; @@ -78,9 +82,15 @@ void * wxe_ps_init2() { if(!GetCurrentProcess(&psn)) { CPSSetProcessName(&psn, app_title?app_title:"Erlang"); } - // Load and set icon + // Enable setting custom application icon for Mac OS X + res = erl_drv_getenv("WX_APP_ICON", app_icon_buf, &app_icon_len); NSMutableString *file = [[NSMutableString alloc] init]; - [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo128.png"]; + if (res >= 0) { + [file appendFormat:@"%s", app_icon_buf]; + } else { + [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo128.png"]; + } + // Load and set icon NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file]; [NSApp setApplicationIconImage: icon]; }; -- cgit v1.2.3 From c2410f4b43606f4523acc648308daf5d18f2e253 Mon Sep 17 00:00:00 2001 From: Juan Facorro Date: Wed, 23 Jan 2019 20:14:05 +0100 Subject: Include erlang-logo128.png in release --- lib/wx/c_src/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index daa8afce83..8ec64bea7e 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -181,6 +181,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv" $(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/" $(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/" + $(INSTALL_DATA) ../priv/erlang-logo128.png "$(RELSYSDIR)/priv/" $(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/" $(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/" -- cgit v1.2.3 From c8d67fb2ae0a3c1b03a3ad72ec1ac4b1b0d02f4e Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 24 Jan 2019 09:03:12 +0100 Subject: Prepare release --- erts/doc/src/notes.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++ erts/vsn.mk | 2 +- lib/inets/doc/src/notes.xml | 20 ++++++++++++++++++- lib/inets/vsn.mk | 2 +- make/otp_version_tickets | 11 ++++------- 5 files changed, 72 insertions(+), 10 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 42eccf4f9f..fca1bdd8cc 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,53 @@

This document describes the changes made to the ERTS application.

+
Erts 10.2.3 + +
Fixed Bugs and Malfunctions + + +

+ Fix bug where doing a gen_tcp:send on a socket + with delay_send set to true could cause a segfault + if the other side closes the connection.

+

+ Bug was introduced in erts-10.2 (OTP-21.2).

+

+ Own Id: OTP-15536 Aux Id: ERL-827

+ + +

+ Fix a race condition when a port program closes that + could result in the next started port to hang during + startup.

+

+ When this fault happens the following error is normally + (but not always) logged:

+

+ =ERROR REPORT==== 14-Jan-2019::10:45:52.868246 + ===
Bad input fd in erts_poll()! fd=11, + port=#Port<0.505>, driver=spawn, name=/bin/sh -s + unix:cmd

+

+ Bug was introduced in erts-10.0 (OTP-21.0).

+

+ Own Id: OTP-15537

+ + +

+ Fix a bug where polling for external events could be + delayed for a very long time if all active schedulers + were 100% loaded.

+

+ Bug was introduced in erts-10.2 (OTP-21.2).

+

+ Own Id: OTP-15538 Aux Id: ERIERL-229

+ + +
+ +
+
Erts 10.2.2
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index c579b6364a..9c912a422b 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.2.2 +VSN = 10.2.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 12f5acb2e9..cf39ab4796 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,25 @@ notes.xml -
Inets 7.0.3 +
Inets 7.0.4 + +
Fixed Bugs and Malfunctions + + +

+ Make sure ipv6 addresses with brackets in URIs are + converted correctly before passing to lower level + functions like gen_tcp and ssl functions. Could cause + connection to fail.

+

+ Own Id: OTP-15544 Aux Id: ERIERL-289

+ + +
+ +
+ +
Inets 7.0.3
Fixed Bugs and Malfunctions diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 52c05a7974..1d1560213e 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 7.0.3 +INETS_VSN = 7.0.4 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" diff --git a/make/otp_version_tickets b/make/otp_version_tickets index c0c9eb8c8b..4e6277bc58 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,7 +1,4 @@ -OTP-15477 -OTP-15492 -OTP-15495 -OTP-15501 -OTP-15504 -OTP-15505 -OTP-15509 +OTP-15536 +OTP-15537 +OTP-15538 +OTP-15544 -- cgit v1.2.3 From 35f51c7f057943c25ccb7997526c9d47aed0cd0b Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 24 Jan 2019 09:03:20 +0100 Subject: Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 1d465d2604..0f058b4809 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.2.3 +21.2.4 diff --git a/otp_versions.table b/otp_versions.table index 4a558df52d..65ac84e9ff 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-21.2.4 : erts-10.2.3 inets-7.0.4 # asn1-5.0.8 common_test-1.16.1 compiler-7.3.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 ssl-9.1.2 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.19 : OTP-21.2.3 : compiler-7.3.1 erts-10.2.2 ssl-9.1.2 xmerl-1.3.19 # asn1-5.0.8 common_test-1.16.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 : OTP-21.2.2 : ssh-4.7.3 # asn1-5.0.8 common_test-1.16.1 compiler-7.3 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 erts-10.2.1 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssl-9.1.1 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.18 : OTP-21.2.1 : erts-10.2.1 ssl-9.1.1 # asn1-5.0.8 common_test-1.16.1 compiler-7.3 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.2 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.18 : -- cgit v1.2.3