[Libreoffice-commits] .: 8 commits - canvas/prj dtrans/prj i18npool/prj l10ntools/layout l10ntools/source sax/prj svl/Library_svl.mk svl/prj svtools/source vcl/inc vcl/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 16 16:12:57 PDT 2011
canvas/prj/d.lst | 1
dtrans/prj/build.lst | 2 -
i18npool/prj/d.lst | 1
l10ntools/layout/makefile.mk | 5 ----
l10ntools/source/filter/merge/makefile.mk | 5 ----
l10ntools/source/filter/utils/makefile.mk | 5 ----
l10ntools/source/help/makefile.mk | 6 -----
l10ntools/source/makefile.mk | 5 ----
sax/prj/d.lst | 1
svl/Library_svl.mk | 2 -
svl/prj/build.lst | 2 -
svtools/source/edit/syntaxhighlight.cxx | 4 +++
vcl/inc/ios/svsys.h | 36 ++++++++++++++++++++++++++++++
vcl/inc/svsys.h | 2 +
vcl/prj/build.lst | 2 -
15 files changed, 49 insertions(+), 30 deletions(-)
New commits:
commit 2ba0547c55cfc23666d936d4bc37248fbdddb205
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 17 01:39:10 2011 +0300
Deliver also static libraries
diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
index 8c4a583..933e114 100644
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@ -14,6 +14,7 @@
..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib\simplecanvas.uno.so
..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib\canvasfactory.uno.so
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin\javacanvas.uno.jar
..\%__SRC%\misc\cairocanvas.component %_DEST%\xml\cairocanvas.component
commit d7eb5dfe44297b5181e313786194dda3e7f50193
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 20:31:07 2011 +0300
Deliver also static libraries
diff --git a/sax/prj/d.lst b/sax/prj/d.lst
index 9534663..12cd6cd 100644
--- a/sax/prj/d.lst
+++ b/sax/prj/d.lst
@@ -2,6 +2,7 @@
..\%__SRC%\lib\*.so %_DEST%\lib\*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\misc\fastsax.component %_DEST%\xml\fastsax.component
..\%__SRC%\misc\sax.component %_DEST%\xml\sax.component
..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml\sax.inbuild.component
commit a86caa7fd89ab3673dd9d3846b3768006af2d6ec
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 19:57:32 2011 +0300
Put the local LetterTable class in the anonymous namespace
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index d6626f4..a8263fa 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -237,6 +237,8 @@ extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 )
}
+namespace {
+
class LetterTable
{
bool IsLetterTab[256];
@@ -252,6 +254,8 @@ public:
bool isLetterUnicode( sal_Unicode c );
};
+}
+
class BasicSimpleCharClass
{
static LetterTable aLetterTable;
commit 9adcf86eb76cd10c14d48871d54f419b3de6eb18
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 10:59:30 2011 +0300
Revert "Don't link with jvmfwk unless SOLAR_JAVA"
Nah, in the non-SOLAR_JAVA case we just build a dummy libjvmfwk.
This reverts commit 2b3f92d9293123ff96b18c82935d68e9d86ec1d0.
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 4593219..246530a 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
cppuhelper \
i18nisolang1 \
i18nutil \
- $(if $(SOLAR_JAVA),jvmfwk) \
+ jvmfwk \
sal \
sot \
tl \
commit 6bdece30d5d7a75199014f45e47f8ded2e18af6c
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 02:10:37 2011 +0300
Add svsys.h file for iOS
diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h
new file mode 100644
index 0000000..0d01631
--- /dev/null
+++ b/vcl/inc/ios/svsys.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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.
+ *
+ * The Initial Developer of the Original Code is Tor Lillqvist <tml at iki.fi>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. 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.
+ */
+
+#ifndef _SV_SVSYS_H
+#define _SV_SVSYS_H
+
+
+// ?
+
+#endif // _SV_SVSYS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index df0b58c..fb9a921 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -34,6 +34,8 @@
#include "aqua/svsys.h"
#elif defined OS2
#include "os2/svsys.h"
+#elif defined IOS
+#include "ios/svsys.h"
#else
#include "unx/svsys.h"
#endif
commit 0f19ba29275be739484896c88e498c691b19c4fe
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:25:38 2011 +0300
Deliver also static i18npaper library if we have built it that way
diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst
index 91df3e8..d6fd70f 100644
--- a/i18npool/prj/d.lst
+++ b/i18npool/prj/d.lst
@@ -46,6 +46,7 @@ mkdir: %_DEST%\inc\i18npool
..\%__SRC%\bin\i18npaper*.dll %_DEST%\bin\i18npaper*.dll
..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib\libi18npaper*.so
..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib\libi18npaper*.dylib
+..\%__SRC%\lib\libi18npaper*.a %_DEST%\lib\libi18npaper*.a
..\%__SRC%\misc\i18npool.component %_DEST%\xml\i18npool.component
..\%__SRC%\misc\i18nsearch.component %_DEST%\xml\i18nsearch.component
commit ce120ba0e4d90c1276e18d5fb2c5ad9b4b3bfb58
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:17:35 2011 +0300
Use DESKTOP and NATIVE where appropriate
diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
index 6ee2b47..f93333f 100644
--- a/dtrans/prj/build.lst
+++ b/dtrans/prj/build.lst
@@ -1,4 +1,4 @@
-dr dtrans : unotools offapi offuh rdbmaker stoc LIBXSLT:libxslt NULL
+dr dtrans : unotools offapi offuh DESKTOP:rdbmaker stoc LIBXSLT:libxslt NULL
dr dtrans usr1 - all dr_mkout NULL
dr dtrans\inc nmake - all dr_inc NULL
dr dtrans\source\cnttype nmake - all dr_cnttype dr_generic dr_inc NULL
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 67366a6..58c1505 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,3 +1,3 @@
-sl svl : TRANSLATIONS:translations rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
+sl svl : TRANSLATIONS:translations DESKTOP:rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
sl svl\prj nmake - all svl_prj NULL
# sl svl\qa\unit nmake - all svl_qa_cppunit svl_util NULL
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 9e0ccdb..1b32995 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
+vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt NULL
vc vcl usr1 - all vc_mkout NULL
vc vcl\prj nmake - all vc_prj NULL
commit 422a2f92d5c8e0ed4045604cc8868248d75c6317
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Jun 15 23:00:37 2011 +0300
Revert "Don't do anything here when cross-compiling"
We use a BUILD_TYPE keyword instead to bypass l10ntools.
This reverts commit cb7948c88ab3e2c8702bef0794455c07ccd88295.
diff --git a/l10ntools/layout/makefile.mk b/l10ntools/layout/makefile.mk
index c977cba..dee3c6e 100644
--- a/l10ntools/layout/makefile.mk
+++ b/l10ntools/layout/makefile.mk
@@ -40,11 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)" == "YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
.IF "$(SYSTEM_EXPAT)" == "YES"
CFLAGS+=-DSYSTEM_EXPAT
.ENDIF
diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk
index cc9efd9..8ef73de 100644
--- a/l10ntools/source/filter/merge/makefile.mk
+++ b/l10ntools/source/filter/merge/makefile.mk
@@ -34,11 +34,6 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)" == "YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
#----- compile .java files -----------------------------------------
OWNCOPY = \
diff --git a/l10ntools/source/filter/utils/makefile.mk b/l10ntools/source/filter/utils/makefile.mk
index ca92f4b..43a28d5 100644
--- a/l10ntools/source/filter/utils/makefile.mk
+++ b/l10ntools/source/filter/utils/makefile.mk
@@ -34,11 +34,6 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/utils
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)" == "YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
#----- compile .java files -----------------------------------------
diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index d79194e..3fd6879 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -35,12 +35,6 @@ TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-
-.IF "$(CROSS_COMPILING)" == "YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
.INCLUDE : helplinker.pmk
.IF "$(SYSTEM_LIBXSLT)" == "YES"
diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk
index b581c46..86bcea3 100644
--- a/l10ntools/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -40,11 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)" == "YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
CDEFS+= -DYY_NEVER_INTERACTIVE=1
.IF "$(SYSTEM_EXPAT)" == "YES"
More information about the Libreoffice-commits
mailing list