summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/linux.yml40
-rw-r--r--ACE/ace/ACE_FOR_TAO.pc.in10
-rw-r--r--ACE/ace/Monitor_Control/ACE_Monitor_Control.pc.in11
-rw-r--r--ACE/ace/Monitor_Control/Monitor_Control.mpc4
-rw-r--r--ACE/ace/ace_for_tao.mpc7
-rwxr-xr-xACE/bin/ace_install_pkgconfig.pl2
-rw-r--r--TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in2
-rw-r--r--TAO/tao/Monitor/TAO_Monitor.pc.in2
8 files changed, 55 insertions, 23 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 564d3252d0f..529b5cb1151 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,6 +32,7 @@ jobs:
PackageDeps: g++-7
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
os: ubuntu-18.04
+ CheckPkgConfig: 1
- CC: gcc-8
CXX: g++-8
PackageDeps: g++-8
@@ -149,54 +150,55 @@ jobs:
CC: ${{ matrix.CC }}
CXX: ${{ matrix.CXX }}
steps:
- - name: checkout ACE/TAO
+ - name: Checkout ACE_TAO
uses: actions/checkout@v2
- - name: checkout MPC
+ - name: Checkout MPC
uses: actions/checkout@v2
with:
repository: DOCGroup/MPC
path: ${{ env.MPC_ROOT }}
- - name: Add Repo
+ - name: Add apt repo
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
if: matrix.Repo != ''
- - name: Add packages
+ - name: Add apt packages
run: |
sudo apt-get --yes update
sudo apt-get --yes install libxerces-c-dev libssl-dev ${{ matrix.PackageDeps }}
- - name: create $ACE_ROOT/ace/config.h
+ - name: Create $ACE_ROOT/ace/config.h
run: |
'#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
shell: pwsh
- - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
+ - name: Create $ACE_ROOT/include/makeinclude/platform_macros.GNU
run: |
'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+ 'INSTALL_PREFIX = ${{ github.workspace }}/installed' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
- - name: add optional optional macros
+ - name: Add optional platform macros
run: |
'${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
if: matrix.optional_macros != ''
- - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+ - name: Extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
run: |
- '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+ '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
- - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+ - name: Create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
run: |
'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
shell: pwsh
- - name: add optional optional feature
+ - name: Add optional MPC features
run: |
'${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
if: matrix.optional_feature != ''
shell: pwsh
- - name: initialize CodeQL
+ - name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: cpp
@@ -209,14 +211,24 @@ jobs:
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
+ - name: Build TAO_ACE workspace
run: |
make -j 6 -C ${env:TAO_ROOT}
shell: pwsh
- - name: Build ACE/tests project
+ - name: Build ACE/tests workspace
run: |
make -j 6 -C ${env:ACE_ROOT}/tests
shell: pwsh
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
if: matrix.feature == 'CodeQL'
+ - name: Install TAO_ACE workspace
+ run: |
+ make -C ${env:TAO_ROOT} install
+ shell: pwsh
+ - name: Test pkgconfig
+ if: matrix.CheckPkgConfig
+ run: |
+ cd ${{ github.workspace }}/installed/lib/pkgconfig
+ export PKG_CONFIG_PATH=.
+ for f in *.pc; do pkg-config --print-errors --exists ${f%.pc}; done
diff --git a/ACE/ace/ACE_FOR_TAO.pc.in b/ACE/ace/ACE_FOR_TAO.pc.in
new file mode 100644
index 00000000000..4101025d971
--- /dev/null
+++ b/ACE/ace/ACE_FOR_TAO.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_FOR_TAO
+Description: ADAPTIVE Communication Environment subset for use by TAO
+Version: @VERSION@
+Libs: -L${libdir} -lACE_FOR_TAO @LIBS@
+Cflags: -I${includedir}
diff --git a/ACE/ace/Monitor_Control/ACE_Monitor_Control.pc.in b/ACE/ace/Monitor_Control/ACE_Monitor_Control.pc.in
new file mode 100644
index 00000000000..57867c7d470
--- /dev/null
+++ b/ACE/ace/Monitor_Control/ACE_Monitor_Control.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_Monitor_Control
+Description: ACE Monitoring and Control Library
+Requires: ACE_ETCL_Parser
+Version: @VERSION@
+Libs: -L${libdir} -lACE_Monitor_Control
+Cflags: -I${includedir}
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc
index d1d22614b0f..a13930e845e 100644
--- a/ACE/ace/Monitor_Control/Monitor_Control.mpc
+++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc
@@ -36,6 +36,10 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install {
install_dir = ace/Monitor_Control
}
+ Pkgconfig_Files {
+ ACE_Monitor_Control.pc.in
+ }
+
specific (prop:microsoft) {
lit_libs += pdh
}
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 629b5c9d145..6fc36f53daf 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -296,7 +296,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
Guard_T.inl
Handle_Gobbler.inl
Lock_Adapter_T.inl
- OS_Memory.inl
Refcounted_Auto_Ptr.inl
Reverse_Lock_T.inl
TSS_T.inl
@@ -315,7 +314,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
Countdown_Time.h
Default_Constants.h
Event_Base.h
- Exception_Macros.h
Global_Macros.h
Guard_T.h
Handle_Gobbler.h
@@ -364,12 +362,9 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
checked_iterator.h
config-WinCE.h
config-all.h
- config-borland-common.h
config-lite.h
- config-minimal.h
config-win32-borland.h
config-win32-common.h
- config-win32-msvc-7.h
config-win32-msvc.h
config-win32.h
config.h
@@ -391,6 +386,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
}
Pkgconfig_Files {
- ACE_FOR_TAO.pc.in
+ ACE_FOR_TAO.pc.in
}
}
diff --git a/ACE/bin/ace_install_pkgconfig.pl b/ACE/bin/ace_install_pkgconfig.pl
index 13bd90840a8..6564fe9f230 100755
--- a/ACE/bin/ace_install_pkgconfig.pl
+++ b/ACE/bin/ace_install_pkgconfig.pl
@@ -31,7 +31,7 @@ if (scalar @ARGV && ! -d $pcdir) {
}
for my $file (@ARGV) {
- open IN, $file;
+ open IN, $file or die $file . ": $!";
my $pcfile = $file;
$pcfile =~ s/\.in$//;
open OUT, ">$pcdir/$pcfile";
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
index ae944d6d818..00f2a9883c1 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: TAO_CosProperty_Serv
Description: TAO CosProperty Service Library
-Requires: TAO_PortableServer_Skel
+Requires: TAO_CosProperty_Skel
Version: @VERSION@
Libs: -L${libdir} -lTAO_CosProperty_Serv
Cflags: -I${includedir}
diff --git a/TAO/tao/Monitor/TAO_Monitor.pc.in b/TAO/tao/Monitor/TAO_Monitor.pc.in
index 5a9a2c65fd7..639315d1be3 100644
--- a/TAO/tao/Monitor/TAO_Monitor.pc.in
+++ b/TAO/tao/Monitor/TAO_Monitor.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: TAO_Monitor
Description: TAO Monitor Library
-Requires: TAO_PortableServer, TAO_ETCL_Parser, ACE_MonitorControl
+Requires: TAO_PortableServer, ACE_Monitor_Control
Version: @VERSION@
Libs: -L${libdir} -lTAO_Monitor
Cflags: -I${includedir}
View Lorry Controller Status