convert salhelper to gbuild

This is a cherry-pick of Matúš's e2f30c078fcf26d481c2e90398b450f6c475a483
from the feature/gbuild branch, with the following modifications by
Stephan Bergmann <sbergman@redhat.com>:

* Adapt salhelper/Makefile to what all those Makefiles currently need to
  look like.

* Do not remove salhelper/source/gcc3.map, instead add directly into it
  what otherwise solenv/bin/addsym.awk would add to it on Linux.

* In salhelper/Library_salhelper.mk, add code that on Linux takes care of
  the soname and symbol versioning required for backwards compatibility.
  Solaris would need those features too, and its backwards compatibility
  is thus currently broken.  Also add a bad hack to create the soname
  symlink (xxx.3 -> xxx) in the solver needed on non-Windows platforms (it
  is a bad hack for now in that it e.g. is not removed by "make clean").

* In solenv/gbuild/platform/macosx.mk, add an even worse hack to set the
  correct install name for libuno_salhelpergcc3.dylib.3, with a trailing
  ".3".

5 files changed, 8 insertions, 258 deletions

diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index 7c63d5d9ee24..a4617835d488 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -1,6 +1,7 @@
 UDK_3_0_0 { # should have been UDK_3.0
     global:
-    GetVersionInfo;
+    _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
     _ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_;
     _ZN9salhelper18ORealDynamicLoader7acquireEv;
     _ZN9salhelper18ORealDynamicLoader7releaseEv;
@@ -94,3 +95,9 @@ UDK_3.1 {
 
 
 } UDK_3_0_0;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+global:
+_ZGVNSt7num_put*; _ZNSt7num_put*;
+};
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
deleted file mode 100644
index 7b43dd68c453..000000000000
--- a/salhelper/source/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=salhelper
-TARGET=salhelper
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(COM)" != "MSC"
-UNIXVERSIONNAMES=UDK
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/condition.obj \
-    $(SLO)$/dynload.obj \
-    $(SLO)$/simplereferenceobject.obj \
-    $(SLO)$/timer.obj
-
-.IF "$(COM)" == "MSC"
-SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
-SHL1IMPLIB=	i$(TARGET)
-.ELSE
-SHL1TARGET=	uno_$(TARGET)$(COMID)
-SHL1IMPLIB=	uno_$(TARGET)$(COMID)
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=  URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-
-.IF "$(COMNAME)"=="msci"
-SHL1VERSIONMAP=msci.map
-.ELIF "$(COMNAME)"=="mscx"
-SHL1VERSIONMAP=mscx.map
-.ELIF "$(COMNAME)"=="sunpro5"
-SHL1VERSIONMAP=sols.map
-.ELIF "$(COMNAME)"=="gcc3"
-SHL1VERSIONMAP=gcc3.map
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/salhelper/source/msci.map b/salhelper/source/msci.map
deleted file mode 100644
index b0359e0c7166..000000000000
--- a/salhelper/source/msci.map
+++ /dev/null
@@ -1,50 +0,0 @@
-UDK_3_0_0 {
-    global:
-GetVersionInfo
-??0ORealDynamicLoader@salhelper@@IAE@PAPAV01@ABVOUString@rtl@@1PAX2@Z
-??1ORealDynamicLoader@salhelper@@MAE@XZ
-??_7ORealDynamicLoader@salhelper@@6B@
-?acquire@ORealDynamicLoader@salhelper@@QAAKXZ
-?getApi@ORealDynamicLoader@salhelper@@QBAPAXXZ
-?newInstance@ORealDynamicLoader@salhelper@@SAPAV12@PAPAV12@ABVOUString@rtl@@1@Z
-?release@ORealDynamicLoader@salhelper@@QAAKXZ
-??1SimpleReferenceObject@salhelper@@MAE@XZ
-??2SimpleReferenceObject@salhelper@@SAPAXI@Z
-??2SimpleReferenceObject@salhelper@@SAPAXIABUnothrow_t@std@@@Z
-??3SimpleReferenceObject@salhelper@@SAXPAX@Z
-??3SimpleReferenceObject@salhelper@@SAXPAXABUnothrow_t@std@@@Z
-    local:
-        *;
-};
-
-UDK_3.1 {
-    global:
-        ??_VSimpleReferenceObject@salhelper@@KAXPAX@Z;
-        ??_7SimpleReferenceObject@salhelper@@6B@;
-
-        ??0Condition@salhelper@@QAE@AAVMutex@osl@@@Z;
-        ??1Condition@salhelper@@UAE@XZ;
-
-        ??0ConditionModifier@salhelper@@QAE@AAVCondition@1@@Z;
-        ??1ConditionModifier@salhelper@@QAE@XZ;
-
-        ??0ConditionWaiter@salhelper@@QAE@AAVCondition@1@@Z;
-        ??0ConditionWaiter@salhelper@@QAE@AAVCondition@1@K@Z;
-        ??1ConditionWaiter@salhelper@@QAE@XZ;
-
-        ??0timedout@ConditionWaiter@salhelper@@QAE@XZ;
-        ??0timedout@ConditionWaiter@salhelper@@QAE@ABU012@@Z;
-        ??1timedout@ConditionWaiter@salhelper@@UAE@XZ;
-        ??4timedout@ConditionWaiter@salhelper@@QAEAAU012@ABU012@@Z;
-
-        ??0Timer@salhelper@@QAE@XZ;
-        ??0Timer@salhelper@@QAE@ABUTTimeValue@1@@Z;
-        ??0Timer@salhelper@@QAE@ABUTTimeValue@1@0@Z;
-        ??1Timer@salhelper@@MAE@XZ;
-
-        ?isExpired@Timer@salhelper@@QBAEXZ;
-        ?isTicking@Timer@salhelper@@QBAEXZ;
-        ?setRemainingTime@Timer@salhelper@@QAAXABUTTimeValue@2@@Z;
-        ?start@Timer@salhelper@@QAAXXZ;
-        ?stop@Timer@salhelper@@QAAXXZ;
-} UDK_3_0_0;
diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map
deleted file mode 100644
index 58f26e9041ab..000000000000
--- a/salhelper/source/mscx.map
+++ /dev/null
@@ -1,50 +0,0 @@
-UDK_3_0_0 {
-    global:
-GetVersionInfo
-??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z
-??1ORealDynamicLoader@salhelper@@MEAA@XZ
-??_7ORealDynamicLoader@salhelper@@6B@
-?acquire@ORealDynamicLoader@salhelper@@QEAAKXZ
-?getApi@ORealDynamicLoader@salhelper@@QEBAPEAXXZ
-?newInstance@ORealDynamicLoader@salhelper@@SAPEAV12@PEAPEAV12@AEBVOUString@rtl@@1@Z
-?release@ORealDynamicLoader@salhelper@@QEAAKXZ
-??1SimpleReferenceObject@salhelper@@MEAA@XZ
-??2SimpleReferenceObject@salhelper@@SAPEAX_K@Z
-??2SimpleReferenceObject@salhelper@@SAPEAX_KAEBUnothrow_t@std@@@Z
-??3SimpleReferenceObject@salhelper@@SAXPEAX@Z
-??3SimpleReferenceObject@salhelper@@SAXPEAXAEBUnothrow_t@std@@@Z
-    local:
-        *;
-};
-
-UDK_3.1 {
-    global:
-        ??_VSimpleReferenceObject@salhelper@@KAXPEAX@Z;
-        ??_7SimpleReferenceObject@salhelper@@6B@;
-
-        ??0Condition@salhelper@@QEAA@AEAVMutex@osl@@@Z;
-        ??1Condition@salhelper@@UEAA@XZ;
-
-        ??0ConditionModifier@salhelper@@QEAA@AEAVCondition@1@@Z;
-        ??1ConditionModifier@salhelper@@QEAA@XZ;
-
-        ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@@Z;
-        ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@K@Z;
-        ??1ConditionWaiter@salhelper@@QEAA@XZ;
-
-        ??0timedout@ConditionWaiter@salhelper@@QEAA@XZ;
-        ??0timedout@ConditionWaiter@salhelper@@QEAA@AEBU012@@Z;
-        ??1timedout@ConditionWaiter@salhelper@@UEAA@XZ;
-        ??4timedout@ConditionWaiter@salhelper@@QEAAAEAU012@AEBU012@@Z;
-
-        ??0Timer@salhelper@@QEAA@XZ;
-        ??0Timer@salhelper@@QEAA@AEBUTTimeValue@1@@Z;
-        ??0Timer@salhelper@@QEAA@AEBUTTimeValue@1@0@Z;
-        ??1Timer@salhelper@@MEAA@XZ;
-
-        ?isExpired@Timer@salhelper@@QEBAEXZ;
-        ?isTicking@Timer@salhelper@@QEBAEXZ;
-        ?setRemainingTime@Timer@salhelper@@QEAAXAEBUTTimeValue@2@@Z;
-        ?start@Timer@salhelper@@QEAAXXZ;
-        ?stop@Timer@salhelper@@QEAAXXZ;
-} UDK_3_0_0;
diff --git a/salhelper/source/sols.map b/salhelper/source/sols.map
deleted file mode 100644
index 69454b71089b..000000000000
--- a/salhelper/source/sols.map
+++ /dev/null
@@ -1,76 +0,0 @@
-UDK_3.1 { # OOo 1.1.2 SDK
-    global:
-        __1cJsalhelperJCondition2t6MrnDoslFMutex__v_;
-        __1cJsalhelperJCondition2t5B6MrnDoslFMutex__v_;
-        __1cJsalhelperJCondition2T6M_v_;
-        __1cJsalhelperJCondition2T5B6M_v_;
-        __1cJsalhelperbF__RTTI__1nJsalhelperJCondition__;
-        __1cJsalhelperbH__RTTI__1CpnJsalhelperJCondition__;
-        __1cJsalhelperbI__RTTI__1CpknJsalhelperJCondition__;
-
-        __1cJsalhelperRConditionModifier2t6Mrn0AJCondition__v_;
-        __1cJsalhelperRConditionModifier2t5B6Mrn0AJCondition__v_;
-        __1cJsalhelperRConditionModifier2T6M_v_;
-        __1cJsalhelperRConditionModifier2T5B6M_v_;
-
-        __1cJsalhelperPConditionWaiter2t6Mrn0AJCondition__v_;
-        __1cJsalhelperPConditionWaiter2t5B6Mrn0AJCondition__v_;
-        __1cJsalhelperPConditionWaiter2t6Mrn0AJCondition_L_v_; #S-ILP32
-        __1cJsalhelperPConditionWaiter2t6Mrn0AJCondition_I_v_; #S-LP64
-        __1cJsalhelperPConditionWaiter2t5B6Mrn0AJCondition_L_v_; #S-ILP32
-        __1cJsalhelperPConditionWaiter2t5B6Mrn0AJCondition_I_v_; #S-LP64
-        __1cJsalhelperPConditionWaiter2T6M_v_;
-        __1cJsalhelperPConditionWaiter2T5B6M_v_;
-
-        __1cJsalhelperPConditionWaiterItimedout2t6M_v_;
-        __1cJsalhelperPConditionWaiterItimedout2t5B6M_v_;
-        __1cJsalhelperPConditionWaiterItimedout2t6Mrk2_v_;
-        __1cJsalhelperPConditionWaiterItimedout2t5B6Mrk2_v_;
-        __1cJsalhelperPConditionWaiterItimedout2T6M_v_;
-        __1cJsalhelperPConditionWaiterItimedout2T5B6M_v_;
-        __1cJsalhelperPConditionWaiterItimedout2G6Mrk2_r2_;
-        __1cJsalhelperbU__RTTI__1nJsalhelperPConditionWaiterItimedout__;
-        __1cJsalhelperbW__RTTI__1CpnJsalhelperPConditionWaiterItimedout__;
-        __1cJsalhelperbX__RTTI__1CpknJsalhelperPConditionWaiterItimedout__;
-} UDK_3.0;
-
-UDK_3.0 {
-    global:
-GetVersionInfo;
-__1cJsalhelperSORealDynamicLoaderLnewInstance6Fpp1rknDrtlIOUString_7_2_;
-__1cJsalhelperSORealDynamicLoader2t5B6Mpp1rknDrtlIOUString_7pv8_v_;
-__1cJsalhelperSORealDynamicLoader2t6Mpp1rknDrtlIOUString_7pv8_v_;
-__1cJsalhelperSORealDynamicLoaderG__vtbl_;
-__1cJsalhelperSORealDynamicLoader2T5B6M_v_;
-__1cJsalhelperSORealDynamicLoader2T6M_v_;
-__1cJsalhelperbR__RTTI__1CpknJsalhelperSORealDynamicLoader__;
-__1cJsalhelperbQ__RTTI__1CpnJsalhelperSORealDynamicLoader__;
-__1cJsalhelperbO__RTTI__1nJsalhelperSORealDynamicLoader__;
-__1cJsalhelperSORealDynamicLoaderHacquire6M_L_; #S-ILP32
-__1cJsalhelperSORealDynamicLoaderHacquire6M_I_; #S-LP64
-__1cJsalhelperSORealDynamicLoaderHrelease6M_L_; #S-ILP32
-__1cJsalhelperSORealDynamicLoaderHrelease6M_I_; #S-LP64
-__1cJsalhelperSORealDynamicLoaderGgetApi6kM_pv_;
-__1cJsalhelperVSimpleReferenceObject2T5B6M_v_;
-__1cJsalhelperVSimpleReferenceObject2T6M_v_;
-__1cJsalhelperVSimpleReferenceObject2k6Fpv_v_;
-__1cJsalhelperVSimpleReferenceObject2k6FpvrknDstdJnothrow_t__v_;
-__1cJsalhelperVSimpleReferenceObject2n6FI_pv_; #S-ILP32
-__1cJsalhelperVSimpleReferenceObject2n6FL_pv_; #S-LP64
-__1cJsalhelperVSimpleReferenceObject2n6FIrknDstdJnothrow_t__pv_; #S-ILP32
-__1cJsalhelperVSimpleReferenceObject2n6FLrknDstdJnothrow_t__pv_; #S-LP64
-__1cJsalhelperVSimpleReferenceObjectG__vtbl_;
-__1cJsalhelperbR__RTTI__1nJsalhelperVSimpleReferenceObject__;
-__1cJsalhelperbT__RTTI__1CpnJsalhelperVSimpleReferenceObject__;
-__1cJsalhelperbU__RTTI__1CpknJsalhelperVSimpleReferenceObject__;
-    local:
-        *;
-} SALHLP_1_0;
-
-SALHLP_1_0 { # WEAK (backward compatibility, should have been UDK_3.0)
-};
-
-{ # BASE
-_init;
-_fini;
-};