Skip to content

Commit 705b8d9

Browse files
jwillemsenjwillemsen
committed
ACE+TAO-6_5_13
1 parent 474ac23 commit 705b8d9

File tree

10 files changed

+278
-46
lines changed

10 files changed

+278
-46
lines changed

‎ACE/ChangeLogs/ACE-6_5_13‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
commit fb1c569bc48ecf8d8adc79af59fed680aa12d3dc
2+
Author: Fred Hornsey <[email protected]>
3+
Date: Wed May 12 15:14:57 2021 -0500
4+
5+
Fix Branch Issue with Release Script
6+
7+
Also do some cleanup, and change the `*_VERSION_CODE` macros to be
8+
formatted using hexadecimal.
9+
10+
commit b8cefe674cb26661cc1035115304fdfdb16c57f0
11+
Merge: 3f6995a6947 de11aebcd63
12+
Author: Adam Mitz <[email protected]>
13+
Date: Fri May 7 08:14:52 2021 -0500
14+
15+
Merge pull request #1503 from iguessthislldo/igtd/6-5-13-news
16+
17+
6.5.13 News
18+
19+
commit de11aebcd633592e09d7d4ab39fd991c7b12c373
20+
Author: Fred Hornsey <[email protected]>
21+
Date: Thu May 6 22:34:49 2021 -0500
22+
23+
Apply suggestions from code review
24+
25+
Co-authored-by: Adam Mitz <[email protected]>
26+
27+
commit f0d00737acf3cb588ecd6b8bf62034450e87a6a1
28+
Author: Fred Hornsey <[email protected]>
29+
Date: Thu May 6 18:09:40 2021 -0500
30+
31+
6.5.13 News
32+
33+
commit a9d7e7b9a82447e4f20c22f57b78a697ab5ba809
34+
Author: Fred Hornsey <[email protected]>
35+
Date: Thu May 6 11:30:18 2021 -0500
36+
37+
Remove Latest Branch Skip in Release Script
38+
39+
commit 87a939ae150be86cb4b2a1e2dedc6083b23e7e48
40+
Author: Fred Hornsey <[email protected]>
41+
Date: Wed May 5 23:43:56 2021 -0500
42+
43+
Branch Option for Release Script
44+
45+
commit e83a4ee8cb2285c002edaa38c7895c17d651bdfc
46+
Author: Fred Hornsey <[email protected]>
47+
Date: Tue Jan 19 11:28:42 2021 -0600
48+
49+
platform_g++_common.GNU: Remove ARFLAGS += -c
50+
51+
Older GNU ar may not have this option and this just supresses an extra
52+
log output, so we can remove it.
53+
54+
commit 5f014185220ac20655f4f3cbcf53c885c86c2449
55+
Author: Johnny Willemsen <[email protected]>
56+
Date: Mon Jan 18 19:05:05 2021 +0100
57+
58+
Manually apply fix of #1414 for ace6tao2
59+
60+
* ACE/include/makeinclude/platform_g++_common.GNU:
61+
62+
commit 83c488f991ead833aefaf297e2fbe50151e70910
63+
Author: Fred Hornsey <[email protected]>
64+
Date: Tue Jan 5 23:52:10 2021 -0600
65+
66+
Add Missing Export to ACE_OS::thr_gettid
67+
68+
commit a43b786edefd6ec11df656d918d16777da08f782
69+
Merge: f1733f33df4 eb4963c4747
70+
Author: Adam Mitz <[email protected]>
71+
Date: Tue Jan 5 08:51:46 2021 -0600
72+
73+
Merge pull request #1352 from kuznetsovmoci/IPv6_fixes
74+
75+
[ACE6] Fixes for IPv6 multicast and inet_ntop/inet_pton on Windows
76+
77+
commit eb4963c474759e86e6c621a5b240e708ec7af690
78+
Author: Mike Kuznetsov <[email protected]>
79+
Date: Mon Jan 4 15:11:53 2021 -0600
80+
81+
Fixes as per PR#1352 review
82+
83+
commit 96c0e79c13f98142c0e04c88f4e2ec4bc22396d5
84+
Author: Mike Kuznetsov <[email protected]>
85+
Date: Mon Jan 4 11:53:44 2021 -0600
86+
87+
Fixes as per PR#1352 review
88+
89+
commit 5a32d3b4aae39dec23a3dcd65fc7e1d47a269187
90+
Author: Fred Hornsey <[email protected]>
91+
Date: Wed Dec 30 18:07:41 2020 -0600
92+
93+
Fix Logic for ANDROID_ABI and ANDROID_ARCH
94+
95+
Also fix where I accidentally enabled NEON to be default that got
96+
carried over from ACE7. NEON should remain disabled by default in ACE6
97+
since that's how it currently is.
98+
99+
commit 51170e43e87ebac98e8de4a504f134edaf22159a
100+
Author: Fred Hornsey <[email protected]>
101+
Date: Wed Dec 30 17:41:01 2020 -0600
102+
103+
Always Define ANDROID_ABI for Compatibility
104+
105+
commit eb5d5e01a17054a5b568c4eae9c1c09cd2ab4178
106+
Author: Fred Hornsey <[email protected]>
107+
Date: Wed Dec 30 17:49:02 2020 -0600
108+
109+
Move -llog from platform_android.GNU to acedefaults
110+
111+
commit 1d5ef81d1eb0b38cad6628e9efca36778945b2ab
112+
Author: Fred Hornsey <[email protected]>
113+
Date: Tue Dec 29 22:01:50 2020 -0600
114+
115+
Fix Older NDKs Not Having armv7a-* Prefixed Tools
116+
117+
Will have to check for them or fallback to the arm-* prefix.
118+
119+
commit b7088652c6b5621f975dcd6b1699fc41fa3d8cc5
120+
Author: Fred Hornsey <[email protected]>
121+
Date: Tue Dec 29 22:01:18 2020 -0600
122+
123+
Revert to Current Include Style
124+
125+
commit f5c406b5cf67fd86deacd54a76d98bdc552ff5ec
126+
Author: Mike Kuznetsov <[email protected]>
127+
Date: Wed Dec 23 09:36:42 2020 -0600
128+
129+
Removed trailing whitespace
130+
131+
commit 43471263f8defb73609ada4b6d5c2925688b87dd
132+
Author: Mike Kuznetsov <[email protected]>
133+
Date: Wed Dec 23 09:25:18 2020 -0600
134+
135+
Fixes for IPv6 on Windows
136+
137+
commit f6770cf33569bf04bedfa8be87179e826cd79f70
138+
Author: Fred Hornsey <[email protected]>
139+
Date: Sat Dec 12 20:24:18 2020 -0600
140+
141+
Changes from #1321
142+
143+
https://github.com/DOCGroup/ACE_TAO/pull/1321
144+
145+
commit 66cd36af76472454c9575c92057e638893bb54d3
146+
Author: Fred Hornsey <[email protected]>
147+
Date: Sat Dec 12 20:23:47 2020 -0600
148+
149+
config-android.h: Minor Tweaks
150+
151+
commit 155a2b72c27bd2cc056914e4e68e779c2f1f2c63
152+
Author: Fred Hornsey <[email protected]>
153+
Date: Sun Dec 6 15:46:16 2020 -0600
154+
155+
Android NDK >=r19 for Direct Build
156+
157+
commit be6fe94f998d2f9bccc9e1d62b989157cd5352da
158+
Author: Johnny Willemsen <[email protected]>
159+
Date: Wed Oct 28 15:17:53 2020 +0100
160+
161+
Upgrade xcode check to include 12.0
162+
163+
* ACE/tests/Compiler_Features_32_Test.cpp:
164+
165+
commit 1d7c9f996e4b62c050e5a46e92e37c198b9c490c
166+
Author: Fred Hornsey <[email protected]>
167+
Date: Sat Dec 5 16:04:50 2020 -0600
168+
169+
Support Building with Android NDK Directly
170+
171+
Changes in https://github.com/DOCGroup/ACE_TAO/pull/1318 modified for
172+
capability's sake for ACE6.
173+
174+
- Made it easier to use `gnuace`-built libraries in as imported
175+
libraries in CMake-based Android Studio native projects.
176+
177+
- Replaced `ANDROID_ABI` with `android_abi`, but kept the former as an
178+
alias of the later for compatibility.
179+
180+
- Remove need to pass a macro to compiler about `android/ndk-version.h`
181+
unless the NDK is old

‎ACE/PROBLEM-REPORT-FORM‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
To: [email protected]
4141
Subject: [area]: [synopsis]
4242

43-
ACE VERSION: 6.5.12
43+
ACE VERSION: 6.5.13
4444

4545
HOST MACHINE and OPERATING SYSTEM:
4646
If on Windows based OS's, which version of WINSOCK do you

‎ACE/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is ACE version 6.5.12, released Tue Oct 27 12:46:14 CET 2020
1+
This is ACE version 6.5.13, released Fri May 14 09:39:28 CEST 2021
22

33
If you have any problems with or questions about ACE, please send
44
e-mail to the ACE mailing list ([email protected]),

‎ACE/ace/Version.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#define ACE_MAJOR_VERSION 6
66
#define ACE_MINOR_VERSION 5
7-
#define ACE_MICRO_VERSION 12
8-
#define ACE_BETA_VERSION 12
9-
#define ACE_VERSION "6.5.12"
10-
#define ACE_VERSION_CODE 394508
7+
#define ACE_MICRO_VERSION 13
8+
#define ACE_BETA_VERSION 13
9+
#define ACE_VERSION "6.5.13"
10+
#define ACE_VERSION_CODE 0x6050d
1111
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))

0 commit comments

Comments
 (0)