Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DOCGroup/ACE_TAO
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 87ccca600be8bbffa5d93c9de55f0b0868f3314b
Choose a base ref
..
head repository: DOCGroup/ACE_TAO
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 294c37330d65503bbe3d6e7ee39d07f2ad75c60d
Choose a head ref
Showing 940 changed files with 13,207 additions and 12,582 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

### Version

The version of ACE and/or TAO you are using
47 changes: 47 additions & 0 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: C/C++ CI

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
env:
ACE_ROOT: ${{ github.workspace }}/ACE
TAO_ROOT: ${{ github.workspace }}/TAO
MPC_ROOT: ${{ github.workspace }}/../MPC

steps:
- name: checkout ACE/TAO
uses: actions/checkout@v1
- name: checkout MPC
uses: actions/checkout@v1
with:
repository: DOCGroup/MPC
ref: master
fetch-depth: 1
- name: create $ACE_ROOT/ace/config.h
run: |
echo ${env:ACE_ROOT}
echo ${env:GITHUB_WORKSPACE}
'#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
shell: pwsh
- name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
run: |
'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
- name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
run: |
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
shell: pwsh
- name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
run: |
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4
shell: pwsh
- name: Build TAO_ACE project
run: |
make -j 6 -C ${env:TAO_ROOT}
shell: pwsh
- name: Build ACE/tests project
run: |
make -j 6 -C ${env:ACE_ROOT}/tests
shell: pwsh
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.vcxproj*
*.tlog
*.log
*.obj
*.obj*
*.ilk
*.exe
*.dll
@@ -15,6 +15,7 @@
*S_T.cpp
*S_T.h
*S_T.inl
*.bmak

.depend.*
GNUmakefile*
@@ -39,4 +40,6 @@ ipch/
*.o
*.res
*.opendb
*.VC.db
*.VC.db*
*.tds
*.*codeanalysis*
23 changes: 1 addition & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist: bionic
group: travis_latest
language: cpp
os:
@@ -25,33 +26,11 @@ env:

matrix:
include:
- compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libxerces-c-dev
- libssl-dev
- g++-7
env: COMPILER=g++-7 VERSIONED=1 TAO=1 ACETESTS=1
- compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libxerces-c-dev
- libssl-dev
- g++-6
env: COMPILER=g++-6 VERSIONED=1 TAO=1 ACETESTS=1
- os: osx
env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libssl-dev
- libxerces-c-dev
57 changes: 49 additions & 8 deletions ACE/ACE-INSTALL.html
Original file line number Diff line number Diff line change
@@ -463,8 +463,8 @@ <h2><a name="win32">Building and Installing ACE on Windows</a></h2>
Microsoft Visual Studio</a></h3>

<p>ACE contains project files for
Visual Studio 2015 (vc14), and Visual Studio 2017 (vc141).
Visual Studio 2015 and 2017 use different file formats but the same file
Visual Studio 2015 (vc14), Visual Studio 2017 (vc141), and Visual Studio 2019 (vc142).
Visual Studio 2015/2017/2019 use different file formats but the same file
suffixes (<code>.sln</code> and <code>.vcproj</code>). To support both
environments, ACE supplies files with different names for the different
development and target platforms. The platform/name mapping is shown below.
@@ -489,6 +489,11 @@ <h2><a name="win32">Building and Installing ACE on Windows</a></h2>
<td><i>name</i><code>_vs2017</code>
</td>
</tr>
<tr>
<th>Visual Studio 2019</th>
<td><i>name</i><code>_vs2019</code>
</td>
</tr>
</tbody></table>

<p>The VC++ compiler and linker can now be invoked from GNU make just like
@@ -1668,7 +1673,7 @@ <h3>Generating a Toolchain</h3>
<p><b>
It should be noted that starting in August 2019, the Google Play
Store will require new apps to have 64-bit libraries if they have native
libraries. 32-bit native libraries will still supported but they must also
libraries. 32-bit native libraries will still be supported but they must also
have 64-bit libraries. Look up any restrictions that may affect
apps you want to publish on the Play Store, including minimum API
level.
@@ -1810,6 +1815,44 @@ <h3>Building</h3>
application to a directory that allows execution and having any output
directed to a writable directory.</p>

<h3>Logging</h3>
<p>
On Android, <code>ACE_Log_Msg</code> (and therefore <code>ACE_DEBUG</code> and
<code>ACE_ERROR</code>) uses Android's logging system (aka Logcat) by default
in addition to <code>stderr</code> because <code>stdout</code> and
<code>stderr</code> are discarded under normal circumstances. To disable this
at runtime, run:
</p>

<p class="indent">
<code>ACE_LOG_MSG-&gt;clr_flags (ACE_Log_Msg::SYSLOG);</code>
</p>

<p>To disable this at compile time include these lines in <code>config.h</code>:</p>

<code class="indent">
#define ACE_DEFAULT_LOG_FLAGS ACE_Log_Msg::STDERR<br>
</code>
<code class="indent">
#define ACE_DEFAULT_LOG_BACKEND_FLAGS 0
</code>

<h3>OpenSSL</h3>
<p>
Depending on the features of ACE, TAO, or other software desired, you might need
OpenSSL. On Android, OpenSSL isn't part of the NDK Library and Android
preloads the system SSL library (either OpenSSL or BoringSSL) for the Java
Android API. This means OpenSSL <b>MUST</b> be statically linked to avoid
conflicts with the almost certianly incompatible system SSL library.

To build OpenSSL for Android, please read <code>NOTES.ANDROID</code> that comes
with OpenSSL's source code. The static libraries will used if the shared
libraries are not found. This can be accomplished by either disabling the
generation of the shared libraries by passing <code>no-shared</code> to
OpenSSL's <code>Configure</code> script or just deleting the so files after
building OpenSSL.
</p>

<hr>
<h1><a name="svcsinstall">Building and Installing ACE Network Services</a></h1>

@@ -3092,18 +3135,16 @@ <h2>To create an Eclipse project for ACE from a local source distribution:</h2>

On Windows, with Visual Studio 2017, you must generate solution and project files with MPC:<p>
<code> $ACE_ROOT/bin/mwc.pl -type vs2017 ACE.mwc </code> </p>

On Windows, with Visual Studio 2019, you must generate solution and project files with MPC:<p>
<code> $ACE_ROOT/bin/mwc.pl -type vs2019 ACE.mwc </code> </p>
</li><li>If you want to build TAO and its associated libraries
please see <a href="TAO/TAO-INSTALL.html">TAO-INSTALL</a> for details.
</li></ul>

<hr><p>

Back to the <a href="https://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</a>
home page.




</p><p>
<!--<EM>
Visitor #
Loading