[Libreoffice-commits] .: 4 commits - jvmfwk/plugins jvmfwk/prj postprocess/prj sal/inc shell/source tail_build/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Nov 25 14:24:04 PST 2011
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 2 +-
jvmfwk/prj/d.lst | 1 +
postprocess/prj/build.lst | 2 +-
sal/inc/sal/main.h | 7 -------
shell/source/backends/desktopbe/makefile.mk | 2 +-
shell/source/backends/localebe/makefile.mk | 2 +-
shell/source/cmdmail/makefile.mk | 5 +++++
shell/source/unix/exec/makefile.mk | 5 +++++
shell/source/unix/misc/makefile.mk | 5 +++++
shell/source/unix/sysshell/makefile.mk | 5 +++++
tail_build/prj/build.lst | 2 +-
11 files changed, 26 insertions(+), 12 deletions(-)
New commits:
commit 591191038e9d3847b258ab467182497e736d2cfb
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Nov 25 23:58:22 2011 +0200
Use ENFORCEDSHLPREFIX for Android
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 27dc8da..78f1457 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -60,7 +60,7 @@ LIB1OBJFILES= $(SLOFILES)
LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
-SHL1TARGET= $(UNOCOMPONENT1)
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1)
SHL1STDLIBS= \
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 09bc295..e8753d1 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\jvmfwk
..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
+..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\*
..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class
..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class
commit ce5f65f335096a8e2200a47cee19c36ca1507e41
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Nov 25 23:55:29 2011 +0200
Build fpicker for DESKTOP only
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index eb6513d..b8eb41e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2235197..72e90b4 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit c7524e944120a7f1c0da3056f97c84643f85bbd2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Nov 25 23:51:33 2011 +0200
Bypass more stuff on non-desktop OSes and enforce "lib" prefix for Android
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk
index 66ad8cf..7c6d638 100644
--- a/shell/source/backends/desktopbe/makefile.mk
+++ b/shell/source/backends/desktopbe/makefile.mk
@@ -44,7 +44,7 @@ SHL1STDLIBS = \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
-SHL1TARGET = desktopbe1.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)desktopbe1.uno
SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk
index 1efe3ed..33b7412 100644
--- a/shell/source/backends/localebe/makefile.mk
+++ b/shell/source/backends/localebe/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES=\
$(SLO)$/localebecdef.obj \
$(SLO)$/localebackend.obj
-SHL1TARGET=$(TARGET)1.uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET)1.uno
SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index e4d5ec4..b442d68 100644
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
@@ -36,6 +36,11 @@ COMP1TYPELIST=$(TARGET)
.INCLUDE : settings.mk
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+ @echo Nothing done for non-desktop OSes
+.ENDIF
+
# --- Files --------------------------------------------------------
DLLPRE=
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 4f07341..07b3125 100644
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -40,6 +40,11 @@ TESTAPP1=urltest
.INCLUDE : settings.mk
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+ @echo Nothing done for non-desktop OSes
+.ENDIF
+
# --- Files --------------------------------------------------------
DLLPRE=
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 840f372..cb1a986 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -38,6 +38,11 @@ LIBSALCPPRT=$(0)
.INCLUDE : settings.mk
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+ @echo Nothing done for non-desktop OSes
+.ENDIF
+
# --- Files --------------------------------------------------------
SCRIPTFILES = \
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 0c9f942..6e9558a 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -37,6 +37,11 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE : settings.mk
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+ @echo Nothing done for non-desktop OSes
+.ENDIF
+
.IF "$(SYSTEM_EXPAT)" == "YES"
CFLAGS+=-DSYSTEM_EXPAT
.ENDIF
commit 474dcc8fc9c4e7b2469e89b112f5bed4066cf969
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Nov 25 23:25:39 2011 +0200
The lo_main() thing on Android works fine, remove superfluous logging
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index e5e8f3b..c547a07 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -119,11 +119,6 @@ static int sal_main(void);
#elif defined ANDROID
-#include <android/log.h>
-
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "lo-bootstrap", __VA_ARGS__))
-#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "lo-bootstrap", __VA_ARGS__))
-
#ifdef __cplusplus
extern "C" void lo_main(int argc, char **argv);
#endif
@@ -131,7 +126,6 @@ extern "C" void lo_main(int argc, char **argv);
#define SAL_MAIN_WITH_ARGS_IMPL \
void lo_main(int argc, char **argv) \
{ \
- LOGI("in lo_main, argc=%d, argv[0]=%s, argv[1]=%s", argc, argv[0], argv[1]); \
sal_detail_initialize(argc, argv); \
sal_main_with_args(argc, argv); \
sal_detail_deinitialize(); \
@@ -140,7 +134,6 @@ void lo_main(int argc, char **argv) \
#define SAL_MAIN_IMPL \
void lo_main(int argc, char **argv) \
{ \
- LOGI("in lo_main, argc=%d, argv[0]=%s, argv[1]=%s", argc, argv[0], argv[1]); \
sal_detail_initialize(argc, argv); \
sal_main(); \
sal_detail_deinitialize(); \
More information about the Libreoffice-commits
mailing list