[Libreoffice-commits] core.git: 3 commits - configure.ac odk/CustomTarget_settings.mk odk/settings qadevOOo/tests
Stephan Bergmann
sbergman at redhat.com
Mon Jan 20 08:41:45 PST 2014
configure.ac | 2
odk/CustomTarget_settings.mk | 3
odk/settings/dk.mk | 2
odk/settings/settings.mk | 38 ++-------
qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java | 40 ----------
5 files changed, 13 insertions(+), 72 deletions(-)
New commits:
commit ef602ba8ce58211c9588d8df72cbde7d48542a1a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 20 17:39:11 2014 +0100
Remove unused XInitialization.args data
...now that ModuleUIConfigurationManager no longer implements XInitialization
since 72b5343bd16deec540d8cd148cd7aebd74e92c16 "fwk: Use constructor feature for
ModuleUIConfigurationManager."
Change-Id: I479c6c93e9982d80318e53b794bac99e949a5e46
diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index eedef1c..21945a1 100644
--- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -22,11 +22,7 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XIndexContainer;
import com.sun.star.container.XNameAccess;
-import com.sun.star.embed.ElementModes;
-import com.sun.star.embed.XStorage;
-import com.sun.star.embed.XTransactedObject;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XSingleServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.ui.XModuleUIConfigurationManagerSupplier;
@@ -51,7 +47,6 @@ public class ModuleUIConfigurationManager extends TestCase {
XInterface oObj = null;
XMultiServiceFactory xMSF = null;
XTextDocument xTextDoc = null;
- XStorage xStore = null;
/**
* Cleanup: close the created document
@@ -72,9 +67,6 @@ public class ModuleUIConfigurationManager extends TestCase {
}
}
log.println(" disposing storage");
- if (xStore != null) {
- xStore.dispose();
- }
}
/**
@@ -101,38 +93,6 @@ public class ModuleUIConfigurationManager extends TestCase {
XNameAccess xMM = UnoRuntime.queryInterface(XNameAccess.class, xMSF.createInstance("com.sun.star.comp.framework.ModuleManager"));
xMM.getElementNames();
- o = xMSF.createInstance("com.sun.star.embed.StorageFactory");
- XSingleServiceFactory xStorageService = UnoRuntime.queryInterface(XSingleServiceFactory.class, o);
- Object[]props = new Object[2];
-
- String aFile = util.utils.getOfficeTempDir(xMSF) + "dummyFile.dat";
- log.println("storage file : '"+ aFile + "'");
-
- props[0] = aFile;
- props[1] = new Integer(ElementModes.READWRITE);
- xStore = UnoRuntime.queryInterface(XStorage.class, xStorageService.createInstanceWithArguments(props));
-
- PropertyValue[] initProps = new PropertyValue[4];
- PropertyValue propVal = new PropertyValue();
- propVal.Name = "DefaultConfigStorage";
- propVal.Value = xStore;
- initProps[0] = propVal;
- propVal = new PropertyValue();
- propVal.Name = "UserConfigStorage";
- propVal.Value = xStore;
- initProps[1] = propVal;
- propVal = new PropertyValue();
- propVal.Name = "ModuleIdentifier";
- propVal.Value = "swriter";
- initProps[2] = propVal;
- propVal = new PropertyValue();
- propVal.Name = "UserRootCommit";
- propVal.Value = UnoRuntime.queryInterface(XTransactedObject.class, xStore);
- initProps[3] = propVal;
-
-
- tEnv.addObjRelation("XInitialization.args", initProps);
-
// the short cut manager service name
// 2do: correct the service name when it's no longer in
tEnv.addObjRelation("XConfigurationManager.ShortCutManager",
commit e5d643327d9fefe788e6d8dbbee0203e36da6d73
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 20 17:27:02 2014 +0100
Typo in PLATFORMID for Linux powerpc64
cf. the list of platform tokens at <https://wiki.openoffice.org/wiki/
Documentation/DevGuide/Extensions/Target_Platform> and in
desktop/source/deployment/misc/dp_platform.cxx.
Change-Id: Ibfc103bed1f6756654225e2c456ad73ab56c0d5a
diff --git a/configure.ac b/configure.ac
index eb024d7..a6f5b42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4203,7 +4203,7 @@ linux-gnu*)
CPUNAME=POWERPC64
RTL_ARCH=PowerPC_64
LIB64="lib64"
- PLATFORMID=linux_powerpc_64
+ PLATFORMID=linux_powerpc64
OUTPATH=unxlngppc64
;;
sparc)
commit dea0398ee24eb278cdb14999efbf34d634454eaa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 20 17:21:14 2014 +0100
SDK settings.mk: Don't guess PLATFORM/PROCTYPE
...rather, pass them from the build to the SDK installation via dk.mk. (The SDK
installation is already platform-specific anyway, see the binary executables in
its bin/ directory, so there is no point in not fixing this at build time. In
the future, the shipped settings.mk could of course be stripped to just the
parts relevant for a given platform, of course.)
Along the way, fixes some apparent "ppc" vs. "powerpc" typos in settings.mk.
This is a prerequisite to create a working settings.mk for macosx_x86_64, but
does not yet do that.
Change-Id: Ib8e0c03ad6dfd610aae58a61e32bdc61c785584f
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 2a0d6e4..fe3b1e4 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -13,7 +13,8 @@ $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
- tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
+ tr -d "\015" < $< | sed -e 's/@@PLATFORMID@@/$(PLATFORMID)/' \
+ -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
-e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \
-e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@
diff --git a/odk/settings/dk.mk b/odk/settings/dk.mk
index 387ef13..f890321 100644
--- a/odk/settings/dk.mk
+++ b/odk/settings/dk.mk
@@ -1,4 +1,4 @@
-# OpenOffice.org @@RELEASE@@ SDK dependent settings
+PLATFORMID=@@PLATFORMID@@
SDKVERSION=@@RELEASE@@
BUILDID=@@BUILDID@@
LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 0e2895a..9bc42f5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -22,12 +22,8 @@
include $(OO_SDK_HOME)/settings/dk.mk
# test for the platform
-PLATFORM := $(shell $(PRJ)/config.guess | cut -d"-" -f3,4)
-
-# config.guess is missing for windows. We rely on getting "" in this case.
-ifeq "$(PLATFORM)" ""
-PLATFORM = windows
-endif
+PLATFORM := $(shell printf '%s' $(PLATFORMID) | cut -f 1 -d _)
+PROCTYPE := $(shell printf '%s' $(PLATFORMID) | cut -f 2- -d _)
# debug option, default is no debug
DEBUG=no
@@ -153,11 +149,9 @@ endif
# Solaris specific settings
#
###########################################################################
-ifneq (,$(findstring solaris,$(PLATFORM)))
+ifeq "$(PLATFORM)" "solaris"
# Settings for Solaris using GCC
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OO_SDK_URE_HOME)/lib/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
-
ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc
UNOPKG_PLATFORM=Solaris_SPARC
@@ -258,17 +252,13 @@ endif
# Linux specific settings
#
###########################################################################
-ifneq (,$(findstring linux,$(PLATFORM)))
+ifeq "$(PLATFORM)" "linux"
# Settings for Linux using gcc compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
-PLATFORM=linux
-
UNOPKG_PLATFORM=Linux_$(PROCTYPE)
JAVA_PROC_TYPE=$(PROCTYPE)
-ifeq "$(PROCTYPE)" "i386"
-UNOPKG_PLATFORM=Linux_x86
+ifeq "$(PROCTYPE)" "x86"
JAVA_PROC_TYPE=i386
endif
@@ -279,7 +269,6 @@ endif
ifeq "$(PROCTYPE)" "sparc"
UNOPKG_PLATFORM=Linux_SPARC
-JAVA_PROC_TYPE=sparc
endif
ifeq "$(PROCTYPE)" "x86_64"
@@ -340,7 +329,7 @@ endif
CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
-ifeq "$(PROCTYPE)" "ppc"
+ifeq "$(PROCTYPE)" "powerpc"
CC_FLAGS+=-fPIC
endif
@@ -355,7 +344,7 @@ LIBO_SDK_LDFLAGS_STDLIBS =
LIBRARY_LINK_FLAGS=-shared -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
-ifeq "$(PROCTYPE)" "ppc"
+ifeq "$(PROCTYPE)" "powerpc"
LIBRARY_LINK_FLAGS+=-fPIC
endif
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
@@ -375,21 +364,14 @@ endif
# MacOSX/Darwin specific settings
#
###########################################################################
-ifneq (,$(findstring darwin,$(PLATFORM)))
+ifeq "$(PLATFORM)" "macosx"
# Settings for MacOSX using gcc 4.0.1 compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-
-# Default is MacOSX on a Intel machine
-PLATFORM=macosx
-
-ifeq "$(PROCTYPE)" "i386"
+ifeq "$(PROCTYPE)" "x86"
UNOPKG_PLATFORM=MacOSX_x86
-JAVA_PROC_TYPE=x86
else
ifeq "$(PROCTYPE)" "x86_64"
UNOPKG_PLATFORM=MacOSX_x86
-JAVA_PROC_TYPE=x86
endif
endif
JAVABIN=Commands
@@ -483,8 +465,6 @@ endif
ifneq (,$(findstring freebsd,$(PLATFORM)))
# Settings for FreeBSD using gcc compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-
ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64"
More information about the Libreoffice-commits
mailing list