summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RepositoryModule_ooo.mk1
-rw-r--r--salhelper/Library_salhelper.mk81
-rw-r--r--salhelper/Makefile (renamed from salhelper/version.mk)27
-rw-r--r--salhelper/Module_salhelper.mk35
-rw-r--r--salhelper/Package_inc.mk43
-rw-r--r--salhelper/inc/salhelper/condition.hxx20
-rw-r--r--salhelper/inc/salhelper/dynload.hxx3
-rw-r--r--salhelper/inc/salhelper/salhelperdllapi.h16
-rw-r--r--salhelper/inc/salhelper/simplereferenceobject.hxx7
-rw-r--r--salhelper/inc/salhelper/timer.hxx7
-rw-r--r--salhelper/prj/build.lst3
-rw-r--r--salhelper/prj/d.lst24
-rw-r--r--salhelper/prj/makefile.mk1
-rw-r--r--salhelper/source/gcc3.map9
-rw-r--r--salhelper/source/makefile.mk81
-rw-r--r--salhelper/source/msci.map50
-rw-r--r--salhelper/source/mscx.map50
-rw-r--r--salhelper/source/sols.map76
-rw-r--r--solenv/gbuild/platform/macosx.mk4
19 files changed, 221 insertions, 317 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 7a2d68db9521..76f0c02792c0 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
qadevOOo \
regexp \
reportdesign \
+ salhelper \
sane \
sax \
sc \
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
new file mode 100644
index 000000000000..c77d1f049fa0
--- /dev/null
+++ b/salhelper/Library_salhelper.mk
@@ -0,0 +1,81 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,salhelper))
+
+$(eval $(call gb_Library_add_package_headers,salhelper,salhelper_inc))
+
+$(eval $(call gb_Library_add_defs,salhelper,\
+ -DSALHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,salhelper,\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,salhelper,\
+ salhelper/source/condition \
+ salhelper/source/dynload \
+ salhelper/source/simplereferenceobject \
+ salhelper/source/timer \
+))
+
+# At least on Linux, for backwards compatibility the salhelper library needs a
+# specific soname and symbol versioning. The symbols in the gcc3.map should be
+# those not already filtered out due to hidden visibility, so combining the
+# visibility feature with the version map file feature works well.
+# Solaris would need something like this, too. Its backwards compatibility is
+# broken for now:
+
+ifeq ($(OS),LINUX)
+
+$(eval $(call gb_Library_add_ldflags,salhelper, \
+ -Wl$(COMMA)--soname=libuno_salhelpergcc3.so.3 \
+ -Wl$(COMMA)--version-script=$(SRCDIR)/salhelper/source/gcc3.map \
+))
+
+$(call gb_LinkTarget_get_target,$(call \
+gb_Library_get_linktargetname,salhelper)): $(SRCDIR)/salhelper/source/gcc3.map
+
+endif
+
+# A hack to generate the soname symlink in the solver:
+
+ifneq ($(OS),WNT)
+
+$(call gb_Library_get_target,salhelper): | \
+ $(call gb_Library_get_target,salhelper).3
+
+$(call gb_Library_get_target,salhelper).3:
+ $(call gb_Helper_abbreviate_dirs,rm -f $@)
+ $(call gb_Helper_abbreviate_dirs, \
+ ln -s $(notdir $(call gb_Library_get_target,salhelper)) $@)
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/version.mk b/salhelper/Makefile
index 76f67022677e..2289c8303bf8 100644
--- a/salhelper/version.mk
+++ b/salhelper/Makefile
@@ -1,8 +1,9 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,20 +26,16 @@
#
#*************************************************************************
-# target
-SALHELPER_TARGET=salhelper
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
-# the major
-SALHELPER_MAJOR=2
-# the minor
-SALHELPER_MINOR=0
-# the micro
-SALHELPER_MICRO=0
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
-# this is a c++ compatible library
-SALHELPER_CPP=1
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-SALHELPER=$(SALHELPER_TARGET)_$(CMPEXT)
+endif
-LIBSALHELPER_UNX=lib$(SALHELPER).a.$(SALHELPER_MAJOR)
-LIBSALHELPER_WIN=$(SALHELPER_TARGET)$(SALHELPER_MAJOR)$(CMPEXT).dll
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
new file mode 100644
index 000000000000..08df523f0afd
--- /dev/null
+++ b/salhelper/Module_salhelper.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,salhelper))
+
+$(eval $(call gb_Module_add_targets,salhelper,\
+ Library_salhelper \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/Package_inc.mk b/salhelper/Package_inc.mk
new file mode 100644
index 000000000000..744489ce25ad
--- /dev/null
+++ b/salhelper/Package_inc.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,salhelper_inc,$(SRCDIR)/salhelper/inc/salhelper))
+
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelperdllapi.h))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,condition.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,dynload.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/future.hxx,future.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/futurequeue.hxx,futurequeue.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/linkhelper.hxx,linkhelper.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/monitor.hxx,monitor.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/queue.hxx,queue.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,refobj.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,simplereferenceobject.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,singletonref.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/timer.hxx,timer.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx
index efc042ca6156..c50bc87ed468 100644
--- a/salhelper/inc/salhelper/condition.hxx
+++ b/salhelper/inc/salhelper/condition.hxx
@@ -33,7 +33,7 @@
#include <osl/conditn.h>
#include <osl/mutex.hxx>
-
+#include "salhelperdllapi.h"
namespace salhelper
{
@@ -41,7 +41,7 @@ namespace salhelper
class ConditionWaiter;
- class Condition
+ class SALHELPER_DLLPUBLIC Condition
{
friend class ConditionModifier;
friend class ConditionWaiter;
@@ -59,8 +59,8 @@ namespace salhelper
private:
- Condition(Condition &); // not defined
- void operator =(Condition &); // not defined
+ SALHELPER_DLLPRIVATE Condition(Condition &); // not defined
+ SALHELPER_DLLPRIVATE void operator =(Condition &); // not defined
osl::Mutex& m_aMutex;
oslCondition m_aCondition;
@@ -68,7 +68,7 @@ namespace salhelper
- class ConditionModifier
+ class SALHELPER_DLLPUBLIC ConditionModifier
{
public:
@@ -78,15 +78,15 @@ namespace salhelper
private:
- ConditionModifier(ConditionModifier &); // not defined
- void operator =(ConditionModifier &); // not defined
+ SALHELPER_DLLPRIVATE ConditionModifier(ConditionModifier &); // not defined
+ SALHELPER_DLLPRIVATE void operator =(ConditionModifier &); // not defined
Condition& m_aCond;
};
- class ConditionWaiter
+ class SALHELPER_DLLPUBLIC ConditionWaiter
{
public:
@@ -112,8 +112,8 @@ namespace salhelper
private:
- ConditionWaiter(ConditionWaiter &); // not defined
- void operator =(ConditionWaiter &); // not defined
+ SALHELPER_DLLPRIVATE ConditionWaiter(ConditionWaiter &); // not defined
+ SALHELPER_DLLPRIVATE void operator =(ConditionWaiter &); // not defined
Condition& m_aCond;
};
diff --git a/salhelper/inc/salhelper/dynload.hxx b/salhelper/inc/salhelper/dynload.hxx
index 8f0325162455..66bf6b231d30 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -32,13 +32,14 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <osl/module.h>
+#include "salhelperdllapi.h"
namespace salhelper
{
/** The ORealDynamicLoader is an implementation helper class for the template loader ODynamicLoader.
*/
-class ORealDynamicLoader
+class SALHELPER_DLLPUBLIC ORealDynamicLoader
{
public:
/** initializes the loader, loads the library and call the initialization fucntion.
diff --git a/salhelper/inc/salhelper/salhelperdllapi.h b/salhelper/inc/salhelper/salhelperdllapi.h
new file mode 100644
index 000000000000..0d90087e61d5
--- /dev/null
+++ b/salhelper/inc/salhelper/salhelperdllapi.h
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_SALHELPERDLLAPI_H
+#define INCLUDED_SALHELPERDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(SALHELPER_DLLIMPLEMENTATION)
+#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define SALHELPER_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_SALHELPERDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 43ca44033d3b..13c8d658400d 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -31,6 +31,7 @@
#include "osl/interlck.h"
#include "sal/types.h"
+#include "salhelperdllapi.h"
#ifndef INCLUDED_CSTDDEF
#include <cstddef>
@@ -69,7 +70,7 @@ namespace salhelper {
objects are of no use, anyway, it seems best to simply declare and not
define (private) operators new[] and delete[].
*/
-class SimpleReferenceObject
+class SALHELPER_DLLPUBLIC SimpleReferenceObject
{
public:
inline SimpleReferenceObject() SAL_THROW(()): m_nCount(0) {}
@@ -114,12 +115,12 @@ private:
/** not implemented
@internal
*/
- SimpleReferenceObject(SimpleReferenceObject &);
+ SALHELPER_DLLPRIVATE SimpleReferenceObject(SimpleReferenceObject &);
/** not implemented
@internal
*/
- void operator =(SimpleReferenceObject);
+ SALHELPER_DLLPRIVATE void operator =(SimpleReferenceObject);
#ifdef _MSC_VER
/* We can't now have these private with MSVC2008 at least, it leads to
diff --git a/salhelper/inc/salhelper/timer.hxx b/salhelper/inc/salhelper/timer.hxx
index 7b94b11a4f00..c3e8e0f09668 100644
--- a/salhelper/inc/salhelper/timer.hxx
+++ b/salhelper/inc/salhelper/timer.hxx
@@ -32,6 +32,7 @@
#include <salhelper/simplereferenceobject.hxx>
#include <osl/time.h>
+#include "salhelperdllapi.h"
namespace salhelper
{
@@ -133,7 +134,7 @@ class TimerManager;
/** Interface for the Timer and handling the event
*/
-class Timer : public salhelper::SimpleReferenceObject
+class SALHELPER_DLLPUBLIC Timer : public salhelper::SimpleReferenceObject
{
public:
@@ -222,11 +223,11 @@ private:
/** Copy constructor disabled.
*/
- Timer( const Timer& rTimer );
+ SALHELPER_DLLPRIVATE Timer( const Timer& rTimer );
/** Assignment operator disabled.
*/
- void SAL_CALL operator=( const Timer& rTimer );
+ SALHELPER_DLLPRIVATE void SAL_CALL operator=( const Timer& rTimer );
friend class TimerManager;
};
diff --git a/salhelper/prj/build.lst b/salhelper/prj/build.lst
index 9a21849507ff..a449efe001ce 100644
--- a/salhelper/prj/build.lst
+++ b/salhelper/prj/build.lst
@@ -1,3 +1,2 @@
shp salhelper : sal NULL
-shp salhelper usr1 - all shp_mkout NULL
-shp salhelper\source nmake - all shp_source NULL
+shp salhelper\prj nmake - all shp_prj NULL
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index 2aa89bba83f0..e69de29bb2d1 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -1,24 +0,0 @@
-mkdir: %_DEST%\inc\salhelper
-
-..\inc\salhelper\condition.hxx %_DEST%\inc\salhelper\condition.hxx
-..\inc\salhelper\dynload.hxx %_DEST%\inc\salhelper\dynload.hxx
-..\inc\salhelper\future.hxx %_DEST%\inc\salhelper\future.hxx
-..\inc\salhelper\futurequeue.hxx %_DEST%\inc\salhelper\futurequeue.hxx
-..\inc\salhelper\monitor.hxx %_DEST%\inc\salhelper\monitor.hxx
-..\inc\salhelper\queue.hxx %_DEST%\inc\salhelper\queue.hxx
-..\inc\salhelper\linkhelper.hxx %_DEST%\inc\salhelper\linkhelper.hxx
-..\inc\salhelper\refobj.hxx %_DEST%\inc\salhelper\refobj.hxx
-..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc\salhelper\simplereferenceobject.hxx
-..\inc\salhelper\singletonref.hxx %_DEST%\inc\salhelper\singletonref.hxx
-..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx
-
-..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll
-..\%__SRC%\bin\uno_salhelp*.dll %_DEST%\bin\uno_salhelp*.dll
-
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
-..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\*
-
-..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\*
-..\%__SRC%\lib\salhelper*.lib %_DEST%\lib\*
-
-linklib: libuno_salhelper*.*.*
diff --git a/salhelper/prj/makefile.mk b/salhelper/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/salhelper/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
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;
-};
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5be5001f22fd..e061c6dac8c7 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -149,8 +149,10 @@ gb_LinkTarget__RPATHS := \
SDKBIN: \
NONE:@__VIA_LIBRARY_PATH__@ \
+# The below contains a bad hack to set the correct install name for
+# libuno_salhepergcc3.dylib.3, with a trailing ".3":
define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',$(error
+$(if $(2),-install_name '$(2)$(1)$(if $(filter $(1),libuno_salhelpergcc3.dylib),.3)',$(error
cannot determine -install_name for $(2)))
endef
generated by cgit (git 2.34.1) at 2025-01-04 06:43:42 +0000