.gitignore | 1 accessibility/CustomTarget_bridge.mk | 2 cppunit/ExternalProject_cppunit.mk | 4 - dev/null |binary extensions/WinResTarget_activex.mk | 2 libxmlsec/ExternalProject_xmlsec.mk | 2 postprocess/CustomTarget_signing.mk | 2 sal/Library_sal.mk | 2 shell/Library_ooofilt.mk | 2 solenv/gbuild/CliLibrary.mk | 2 writerfilter/JunitTest_writerfilter_complex.mk | 56 ---------------- writerfilter/qa/complex/ooxml/LoadDocuments.java | 59 ----------------- writerfilter/qa/complex/ooxml/makefile.mk | 77 ----------------------- 13 files changed, 10 insertions(+), 201 deletions(-)
New commits: commit db7ec711cfff06daa1d61fdded9d7c330d3aafc6 Author: Michael Stahl <[email protected]> Date: Thu Jan 3 15:52:20 2013 +0100 writerfilter: remove Junit complex test The test just loads 4 documents and has been disabled for months. Also remove the test documents because they are duplicates and are also stored in writerfilter/qa/documents/. Change-Id: I9f51240483d800bc104c3842b8158dec90b3e69b diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk deleted file mode 100644 index a270224..0000000 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex)) - -$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ - $$(DEFS) \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ -)) - -$(eval $(call gb_JunitTest_use_jars,writerfilter_complex,\ - OOoRunner \ - ridl \ - test \ - unoil \ - jurt \ -)) - -$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\ - writerfilter/qa/complex/ooxml/TestDocument \ - writerfilter/qa/complex/ooxml/LoadDocuments \ -)) - -# #i113098# currently fails in non-pro -ifeq ($(gb_PRODUCT),$(true)) -$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\ - complex.ooxml.LoadDocuments \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/writerfilter/qa/complex/ooxml/LoadDocuments.java b/writerfilter/qa/complex/ooxml/LoadDocuments.java deleted file mode 100644 index 7515f8d..0000000 --- a/writerfilter/qa/complex/ooxml/LoadDocuments.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package complex.ooxml; -import com.sun.star.lang.XMultiServiceFactory; -import complexlib.ComplexTestCase; -import java.io.File; -import com.sun.star.text.XTextDocument; - -public class LoadDocuments extends ComplexTestCase { - private XMultiServiceFactory m_xMSF; - - @Override - public String[] getTestMethodNames() { - return new String [] { - "test1" - }; - } - - public void before() throws Exception { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - } - - public void test1() { - String testDocumentsPath = util.utils.getFullTestDocName(""); - log.println("Test documents in:" + testDocumentsPath); - - File dir = new File(testDocumentsPath); - String [] files = dir.list(); - - if (files != null) { - for (int i = 0; i < files.length; ++i) { - log.println(files[i]); - String url = util.utils.getFullTestURL(files[i]); - log.println(url); - - XTextDocument xDoc = util.WriterTools.loadTextDoc(m_xMSF, url); - util.DesktopTools.closeDoc(xDoc); - } - } else { - failed(); - } - } -} diff --git a/writerfilter/qa/complex/ooxml/makefile.mk b/writerfilter/qa/complex/ooxml/makefile.mk deleted file mode 100644 index 9c34670..0000000 --- a/writerfilter/qa/complex/ooxml/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ = ..$/..$/.. -TARGET = PropertyValues -PRJNAME = $(TARGET) -PACKAGE = complex$/ooxml - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = LoadDocuments.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice --accept=socket,host=localhost,port=8100;urp;" -.ENDIF - -# test base is java complex -CT_TESTBASE = -TestBase java_complex - -# build package name with "." instead of $/ -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) - -# start the runner application -CT_APP = org.openoffice.Runner - -# --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL: ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - -.INCLUDE : target.mk - -run: \ - LoadDocuments - -RUN: run - -LoadDocuments: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).LoadDocuments - diff --git a/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx b/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx deleted file mode 100644 index 6b27817..0000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx b/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx deleted file mode 100644 index 0503327..0000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx b/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx deleted file mode 100644 index 719b388..0000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx b/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx deleted file mode 100644 index 775d63c..0000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx and /dev/null differ commit 3f27da0a672d0eac84b2a7b411228bc667c4a2cf Author: Michael Stahl <[email protected]> Date: Thu Jan 3 15:36:20 2013 +0100 gbuild: replace all use of PRODUCT with ENABLE_DBGUTIL Also fix the wrong check in cppunit/ExternalProject_cppunit.mk which caused cppunit to always be built without -D_GLIBCXX_DEBUG. Change-Id: Ia247dcd84e2c6fa0e9384fd27643537984d980b5 diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk index 3127462..a3ed8a4 100644 --- a/accessibility/CustomTarget_bridge.mk +++ b/accessibility/CustomTarget_bridge.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge)) $(call gb_CustomTarget_get_target,accessibility/bridge) : \ $(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java -ifeq ($(PRODUCT),) +ifeq ($(ENABLE_DBGUTIL),TRUE) accessibility_DEBUG := true accessibility_PRODUCT := false else diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk index 8a2d97c..b2f75e8 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/cppunit/ExternalProject_cppunit.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ - CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ + CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ $(if $(debug),-g)" \ && cd src \ && $(MAKE) \ diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 2279607..4e46d0e 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -34,7 +34,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\ extensions/source/activex/idl \ )) -ifneq ($(PRODUCT),) +ifneq ($(ENABLE_DBGUTIL),TRUE) $(eval $(call gb_WinResTarget_add_defs,activex_res,\ -DPRODUCT \ )) diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index e5ed276..ed9decc 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -34,7 +34,7 @@ else $(call gb_ExternalProject_get_state_target,xmlsec,build) : cd $(EXTERNAL_WORKDIR)/win32 \ && cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \ - $(if $(filter-out full,$(PRODUCT)),debug=yes) \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ && touch $@ diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 1e16361..25b5482 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) ifeq ($(COM),MSC) -ifeq ($(PRODUCT),full) +ifneq ($(ENABLE_DBGUTIL),TRUE) $(PERL) $< -e $(SRCDIR)/postprocess/signing/no_signing.txt -l $(subst .done,_log.txt,$@) \ -f $(PFXFILE) \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index dbcd042..5160382 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/unx/util \ )) $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \ - $(if $(filter $(ENABLE_CRASHDUMP),YES)$(if $(PRODUCT),,TRUE), \ + $(if $(filter $(ENABLE_CRASHDUMP),YES)$(filter $(ENABLE_DBGUTIL),TRUE), \ -DSAL_ENABLE_CRASH_REPORT) \ )) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index b018f20..bde227f 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ uuid \ )) -ifneq ($(PRODUCT),full) +ifeq ($(ENABLE_DBGUTIL),TRUE) $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ msvcrt \ )) diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 6302cf4..2513494 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -21,7 +21,7 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \ -define:TRACE \ ifeq ($(strip $(debug)),) -ifeq ($(strip $(PRODUCT)),) +ifeq ($(strip $(ENABLE_DBGUTIL)),TRUE) gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG) else gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o commit 1fa1c73f6801b3cea6cc01d4ea815929ef213103 Author: Michael Stahl <[email protected]> Date: Thu Jan 3 15:16:20 2013 +0100 cppunit: CXXFLAGS should be set only once Change-Id: I67e38db4b41849ac4be4ad20825391c84c7ed412 diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk index 02cccb3..8a2d97c 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/cppunit/ExternalProject_cppunit.mk @@ -45,10 +45,10 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : --disable-latex-docs \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ - $(if $(filter-out WNT,$(OS)),,CXXFLAGS="-mthreads" LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ + $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ - CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG))) \ + CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ $(if $(debug),-g)" \ && cd src \ && $(MAKE) \ commit 49440d2588466b257b505a7e580d58b46d58b158 Author: Michael Stahl <[email protected]> Date: Thu Jan 3 14:05:40 2013 +0100 .gitignore: re-add VIM swap files Change-Id: I08ab04005720e0de826d6a0cd33211e3a70d5965 diff --git a/.gitignore b/.gitignore index fe264e8..99b0a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ # backup and temporary editor files: the only convinience rules allowed here. *~ +.*sw? \#* # things below this point are targeted for elimination _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
