[Libreoffice-commits] .: 12 commits - android/Bootstrap android/.gitignore bean/com bean/Module_bean.mk bean/native desktop/Module_desktop.mk filter/Configuration_filter.mk forms/source .gitignore instsetoo_native/util postprocess/packcomponents vcl/unx
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Dec 12 12:16:49 PST 2011
.gitignore | 1
android/.gitignore | 6 +
android/Bootstrap/.gitignore | 6 -
bean/Module_bean.mk | 2
bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 3
bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 10 --
desktop/Module_desktop.mk | 6 +
filter/Configuration_filter.mk | 2
forms/source/xforms/propertysetbase.hxx | 2
instsetoo_native/util/makefile.mk | 10 --
instsetoo_native/util/openoffice.lst | 64 ----------------
postprocess/packcomponents/makefile.mk | 8 +-
vcl/unx/generic/plugadapt/salplug.cxx | 11 ++
13 files changed, 33 insertions(+), 98 deletions(-)
New commits:
commit 187077c21bd73e22f35370ad8a475191614a398d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 22:05:50 2011 +0200
Skip more components for Android and iOS
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c1ec972..cf5f1bf 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -144,8 +144,6 @@ my_components = \
dbtools \
embobj \
flat \
- fpicker \
- fps_office \
guesslang \
hyphen \
lnth \
@@ -155,7 +153,6 @@ my_components = \
sdbc2 \
spell \
srtrs1 \
- syssh \
ucb1 \
ucpexpand1 \
ucpext \
@@ -177,10 +174,13 @@ my_components += \
component/desktop/source/offacc/offacc \
component/desktop/source/splash/spl \
dbp \
+ fpicker \
+ fps_office \
log \
pcr \
res \
scn \
+ syssh \
tvhlp1 \
ucpchelp1 \
updatefeed \
@@ -345,7 +345,7 @@ my_components += mozbootstrap
my_components += fps_kde4
.END
-.IF "$(OS)" != "WNT"
+.IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
my_components += cmdmail
.END
commit d6723c4efa3078c43384685f54cd46d163a031f3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:54:23 2011 +0200
Add .DS_Store
diff --git a/.gitignore b/.gitignore
index caf15fb..3929c67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*~
.*.sw[op]
\#*
+.DS_Store
# python generated file
*.pyc
commit 00373d2097bad567f9724b340c852434430b2bcd
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:54:00 2011 +0200
Move .gitignore one level up
diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 0000000..9034b98
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,6 @@
+assets
+bin
+gen
+libs
+obj
+local.properties
\ No newline at end of file
diff --git a/android/Bootstrap/.gitignore b/android/Bootstrap/.gitignore
deleted file mode 100644
index 9034b98..0000000
--- a/android/Bootstrap/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-assets
-bin
-gen
-libs
-obj
-local.properties
\ No newline at end of file
commit f43020eff6c9f1b262f4fc37a94bf17a46e5782f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:38:39 2011 +0200
Use OUTDIR_FOR_BUILD for cross-compiling goodness
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index c09c663..8a4eba9 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -26,7 +26,7 @@ ifeq ($(SOLAR_JAVA),)
filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
else # SOLAR_JAVA
-filter_MERGE_TARGET := $(OUTDIR)/bin/FCFGMerge.jar
+filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar
filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET)
endif
commit 77680bbbadb2e4636164832b58da86f24effe034
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:27:24 2011 +0200
Do build Executable_soffice.bin also for Android, for now
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index d274fa2..c14600f 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -105,6 +105,10 @@ $(eval $(call gb_Module_add_targets,desktop,\
else ifeq ($(OS),ANDROID)
+$(eval $(call gb_Module_add_targets,desktop,\
+ Executable_soffice.bin \
+))
+
else ifeq ($(OS),IOS)
else
commit 414596cd71620aca4816468b9652e77e51b892c8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:24:30 2011 +0200
Do build Library_deploymentmisc also for non-desktop OSes, for now
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 8439d38..d274fa2 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deployment \
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
+ Library_deploymentmisc \
Library_offacc \
Library_sofficeapp \
Library_spl \
@@ -58,7 +59,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_unopkg.bin \
Library_deployment \
Library_deploymentgui \
- Library_deploymentmisc \
Library_migrationoo2 \
Library_migrationoo3 \
Package_scripts \
commit a7058d7bac5eef60741ada51d8193c505281d84e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:13:33 2011 +0200
Bypass bean for Android which has no java.awt
diff --git a/bean/Module_bean.mk b/bean/Module_bean.mk
index f8c1b6e..ee6d62c 100644
--- a/bean/Module_bean.mk
+++ b/bean/Module_bean.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_Module,bean))
ifneq ($(SOLAR_JAVA),)
ifneq ($(OS),MACOSX)
+ifneq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,bean,\
Jar_officebean \
Library_officebean \
@@ -42,5 +43,6 @@ $(eval $(call gb_Module_add_targets,bean,\
# JunitTest_bean_complex \
#))
endif
+endif
endif
commit ee7e362aaecba75b7e2fbec81a1d68d417e42e98
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 20:12:05 2011 +0200
Accept also Oracle Corporation as Java vendor here, too
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index b7c7ccd..b6e4f8b 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -272,7 +272,8 @@ public class LocalOfficeWindow
if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
{
String vendor = System.getProperty("java.vendor");
- if (vendor.equals("Sun Microsystems Inc.")
+ if ((vendor.equals("Sun Microsystems Inc.")
+ || vendor.equals("Oracle Corporation"))
&& Boolean.valueOf(System.getProperty("sun.awt.xembedserver")).booleanValue())
{
xembed = new NamedValue(
commit b1b25a9a1e61ff85467fab7d018c82f458826d8f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 19:24:45 2011 +0200
Kill a bunch of empty lines
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 2d8591f..a45b49e 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
@@ -87,14 +87,4 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindo
return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow(env, obj_this);
}
-
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 01fd335473bfb52882f30ff2278cec1da129e978
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 19:14:48 2011 +0200
WaE: NULL used in arithmetic
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 27556b1..ca09b5e 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -114,7 +114,7 @@ public:
virtual bool isWriteable() const
{
- return m_pWriter != NULL;
+ return m_pWriter != 0;
}
};
commit 3e2aec1a5437a930325e3eb715cec3a61497d92d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 16:08:29 2011 +0200
OxygenOffice doesn't bundle JRE either
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 64707d8..332f5c0 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -170,8 +170,6 @@ ure: $(foreach,i,$(alllangiso) ure_$i)
oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
-oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
-
oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
@@ -223,8 +221,6 @@ $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
-
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
@@ -304,10 +300,6 @@ oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
@@ -324,7 +316,7 @@ openoffice:
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
.IF "$(GUI)"!="WNT"
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 97072fe..96cfd9a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -450,67 +450,3 @@ OxygenOffice
include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
}
}
-
-OxygenOffice_wJRE
-{
- Settings
- {
- variables
- {
- PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.6
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta0
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.6
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0
- BASEPRODUCTVERSION 3.6
- UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0
- PACKAGEREVISION {buildid}
- LICENSENAME LGPL
- SERVICESPROJEKT 1
- WITHJREPRODUCT 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
- PROGRESSBARCOLOR 126,170,23
- PROGRESSSIZE 430,5
- PROGRESSPOSITION 5,230
- PROGRESSFRAMECOLOR 207,208,211
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
- STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
- STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osljre
- downloadname OOOP_{productversion}_{os}_installwjre_{languages}
- langpackdownloadname OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
- helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
- }
-}
commit 145dd11c95fcaaec4e3228f114e3bee677702abf
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Dec 12 14:48:57 2011 +0200
Hardcode to try just the "svp" VCL plugin on Android for now
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index a496b7c..9e6f47f 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -76,6 +76,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
{
pCloseModule = aMod;
+#ifndef ANDROID
/*
* Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
* not access the 'gnome_accessibility_module_shutdown' anymore.
@@ -95,7 +96,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
{
pCloseModule = NULL;
}
-
+#endif
GetSalData()->m_pPlugin = aMod;
}
else
@@ -120,6 +121,8 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
return pInst;
}
+#ifndef ANDROID
+
static DesktopType get_desktop_environment()
{
OUStringBuffer aModName( 128 );
@@ -142,6 +145,12 @@ static DesktopType get_desktop_environment()
return ret;
}
+#else
+
+#define get_desktop_environment() DESKTOP_NONE // For now...
+
+#endif
+
static SalInstance* autodetect_plugin()
{
static const char* pKDEFallbackList[] =
More information about the Libreoffice-commits
mailing list