basic/CppunitTest_basic_vba.mk | 15 ++----- config_host.mk.in | 6 -- configure.ac | 22 +--------- l10ntools/Module_l10ntools.mk | 1 l10ntools/Package_inc.mk | 33 ---------------- l10ntools/inc/directory.hxx | 69 ++++++++++++++++++++++++++++++++++ l10ntools/inc/export.hxx | 2 l10ntools/inc/file.hxx | 43 +++++++++++++++++++++ l10ntools/inc/l10ntools/directory.hxx | 69 ---------------------------------- l10ntools/inc/l10ntools/file.hxx | 43 --------------------- l10ntools/source/directory.cxx | 2 l10ntools/source/file.cxx | 2 12 files changed, 123 insertions(+), 184 deletions(-)
New commits: commit 954611cdea0ae4b0dab4f241e580c4f61792dc8b Author: Matúš Kukan <[email protected]> Date: Mon Mar 11 20:50:39 2013 +0100 basic: make the makefile a bit nicer Change-Id: Ib606c0a9c84b35f4ab4b10dd7dc4dd82e85fcb71 diff --git a/basic/CppunitTest_basic_vba.mk b/basic/CppunitTest_basic_vba.mk index b343186..8b8d7ad 100644 --- a/basic/CppunitTest_basic_vba.mk +++ b/basic/CppunitTest_basic_vba.mk @@ -57,16 +57,11 @@ $(eval $(call gb_CppunitTest_use_api,basic_vba,\ $(eval $(call gb_CppunitTest_use_ure,basic_vba)) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_components,basic_vba,\ - configmgr/source/configmgr \ - i18npool/util/i18npool \ - extensions/source/ole/oleautobridge \ -)) -else $(eval $(call gb_CppunitTest_use_components,basic_vba,\ - configmgr/source/configmgr \ - i18npool/util/i18npool \ + configmgr/source/configmgr \ + i18npool/util/i18npool \ + $(if $(filter $(OS),WNT), \ + extensions/source/ole/oleautobridge) \ )) -endif + $(eval $(call gb_CppunitTest_use_configuration,basic_vba)) commit 12b6382ee9cd8f60ca0f1070940058b80cfcf706 Author: Matúš Kukan <[email protected]> Date: Sat Mar 9 12:43:33 2013 +0100 l10ntools: these are not public headers Change-Id: Ia9630c1ff60a00cd8286e99f61aacd27891f65e0 diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index 2982fd6d..fa47bf5 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_treex \ Executable_stringex \ StaticLibrary_transex \ - Package_inc \ Package_ulfconv \ )) diff --git a/l10ntools/Package_inc.mk b/l10ntools/Package_inc.mk deleted file mode 100644 index dc7b32e..0000000 --- a/l10ntools/Package_inc.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 David Ostrovsky <[email protected]> (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,l10ntools_inc,$(SRCDIR)/l10ntools)) - -$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/export.hxx,inc/export.hxx)) -$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/directory.hxx,inc/l10ntools/directory.hxx)) -$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/file.hxx,inc/l10ntools/file.hxx)) - -# vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/directory.hxx b/l10ntools/inc/directory.hxx new file mode 100644 index 0000000..2e6da89 --- /dev/null +++ b/l10ntools/inc/directory.hxx @@ -0,0 +1,69 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 . + */ + +#include <vector> +#include <algorithm> +#include <rtl/ustring.hxx> + +#ifdef WNT +#else +#include <dirent.h> +#include <unistd.h> +#include <sys/stat.h> +#endif + +#include <stdio.h> + +#ifndef L10NTOOLS_FILE_HXX +#define L10NTOOLS_FILE_HXX +#include "file.hxx" +#endif + +namespace transex{ + +class Directory +{ + private: + rtl::OUString sDirectoryName; + rtl::OUString sFullName; + + std::vector<Directory> aDirVec; + std::vector<File> aFileVec; + + public: + std::vector<Directory> getSubDirectories() { return aDirVec; } + std::vector<File> getFiles() { return aFileVec; } + + void readDirectory( const rtl::OUString& sFullpath ); + void scanSubDir( int nLevels = 0 ); + + rtl::OUString getDirectoryName() { return sDirectoryName; } + rtl::OUString getFullName() { return sFullName ; } + + void dump(); + Directory(){} + + Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ; + + static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ; +}; + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 3e01278..409e616 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -27,7 +27,7 @@ #ifndef L10NTOOLS_DIRECTORY_HXX #define L10NTOOLS_DIRECTORY_HXX -#include <l10ntools/directory.hxx> +#include "directory.hxx" #endif #include <osl/file.hxx> diff --git a/l10ntools/inc/file.hxx b/l10ntools/inc/file.hxx new file mode 100644 index 0000000..8c900dd --- /dev/null +++ b/l10ntools/inc/file.hxx @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 . + */ + +#include "rtl/ustring.hxx" + +namespace transex +{ + +class File +{ + private: + rtl::OUString sFileName; + rtl::OUString sFullName; + + public: + rtl::OUString getFileName(){ return sFileName; } + rtl::OUString getFullName(){ return sFullName; } + + File( const rtl::OUString sFullName , const rtl::OUString sFile ); + + static bool lessFile ( const File& rKey1, const File& rKey2 ); + +}; + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx deleted file mode 100644 index ad192ec..0000000 --- a/l10ntools/inc/l10ntools/directory.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <vector> -#include <algorithm> -#include <rtl/ustring.hxx> - -#ifdef WNT -#else -#include <dirent.h> -#include <unistd.h> -#include <sys/stat.h> -#endif - -#include <stdio.h> - -#ifndef L10NTOOLS_FILE_HXX -#define L10NTOOLS_FILE_HXX -#include <l10ntools/file.hxx> -#endif - -namespace transex{ - -class Directory -{ - private: - rtl::OUString sDirectoryName; - rtl::OUString sFullName; - - std::vector<Directory> aDirVec; - std::vector<File> aFileVec; - - public: - std::vector<Directory> getSubDirectories() { return aDirVec; } - std::vector<File> getFiles() { return aFileVec; } - - void readDirectory( const rtl::OUString& sFullpath ); - void scanSubDir( int nLevels = 0 ); - - rtl::OUString getDirectoryName() { return sDirectoryName; } - rtl::OUString getFullName() { return sFullName ; } - - void dump(); - Directory(){} - - Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ; - - static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ; -}; - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/l10ntools/file.hxx b/l10ntools/inc/l10ntools/file.hxx deleted file mode 100644 index 8c900dd..0000000 --- a/l10ntools/inc/l10ntools/file.hxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "rtl/ustring.hxx" - -namespace transex -{ - -class File -{ - private: - rtl::OUString sFileName; - rtl::OUString sFullName; - - public: - rtl::OUString getFileName(){ return sFileName; } - rtl::OUString getFullName(){ return sFullName; } - - File( const rtl::OUString sFullName , const rtl::OUString sFile ); - - static bool lessFile ( const File& rKey1, const File& rKey2 ); - -}; - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index 0571f5e..9f6d73c 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -23,7 +23,7 @@ #include <windows.h> #endif -#include <l10ntools/directory.hxx> +#include "directory.hxx" #include <rtl/ustring.hxx> #include <iostream> #include <vector> diff --git a/l10ntools/source/file.cxx b/l10ntools/source/file.cxx index be4fdde..9f8c003 100644 --- a/l10ntools/source/file.cxx +++ b/l10ntools/source/file.cxx @@ -18,7 +18,7 @@ */ -#include <l10ntools/file.hxx> +#include "file.hxx" namespace transex { commit 7062b4e0dfcf09a00dea19e62d0aa6c07c2ec34a Author: Matúš Kukan <[email protected]> Date: Fri Mar 8 11:13:32 2013 +0100 configure: clean unused _FOR_BUILD variables Change-Id: Ie236bbe4122fa5686a8d4c6050b5e14f354a5bb3 diff --git a/config_host.mk.in b/config_host.mk.in index 37539a4..d73d380 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -66,14 +66,11 @@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ export COMPATH=@COMPATH@ export COMPILER_PLUGINS=@COMPILER_PLUGINS@ export COMP_ENV=@OUTPATH@ -export COM_FOR_BUILD=@COM_FOR_BUILD@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPU=@CPU@ export CPUNAME=@CPUNAME@ -export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@ -export CPU_FOR_BUILD=@CPU_FOR_BUILD@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ @@ -212,7 +209,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GUI=@GUI@ export GUIBASE=@GUIBASE@ -export GUI_FOR_BUILD=@GUI_FOR_BUILD@ export HARDLINKDELIVER=@HARDLINKDELIVER@ export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ @@ -317,7 +313,6 @@ export LINK_X64_BINARY=@LINK_X64_BINARY@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@ export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ -export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ @@ -439,7 +434,6 @@ export OS_FOR_BUILD=@OS_FOR_BUILD@ export OUTDIR=@OUTDIR@ export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@ export OUTPATH=@OUTPATH@ -export OUTPATH_FOR_BUILD=@OUTPATH_FOR_BUILD@ export PATH=@LO_PATH@ export PATH_SEPERATOR=@P_SEP@ export PERL=@PERL@ diff --git a/configure.ac b/configure.ac index 0241d92..89b55e0 100644 --- a/configure.ac +++ b/configure.ac @@ -4065,10 +4065,9 @@ if test "$cross_compiling" = "yes"; then cp config.log ../config.Build.log mkdir -p ../config_build cp config_host/*.h ../config_build - . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH SYSTEM_LIBXSLT OUTDIR WORKDIR + . ./bin/get_config_variables OS PATH CC CXX INPATH SYSTEM_LIBXSLT OUTDIR WORKDIR - for V in COM GUI OS CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ - SYSTEM_LIBXSLT; do + for V in OS CC CXX INPATH SYSTEM_LIBXSLT; do VV='$'$V VV=`eval "echo $VV"` if test -n "$VV"; then @@ -4098,32 +4097,17 @@ if test "$cross_compiling" = "yes"; then AC_MSG_RESULT([checking for BUILD platform configuration... done]) rm -rf CONF-FOR-BUILD else + OS_FOR_BUILD="$OS" CC_FOR_BUILD="$CC" CXX_FOR_BUILD="$CXX" - CC_FOR_BUILD="$CC" - COM_FOR_BUILD="$COM" - CPUNAME_FOR_BUILD="$CPUNAME" - CPU_FOR_BUILD="$CPU" - CXX_FOR_BUILD="$CXX" - GUI_FOR_BUILD="$GUI" INPATH_FOR_BUILD="$INPATH" - MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET" - OS_FOR_BUILD="$OS" OUTDIR_FOR_BUILD="$OUTDIR" - OUTPATH_FOR_BUILD="$OUTPATH" WORKDIR_FOR_BUILD="$WORKDIR" fi -AC_SUBST(COM_FOR_BUILD) -AC_SUBST(GUI_FOR_BUILD) AC_SUBST(OS_FOR_BUILD) -AC_SUBST(CPU_FOR_BUILD) -AC_SUBST(CPUNAME_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD) -AC_SUBST(OUTPATH_FOR_BUILD) -AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD) - AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
