instsetoo_native/CustomTarget_install.mk | 6 +++---
sd/qa/unit/import-tests.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8fbf6b2f4c4f75f813be5920eb9e2dd37aa0776f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jun 12 09:02:13 2016 -0700
it works only, when PRODUCTNAME is LibreOffice, let's hardcode it
Change-Id: I44cb1d6d87f3c64bf8f0008b972ff9c87e5f3c24
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index bf23eb0..582f797 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -80,7 +80,7 @@ $(foreach pkgformat,$(5),\
&& $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
- -p $(PRODUCTNAME)$(3) \
+ -p LibreOffice$(3) \
-u $(instsetoo_OUT) \
-buildid $(if $(filter deb0
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
@@ -98,13 +98,13 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
- unzip -q -d $(TESTINSTALLDIR)
$(instsetoo_OUT)/$(PRODUCTNAME)/archive/install/en-US/LibreOffice*_archive.zip
+ unzip -q -d $(TESTINSTALLDIR)
$(instsetoo_OUT)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/*
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
- unzip -q -d $(TESTINSTALLDIR)
$(instsetoo_OUT)/$(PRODUCTNAME)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+ unzip -q -d $(TESTINSTALLDIR)
$(instsetoo_OUT)/LibreOffice_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
commit 471a4ba791870b7aab98feda225ce4beed4b1891
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jun 12 05:12:04 2016 -0700
disable SdImportTest::testTdf93124 temporarily
Change-Id: Ia56cc6b840c7b5733ee35426e9745d95dc069a4f
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 326495b..fca3a8a 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1173,7 +1173,7 @@ void SdImportTest::testTdf93097()
void SdImportTest::testTdf93124()
{
-#if defined(MACOSX) || defined(WNT)
+#if 0
sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/ppt/tdf93124.ppt"), PPT);
uno::Reference < uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter =
drawing::GraphicExportFilter::create(xContext);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
