You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/12/02 20:23:05 UTC
[openoffice] branch AOO42X updated: Use standard naming of UNO
bridge... it really is gcc3
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 4691efe Use standard naming of UNO bridge... it really is gcc3
4691efe is described below
commit 4691efefd4a16db80c421b2cb9c64ea89d0c2814
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Wed Dec 2 15:21:27 2020 -0500
Use standard naming of UNO bridge... it really is gcc3
(cherry picked from commit ac209c856e64014dabdc2eac3f0b899d0ef84d6d)
---
main/bridges/Library_cpp_uno.mk | 10 +++++-----
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/abi.cxx | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/abi.hxx | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/cpp2uno.cxx | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/except.cxx | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/makefile.mk | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/share.hxx | 0
.../{s5abi_macosx_x86-64 => gcc3_macosx_x86-64}/uno2cpp.cxx | 0
main/configure.ac | 12 ++----------
main/odk/settings/settings.mk | 2 --
main/solenv/gbuild/platform/macosx.mk | 2 +-
11 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/main/bridges/Library_cpp_uno.mk b/main/bridges/Library_cpp_uno.mk
index e4c214a..eae2759 100644
--- a/main/bridges/Library_cpp_uno.mk
+++ b/main/bridges/Library_cpp_uno.mk
@@ -450,14 +450,14 @@ $(eval $(call gb_Library_add_linked_libs,$(COMNAME)_uno,\
))
###########################################################
-else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),MACOSX-X86_64-s5abi)
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),MACOSX-X86_64-gcc3)
###########################################################
$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
- bridges/source/cpp_uno/s5abi_macosx_x86-64/abi \
- bridges/source/cpp_uno/s5abi_macosx_x86-64/except \
- bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno \
- bridges/source/cpp_uno/s5abi_macosx_x86-64/uno2cpp \
+ bridges/source/cpp_uno/gcc3_macosx_x86-64/abi \
+ bridges/source/cpp_uno/gcc3_macosx_x86-64/except \
+ bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp \
))
#########################################################
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/abi.cxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/abi.cxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/abi.hxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/abi.hxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/makefile.mk b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/makefile.mk
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/makefile.mk
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/makefile.mk
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/uno2cpp.cxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
similarity index 100%
rename from main/bridges/source/cpp_uno/s5abi_macosx_x86-64/uno2cpp.cxx
rename to main/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
diff --git a/main/configure.ac b/main/configure.ac
index c927b12..32e8cfd 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -2234,16 +2234,8 @@ case $COM in
CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
# The version in tg_compv.mk for darwin does not look correct
# CCNUMVER = `echo ${CCVER} | sed -e"s/\.//";
- case "$build_os" in
- darwin*) # Mac OS X
- COMID="s5abi";
- COMNAME="s5abi";
- ;;
- *)
- COMID="gcc3";
- COMNAME="gcc3";
- ;;
- esac
+ COMID="gcc3";
+ COMNAME="gcc3";
;;
MSC)
CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
diff --git a/main/odk/settings/settings.mk b/main/odk/settings/settings.mk
index fee694d..d948e48 100644
--- a/main/odk/settings/settings.mk
+++ b/main/odk/settings/settings.mk
@@ -417,8 +417,6 @@ SHAREDLIB_OUT=$(OUT_LIB)
COMID=gcc3
CPPU_ENV=gcc3
-COMID=s5abi
-CPPU_ENV=s5abi
OSEP=\<
CSEP=\>
diff --git a/main/solenv/gbuild/platform/macosx.mk b/main/solenv/gbuild/platform/macosx.mk
index 7ea8c7a..39958ed 100644
--- a/main/solenv/gbuild/platform/macosx.mk
+++ b/main/solenv/gbuild/platform/macosx.mk
@@ -23,7 +23,7 @@
GUI := UNX
#COM := S5ABI
-COMID := s5abi
+COMID := gcc3
# Darwin mktemp -t expects a prefix, not a pattern
gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.