[Libreoffice-commits] .: 7 commits - cppuhelper/prj cppu/prj rdbmaker/source sal/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jun 13 15:49:47 PDT 2011
cppu/prj/d.lst | 2 +-
cppuhelper/prj/d.lst | 2 +-
rdbmaker/source/rdbmaker/makefile.mk | 5 +++++
sal/inc/sal/config.h | 8 +++++++-
sal/inc/sal/mathconf.h | 10 +++++++++-
5 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 28a5409787b9a9f288ec7a2e53ec32e212e6ca4c
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 14 01:48:29 2011 +0300
Fix SAL_MATH_FINITE definition for iOS
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 6b20f50..f180369 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -62,7 +62,15 @@ extern "C" {
#if defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
#elif defined IOS
-#define SAL_MATH_FINITE(d) isfinite(d)
+/* C++ is so nice. This is the only way I could come up with making
+ * this actually work in all cases (?), even when <cmath> has been
+ * included which #undefs isfinite: copy the definition of isfinite()
+ * from <architecture/arm/math.h>
+ */
+#define SAL_MATH_FINITE(d) \
+ ( sizeof (d) == sizeof(float ) ? __inline_isfinitef((float)(d)) \
+ : sizeof (d) == sizeof(double) ? __inline_isfinited((double)(d)) \
+ : __inline_isfinite ((long double)(d)))
#elif defined LINUX || defined UNX
#define SAL_MATH_FINITE(d) finite(d)
#else /* WNT, LINUX, UNX */
commit 47b5eed7121305d375cfc9a6fd1ba21ff1430130
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 14 01:08:57 2011 +0300
No point building build-time executables for iOS
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 8b41a93..4c93b8b 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.IF "$(OS)" == "IOS"
+all:
+ @echo No point in build-time executables for this platform
+.ENDIF
+
OBJFILES= $(OBJ)$/rdbmaker.obj \
$(OBJ)$/rdboptions.obj \
$(OBJ)$/typeblop.obj \
commit 705d75cc35905d44007c44bed1a3540be2803c1d
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 18:36:53 2011 +0300
Revert "Bypass DLL prefix and extension stuff on iOS for now"
Not needed now with a normal SAL_DLLEXTENSION defined for iOS.
This reverts commit dc915ed7fbbbeef9eefbf5bda07289a9462b6904.
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 56b8025..358aac1 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -244,7 +244,6 @@ static OUString makeComponentPath(
if (rPath[ rPath.getLength() -1 ] != '/')
buf.append( (sal_Unicode) '/' );
}
-#ifndef IOS
sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) );
if (nEnd < 0) // !endsWith
{
@@ -257,7 +256,6 @@ static OUString makeComponentPath(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) );
}
else // name is completely pre/postfixed
-#endif
{
buf.append( rLibName );
}
commit 279ee58b5c3014d1d6b7ebf264e60b8340ff15e3
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 18:32:49 2011 +0300
Do define SAL_DLLEXTENSION properly for iOS, too
Do it even if it can never be used successfully in an iOS app anyway,
as they are not supposed to load dynamic libraries (except system
ones).
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 9da307a..fdeaf85 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -97,8 +97,14 @@
#ifdef IOS
#define SAL_UNX
-#define SAL_DLLEXTENSION
+/* SAL_DLLEXTENSION should not really be used on iOS, as iOS apps are
+ * not allowed to load own dynamic libraries.
+ */
+#define SAL_DLLEXTENSION ".dylib"
#define SAL_DLLPREFIX "lib"
+/* This is fairly pointless too, an iOS app consists of a single
+ * executable (plus data files).
+ */
#define SAL_PRGEXTENSION ".bin"
#define SAL_PATHSEPARATOR ':'
#define SAL_PATHDELIMITER '/'
commit f27c8cf3c9ea1fd794cc8f64f47ab70cf192b101
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 18:31:59 2011 +0300
Be less picky with library name
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index 2f6e490..c26529d 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -59,7 +59,7 @@ mkdir: %_DEST%\inc\cppuhelper
..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
-..\%__SRC%\lib\libuno_cppuhelper*.*.* %_DEST%\lib\*
+..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib\*
commit e66a2e1d5118c7186df8273f7db73cccfb338594
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 18:31:35 2011 +0300
Be less picky with library name
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 3e923ab..87ff914 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -55,7 +55,7 @@ mkdir: %_DEST%\inc\uno
..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
..\%__SRC%\bin\cppu* %_DEST%\bin\*
-..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib\*
+..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib\*
..\%__SRC%\bin\purpe*.dll %_DEST%\bin\*
commit ea6b8253efae3ab343a8256ec02502d22eb095fb
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 17:54:21 2011 +0300
Bypass DLL prefix and extension stuff on iOS for now
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 358aac1..56b8025 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -244,6 +244,7 @@ static OUString makeComponentPath(
if (rPath[ rPath.getLength() -1 ] != '/')
buf.append( (sal_Unicode) '/' );
}
+#ifndef IOS
sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) );
if (nEnd < 0) // !endsWith
{
@@ -256,6 +257,7 @@ static OUString makeComponentPath(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) );
}
else // name is completely pre/postfixed
+#endif
{
buf.append( rLibName );
}
More information about the Libreoffice-commits
mailing list