From e1577335e0c88e269995ff9164da981d800eb6bb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- tools/Makefile | 30 ++++++ tools/prj/gbuild.lst | 3 + tools/prj/makefile.mk | 2 + tools/prj/target_exe_mkunroll.mk | 79 ++++++++++++++++ tools/prj/target_exe_rscdep.mk | 76 ++++++++++++++++ tools/prj/target_exe_so_checksum.mk | 69 ++++++++++++++ tools/prj/target_exe_sspretty.mk | 77 ++++++++++++++++ tools/prj/target_lib_tl.mk | 176 ++++++++++++++++++++++++++++++++++++ tools/prj/target_module_tools.mk | 56 ++++++++++++ tools/prj/target_package_inc.mk | 120 ++++++++++++++++++++++++ 10 files changed, 688 insertions(+) create mode 100644 tools/Makefile create mode 100644 tools/prj/gbuild.lst create mode 100644 tools/prj/makefile.mk create mode 100644 tools/prj/target_exe_mkunroll.mk create mode 100644 tools/prj/target_exe_rscdep.mk create mode 100644 tools/prj/target_exe_so_checksum.mk create mode 100644 tools/prj/target_exe_sspretty.mk create mode 100644 tools/prj/target_lib_tl.mk create mode 100644 tools/prj/target_module_tools.mk create mode 100644 tools/prj/target_package_inc.mk (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/tools/prj/gbuild.lst b/tools/prj/gbuild.lst new file mode 100644 index 000000000000..3194cbb4e87c --- /dev/null +++ b/tools/prj/gbuild.lst @@ -0,0 +1,3 @@ +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/tools/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk new file mode 100644 index 000000000000..9d00d75b4bc1 --- /dev/null +++ b/tools/prj/target_exe_mkunroll.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,mkunroll)) + +$(eval $(call gb_Executable_set_include,mkunroll,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + basegfx \ + sal \ + stl \ + tl \ + vos3 \ +)) + +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ + tools/bootstrp/addexes2/mkfilt \ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk new file mode 100644 index 000000000000..99a717470f19 --- /dev/null +++ b/tools/prj/target_exe_rscdep.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,rscdep)) + +$(eval $(call gb_Executable_set_include,rscdep,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,rscdep,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + sal \ + stl \ + tl \ + vos3 \ +)) + +$(eval $(call gb_Executable_add_exception_objects,rscdep,\ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/rscdep \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_so_checksum.mk b/tools/prj/target_exe_so_checksum.mk new file mode 100644 index 000000000000..d852c22ef5de --- /dev/null +++ b/tools/prj/target_exe_so_checksum.mk @@ -0,0 +1,69 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,so_checksum)) + +$(eval $(call gb_Executable_set_include,so_checksum,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + sal \ + tl \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ + tools/bootstrp/md5 \ + tools/bootstrp/so_checksum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk new file mode 100644 index 000000000000..6751c53fae84 --- /dev/null +++ b/tools/prj/target_exe_sspretty.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,sspretty)) + +$(eval $(call gb_Executable_set_include,sspretty,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,sspretty,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + sal \ + stl \ + tl \ + vos3 \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,sspretty,\ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/sspretty \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk new file mode 100644 index 000000000000..3379a194e024 --- /dev/null +++ b/tools/prj/target_lib_tl.mk @@ -0,0 +1,176 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tl)) + +$(call gb_Library_get_headers_target,tl) : $(call gb_Package_get_target,tools_inc) + +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/tools \ + -I$(SRCDIR)/tools/inc \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(SRCDIR)/solenv/inc/Xp31 \ + -I$(OUTDIR)/inc/tools \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ +)) + +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSHARED_LIB \ + -DTOOLS_DLLIMPLEMENTATION \ + -DVCL \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + basegfx \ + comphelper \ + i18nisolang1 \ + stl \ + cppu \ + sal \ + vos3 \ +)) + + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/parser \ + tools/source/datetime/tdate \ + tools/source/datetime/ttime \ + tools/source/debug/stcktree \ + tools/source/fsys/tdir \ + tools/source/fsys/tempfile \ + tools/source/fsys/urlobj \ + tools/source/fsys/wldcrd \ + tools/source/generic/line \ + tools/source/generic/link \ + tools/source/generic/poly \ + tools/source/generic/poly2 \ + tools/source/generic/svborder \ + tools/source/generic/toolsin \ + tools/source/inet/inetmime \ + tools/source/inet/inetmsg \ + tools/source/inet/inetstrm \ + tools/source/memtools/mempool \ + tools/source/memtools/multisel \ + tools/source/memtools/table \ + tools/source/memtools/unqidx \ + tools/source/misc/solarmutex \ + tools/source/rc/isofallback \ + tools/source/rc/rc \ + tools/source/rc/resary \ + tools/source/rc/resmgr \ + tools/source/ref/globname \ + tools/source/ref/pstm \ + tools/source/ref/ref \ + tools/source/stream/stream \ + tools/source/stream/strmsys \ + tools/source/stream/vcompat \ + tools/source/string/tenccvt \ + tools/source/string/tstring \ + tools/source/string/tustring \ + tools/source/testtoolloader/testtoolloader \ + tools/source/communi/geninfo \ + tools/source/datetime/datetime \ + tools/source/debug/debug \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ + tools/source/memtools/contnr \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ + tools/source/ref/errinf \ + tools/source/stream/cachestr \ + tools/source/string/debugprint \ + tools/source/zcodec/zcodec \ +)) + +ifeq ($(GUI),unx) +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/unx/source/dll/toolsdll \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ +)) +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSYSTEM_ZLIB \ +)) +$(eval $(call gb_Library_add_linked_libs,tl,\ + z \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/win/inc \ +)) + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/win/source/dll/toolsdll \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g +# -DOPTIMIZE +# no -DTOOLS_DLLIMPLEMENTATION on toolsdll +# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk new file mode 100644 index 000000000000..b566c1d65b86 --- /dev/null +++ b/tools/prj/target_module_tools.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,tools,\ + $(call gb_Executable_get_target,mkunroll) \ + $(call gb_Executable_get_target,rscdep) \ + $(call gb_Executable_get_target,so_checksum) \ + $(call gb_Executable_get_target,sspretty) \ + $(call gb_Library_get_target,tl) \ + $(call gb_Package_get_target,tools_inc) \ +)) + +$(eval $(call gb_Module_read_includes,tools,\ + exe_mkunroll \ + exe_rscdep \ + exe_so_checksum \ + exe_sspretty \ + lib_tl \ + package_inc \ +)) + +# TODO: +#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib +#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib +#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib +#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a +#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a +#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a +#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a +#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib +#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj +#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk new file mode 100644 index 000000000000..92bb02034e7d --- /dev/null +++ b/tools/prj/target_package_inc.mk @@ -0,0 +1,120 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/command.hxx,bootstrp/command.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/inimgr.hxx,bootstrp/inimgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/listmacr.hxx,bootstrp/listmacr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/mkcreate.hxx,bootstrp/mkcreate.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/prj.hxx,bootstrp/prj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/sstring.hxx,bootstrp/sstring.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) -- cgit From 11a84b8b106143d1de8bdaa663286892b8968f58 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- tools/prj/build.lst | 33 +---------- tools/prj/d.lst | 123 ---------------------------------------- tools/prj/target_lib_tl.mk | 39 ++++++------- tools/prj/target_package_inc.mk | 1 + 4 files changed, 24 insertions(+), 172 deletions(-) (limited to 'tools') diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 659ecfe66cab..3194cbb4e87c 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,30 +1,3 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\bootstrp\addexes get - all tl_bsexes NULL -tl tools\inc nmake - all tl_inc NULL -tl tools\prj get - all tl_prj NULL -tl tools\prj usr7 - all tl_deliver NULL -tl tools\prj usr42 - all tl_zn NULL -tl tools\workben get - all tl_wben NULL -tl tools\source\testtoolloader nmake - all tl_ttloader tl_inc NULL -tl tools\source\generic nmake - all tl_gen tl_fsys tl_inc NULL -tl tools\source\memtools nmake - all tl_mem tl_fsys tl_inc NULL -tl tools\source\debug nmake - all tl_deb tl_fsys tl_inc NULL -tl tools\source\datetime nmake - all tl_dat tl_fsys tl_inc NULL -tl tools\source\stream nmake - all tl_str tl_fsys tl_inc NULL -tl tools\source\rc nmake - all tl_rc tl_fsys tl_inc NULL -tl tools\source\ref nmake - all tl_ref tl_fsys tl_inc NULL -tl tools\source\fsys nmake - all tl_fsys tl_inc NULL -tl tools\source\zcodec nmake - all tl_zco tl_fsys tl_inc NULL -tl tools\source\communi nmake - all tl_com tl_fsys tl_inc NULL -tl tools\source\inet nmake - all tl_inet tl_fsys tl_inc NULL -tl tools\source\string nmake - all tl_string tl_fsys tl_inc NULL -tl tools\source\misc nmake - all tl_misc tl_inc NULL -tl tools\win\source\dll nmake - w tl_dllw tl_inc NULL -tl tools\os2\source\dll nmake - p tl_dllp tl_inc NULL -tl tools\unx\source\dll nmake - u tl_dllu tl_inc NULL -tl tools\util nmake - all tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL -tl tools\bootstrp nmake - all tl_bstrp tl_utl tl_inc NULL -tl tools\bootstrp\addexes2 nmake - all tl_bsexes2 tl_bstrp tl_inc NULL - +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 76cb0107453c..8b137891791f 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,124 +1 @@ -mkdir: %_DEST%\inc%_EXT%\bootstrp -..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb -..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% -..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll -..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym -..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib -..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib -..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib -..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib -..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map -..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib - -..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx -..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx -..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx -..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx -..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx -..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx - -..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h -..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx -..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h - -..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h -..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h - -..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h -..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h - -..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx -..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx -..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx -..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx -..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx -..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx -..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx -..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx -..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx -..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx -..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx -..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx -..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx -..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx -..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx -..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx -..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h -..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx -..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx -..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx -..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx -..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx -..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx -..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx -..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx -..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx -..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx -..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx -..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx -..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx -..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx -..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx -..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx -..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx -..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx -..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx -..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h -..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h -..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx -..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx -..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h -..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx -..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h -..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx -..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx -..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx -..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx -..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx -..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx -..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx -..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx -..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h -..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx -..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx -..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx -..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h -..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx -..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx -..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx -..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h -..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx -..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx -..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx -..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx -..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx -..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx -..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx -..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx -..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx -..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx -..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx -..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx -..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx -..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx -..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx -..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx -..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx -..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx -..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx - -..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe -..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep -..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe -..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum - -..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx -..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj -..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 3379a194e024..704ddbb16be1 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -61,14 +61,27 @@ $(eval $(call gb_Library_add_linked_libs,tl,\ $(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/geninfo \ tools/source/communi/parser \ + tools/source/datetime/datetime \ tools/source/datetime/tdate \ tools/source/datetime/ttime \ + tools/source/debug/debug \ tools/source/debug/stcktree \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ tools/source/fsys/tdir \ tools/source/fsys/tempfile \ tools/source/fsys/urlobj \ tools/source/fsys/wldcrd \ + tools/source/generic/b3dtrans \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ tools/source/generic/line \ tools/source/generic/link \ tools/source/generic/poly \ @@ -78,44 +91,32 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/inet/inetmime \ tools/source/inet/inetmsg \ tools/source/inet/inetstrm \ + tools/source/memtools/contnr \ tools/source/memtools/mempool \ tools/source/memtools/multisel \ tools/source/memtools/table \ tools/source/memtools/unqidx \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ tools/source/misc/solarmutex \ tools/source/rc/isofallback \ tools/source/rc/rc \ tools/source/rc/resary \ tools/source/rc/resmgr \ + tools/source/ref/errinf \ tools/source/ref/globname \ tools/source/ref/pstm \ tools/source/ref/ref \ + tools/source/stream/cachestr \ tools/source/stream/stream \ tools/source/stream/strmsys \ tools/source/stream/vcompat \ + tools/source/string/debugprint \ tools/source/string/tenccvt \ tools/source/string/tstring \ tools/source/string/tustring \ tools/source/testtoolloader/testtoolloader \ - tools/source/communi/geninfo \ - tools/source/datetime/datetime \ - tools/source/debug/debug \ - tools/source/fsys/comdep \ - tools/source/fsys/dirent \ - tools/source/fsys/filecopy \ - tools/source/fsys/fstat \ - tools/source/generic/bigint \ - tools/source/generic/color \ - tools/source/generic/config \ - tools/source/generic/fract \ - tools/source/generic/gen \ - tools/source/memtools/contnr \ - tools/source/misc/appendunixshellword \ - tools/source/misc/extendapplicationenvironment \ - tools/source/misc/getprocessworkingdir \ - tools/source/ref/errinf \ - tools/source/stream/cachestr \ - tools/source/string/debugprint \ tools/source/zcodec/zcodec \ )) diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk index 92bb02034e7d..14e70973b276 100644 --- a/tools/prj/target_package_inc.mk +++ b/tools/prj/target_package_inc.mk @@ -118,3 +118,4 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbas $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) -- cgit From f4f1d545e7523f3a900e466402aa65a468cbaeca Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- tools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit From e37041ee819fc4e3b0734faee187fdfb972dad37 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 21 Apr 2010 18:15:18 +0200 Subject: gnumake2: value of $GUI is uppercase UNX --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 704ddbb16be1..ba984dc9f501 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/zcodec/zcodec \ )) -ifeq ($(GUI),unx) +ifeq ($(GUI),UNX) $(eval $(call gb_Library_add_exception_objects,tl,\ tools/unx/source/dll/toolsdll \ )) -- cgit From 09c6bc8718f8cb1c59cb2b4fd9af2d63a264dcb5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:12:37 +0200 Subject: gnumake2: tools: always link zlib statically --- tools/prj/target_lib_tl.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index ba984dc9f501..82d29900fd62 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -145,6 +145,10 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\ zlib \ )) endif +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) endif ifeq ($(OS),WNT) -- cgit From 8cdd55813c6bd7d8afb193f84ce332244dfa43e5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:07:48 +0200 Subject: CWS gnumake2: small error in makefil --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 82d29900fd62..65a48316d914 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -158,7 +158,7 @@ $(eval $(call gb_Library_set_include,tl,\ )) $(eval $(call gb_Library_add_exception_objects,tl,\ - tools/source/win/source/dll/toolsdll \ + tools/win/source/dll/toolsdll \ )) $(eval $(call gb_Library_add_linked_libs,tl,\ -- cgit From 1c4f220b470e3887ef3f04974b805c7641e593e2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 27 Apr 2010 11:39:42 +0200 Subject: CWS gnumake2: refactoring --- tools/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: -- cgit From ccecaf93b3d1c85a8c5a3b3be2adfeb5fed7dfc8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 29 Apr 2010 17:09:55 +0200 Subject: gnumake2: tools: support for SYSTEM_ZLIB not LINUX specific --- tools/prj/target_lib_tl.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 65a48316d914..30c64badc265 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -126,12 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,tl,\ - dl \ - m \ - pthread \ -)) ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_set_cxxflags,tl,\ $$(CXXFLAGS) \ @@ -145,9 +139,12 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\ zlib \ )) endif -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ )) endif -- cgit From 1384b809fa1f1155624f7f00040328aa96f0cf1e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 30 Apr 2010 21:24:50 +0200 Subject: CWS gnumake2: tools cleanup --- tools/prj/build.lst | 1 - tools/prj/d.lst | 93 +----- tools/prj/target_module_tools.mk | 3 + tools/source/solar/makefile.mk | 63 ---- tools/source/solar/solar.c | 562 ---------------------------------- tools/util/makefile.mk | 13 - tools/win/inc/parser.hxx | 48 --- tools/win/inc/shellex.h | 115 ------- tools/win/inc/shutil.h | 215 ------------- tools/win/inc/winshell.hxx | 386 ----------------------- tools/win/source/fastfsys/makefile.mk | 71 ----- 11 files changed, 5 insertions(+), 1565 deletions(-) delete mode 100644 tools/source/solar/makefile.mk delete mode 100644 tools/source/solar/solar.c delete mode 100644 tools/win/inc/parser.hxx delete mode 100644 tools/win/inc/shellex.h delete mode 100644 tools/win/inc/shutil.h delete mode 100644 tools/win/inc/winshell.hxx delete mode 100644 tools/win/source/fastfsys/makefile.mk (limited to 'tools') diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 659ecfe66cab..6f07015178d2 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,7 +1,6 @@ tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL tl tools usr1 - all tl_mkout NULL tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\bootstrp\addexes get - all tl_bsexes NULL tl tools\inc nmake - all tl_inc NULL tl tools\prj get - all tl_prj NULL tl tools\prj usr7 - all tl_deliver NULL diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 76cb0107453c..854a6179739a 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,6 +1,5 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp -..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb ..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% ..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll ..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym @@ -24,101 +23,13 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp ..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx ..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx -..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h -..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx -..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h - -..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h -..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h - -..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h -..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h - -..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx -..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx -..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx -..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx -..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx -..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx -..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx -..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx -..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx -..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx -..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx -..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx -..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx -..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx -..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx -..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx -..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h -..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx -..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx -..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx -..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx -..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx -..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx -..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx -..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx -..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx -..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx -..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx -..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx -..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx -..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx -..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx -..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx -..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx -..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx -..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx -..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h -..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h -..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx -..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx -..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h -..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx -..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h -..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx -..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx -..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx -..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx -..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx -..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx -..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx -..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx -..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h -..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx -..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx -..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx -..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h -..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx -..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx -..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx -..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h -..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx -..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx -..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx -..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx -..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx -..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx -..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx -..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx -..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx -..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx -..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx -..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx -..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx -..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx -..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx -..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx -..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx -..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx -..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx +..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h +..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep ..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe ..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum -..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx ..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj ..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk index b566c1d65b86..70d14b03dc45 100644 --- a/tools/prj/target_module_tools.mk +++ b/tools/prj/target_module_tools.mk @@ -54,3 +54,6 @@ $(eval $(call gb_Module_read_includes,tools,\ #COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib #COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj #COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj + +#todo: link tools dynamically everywhere +#todo: ALWAYSDBGFLAG etc. diff --git a/tools/source/solar/makefile.mk b/tools/source/solar/makefile.mk deleted file mode 100644 index 6f5dd85c608b..000000000000 --- a/tools/source/solar/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=mksvconf -TARGETTYPE=CUI - -LIBSALCPPRT=$(0) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CFILES= solar.c - -OBJFILES= $(OBJ)$/solar.obj - -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJFILES) -APP1STDLIBS= -APP1DEPN= -APP1DEF= - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.IF "$(L10N-framework)"=="" -ALLTAR : $(INCCOM)$/svconf.h -.ENDIF # "$(L10N-framework)"=="" - -$(INCCOM)$/svconf.h : $(BIN)$/$(TARGET) - $(BIN)$/$(TARGET) $@ - diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c deleted file mode 100644 index 608f0baf5129..000000000000 --- a/tools/source/solar/solar.c +++ /dev/null @@ -1,562 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* POSIX defines that a program is undefined after a SIG_SEGV. The - * code stopped working on Linux Kernel 2.6 so I have moved this back to - * use FORK. - * If at a later time the signals work correctly with the Linux Kernel 2.6 - * then this change may be reverted although not strictly posix safe. */ -#define USE_FORK_TO_CHECK 1 - -#include -#include -#include -#include - -#include -#include - -#define I_STDARG -#ifdef I_STDARG -#include -#else -#include -#endif - -#define NO_USE_FORK_TO_CHECK -#ifdef USE_FORK_TO_CHECK -#include -#else -#include -#include -#endif - -#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) ) - -#define isSignedType(Type) (((Type)-1) < 0) -#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name ) - - -/************************************************************************* -|* -|* IsBigEndian() -|* -|* Beschreibung True, wenn CPU BigEndian ist -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int IsBigEndian() -{ - long l = 1; - return ! *(char*)&l; -} - -/************************************************************************* -|* -|* IsStackGrowingDown() -|* -|* Beschreibung True, wenn der Stack nach unten waechst -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int IsStackGrowingDown_2( int * pI ) -{ - int i = 1; - return ((unsigned long)&i) < (unsigned long)pI; -} - -int IsStackGrowingDown() -{ - int i = 1; - return IsStackGrowingDown_2(&i); -} - -/************************************************************************* -|* -|* GetStackAlignment() -|* -|* Beschreibung Alignment von char Parametern, die (hoffentlich) -|* ueber den Stack uebergeben werden -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... ) -{ - if ( IsStackGrowingDown() ) - return &c - &b; - else - return &b - &c; -} - -int GetStackAlignment_2( char*p, long l, int i, short s, char b, char c ) -{ - if ( IsStackGrowingDown() ) - return &c - &b; - else - return &b - &c; -} - -int GetStackAlignment() -{ - int nStackAlignment = GetStackAlignment_3(0,1,2,3,4,5); - if ( nStackAlignment != GetStackAlignment_2(0,1,2,3,4,5) ) - printf( "Pascal calling convention\n" ); - return nStackAlignment; -} - - -/************************************************************************* -|* -|* Typdeclarations for memory access test functions -|* -*************************************************************************/ -typedef enum { t_char, t_short, t_int, t_long, t_double } Type; -typedef int (*TestFunc)( Type, void* ); - - -/************************************************************************* -|* -|* PrintArgs() -|* -|* Beschreibung Testfunktion fuer variable Parameter -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -#ifdef I_STDARG -void PrintArgs( int p, ... ) -#else -void PrintArgs( p, va_alist ) -int p; -va_dcl -#endif -{ - int value; - va_list ap; - -#ifdef I_STDARG - va_start( ap, p ); -#else - va_start( ap ); -#endif - - printf( "value = %d", p ); - - while ( ( value = va_arg(ap, int) ) != 0 ) - printf( " %d", value ); - - printf( "\n" ); - va_end(ap); -} - -#ifndef USE_FORK_TO_CHECK -/************************************************************************* -|* -|* SignalHdl() -|* -|* Beschreibung faengt SIGBUS und SIGSEGV in check() ab -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -static jmp_buf check_env; -static int bSignal; -void SignalHdl( int sig ) -{ - bSignal = 1; - - fprintf( stderr, "Signal %d caught\n", sig ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); - siglongjmp( check_env, sig ); -} -#endif - -/************************************************************************* -|* -|* check() -|* -|* Beschreibung Testet MemoryZugriff (read/write) -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int check( TestFunc func, Type eT, void* p ) -{ -#ifdef USE_FORK_TO_CHECK - pid_t nChild = fork(); - if ( nChild ) - { - int exitVal; - wait( &exitVal ); - if ( exitVal & 0xff ) - return -1; - else - return exitVal >> 8; - } - else - { - exit( func( eT, p ) ); - } -#else - int result; - - bSignal = 0; - - if ( !sigsetjmp( check_env, 1 ) ) - { - signal( SIGSEGV, SignalHdl ); - signal( SIGBUS, SignalHdl ); - result = func( eT, p ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); - } - - if ( bSignal ) - return -1; - else - return 0; -#endif -} - -/************************************************************************* -|* -|* GetAtAddress() -|* -|* Beschreibung memory read access -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetAtAddress( Type eT, void* p ) -{ - switch ( eT ) - { - case t_char: return *((char*)p); - case t_short: return *((short*)p); - case t_int: return *((int*)p); - case t_long: return *((long*)p); - case t_double: return *((double*)p); - } - abort(); -} - -/************************************************************************* -|* -|* SetAtAddress() -|* -|* Beschreibung memory write access -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int SetAtAddress( Type eT, void* p ) -{ - switch ( eT ) - { - case t_char: return *((char*)p) = 0; - case t_short: return *((short*)p) = 0; - case t_int: return *((int*)p) = 0; - case t_long: return *((long*)p) = 0; - case t_double: return *((double*)p)= 0; - } - abort(); -} - -char* TypeName( Type eT ) -{ - switch ( eT ) - { - case t_char: return "char"; - case t_short: return "short"; - case t_int: return "int"; - case t_long: return "long"; - case t_double: return "double"; - } - abort(); -} - -/************************************************************************* -|* -|* Check(Get|Set)Access() -|* -|* Beschreibung Testet MemoryZugriff (read/write) -|* Zugriffsverletzungen werden abgefangen -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int CheckGetAccess( Type eT, void* p ) -{ - int b; - b = -1 != check( (TestFunc)GetAtAddress, eT, p ); -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, - "%s read %s at %p\n", - (b? "can" : "can not" ), TypeName(eT), p ); -#endif - return b; -} -int CheckSetAccess( Type eT, void* p ) -{ - int b; - - b = -1 != check( (TestFunc)SetAtAddress, eT, p ); -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, - "%s write %s at %p\n", - (b? "can" : "can not" ), TypeName(eT), p ); -#endif - return b; -} - -/************************************************************************* -|* -|* GetAlignment() -|* -|* Beschreibung Bestimmt das Alignment verschiedener Typen -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetAlignment( Type eT ) -{ - char a[ 16*8 ]; - long p = (long)(void*)a; - int i; - - /* clear a[...] to set legal value for double access */ - for ( i = 0; i < 16*8; i++ ) - a[i] = 0; - - p = ( p + 0xF ) & ~0xF; - for ( i = 1; i < 16; i++ ) - if ( CheckGetAccess( eT, (void*)(p+i) ) ) - return i; - return 0; -} - -/************************************************************************* -|* -|* struct Description -|* -|* Beschreibung Beschreibt die Parameter der Architektur -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -struct Description -{ - int bBigEndian; - int bStackGrowsDown; - int nStackAlignment; - int nAlignment[3]; /* 2,4,8 */ -}; - -/************************************************************************* -|* -|* Description_Ctor() -|* -|* Beschreibung Bestimmt die Parameter der Architektur -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void Description_Ctor( struct Description* pThis ) -{ - pThis->bBigEndian = IsBigEndian(); - pThis->bStackGrowsDown = IsStackGrowingDown(); - pThis->nStackAlignment = GetStackAlignment(); - - if ( sizeof(short) != 2 ) - abort(); - pThis->nAlignment[0] = GetAlignment( t_short ); - if ( sizeof(int) != 4 ) - abort(); - pThis->nAlignment[1] = GetAlignment( t_int ); - - if ( sizeof(long) == 8 ) - pThis->nAlignment[2] = GetAlignment( t_long ); - else if ( sizeof(double) == 8 ) - pThis->nAlignment[2] = GetAlignment( t_double ); - else - abort(); -} - -/************************************************************************* -|* -|* Description_Print() -|* -|* Beschreibung Schreibt die Parameter der Architektur als Header -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void Description_Print( struct Description* pThis, char* name ) -{ - int i; - FILE* f = fopen( name, "w" ); - if( ! f ) { - fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) ); - exit( 99 ); - } - fprintf( f, "#define __%s\n", - pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" ); - for ( i = 0; i < 3; i++ ) - fprintf( f, "#define __ALIGNMENT%d\t%d\n", - 1 << (i+1), pThis->nAlignment[i] ); - fprintf( f, "/* Stack alignment is not used... */\n" ); - fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment ); - fprintf( f, "#define __STACKDIRECTION\t%d\n", - pThis->bStackGrowsDown ? -1 : 1 ); - fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) ); - fprintf( f, "#define __SIZEOFSHORT\t%d\n", sizeof( short ) ); - fprintf( f, "#define __SIZEOFINT\t%d\n", sizeof( int ) ); - fprintf( f, "#define __SIZEOFLONG\t%d\n", sizeof( long ) ); - fprintf( f, "#define __SIZEOFPOINTER\t%d\n", sizeof( void* ) ); - fprintf( f, "#define __SIZEOFDOUBLE\t%d\n", sizeof( double ) ); - fprintf( f, "#define __IEEEDOUBLE\n" ); - fclose( f ); -} - -/************************************************************************* -|* -|* InfoMemoryAccess() -|* -|* Beschreibung Informeller Bytezugriffstest -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void InfoMemoryAccess( char* p ) -{ - if ( CheckGetAccess( t_char, p ) ) - printf( "can read address %p\n", p ); - else - printf( "can not read address %p\n", p ); - - if ( CheckSetAccess( t_char, p ) ) - printf( "can write address %p\n", p ); - else - printf( "can not write address %p\n", p ); -} - -/************************************************************************* -|* -|* InfoMemoryTypeAccess() -|* -|* Beschreibung Informeller Zugriffstest verschiedener Typen -|* -|* Ersterstellung EG 15.08.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void InfoMemoryTypeAccess( Type eT ) -{ - char a[64]; - int i; - - /* clear a[...] to set legal value for double access */ - for ( i = 0; i < 64; i++ ) - a[i] = 0; - - for ( i = 56; i >= 7; i >>= 1 ) - { - printf( "Zugriff %s auf %i-Aligned Adresse : ", TypeName( eT ), i / 7 ); - printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) ); - } -} -/************************************************************************ - * - * Use C code to determine the characteristics of the building platform. - * - ************************************************************************/ -int main( int argc, char* argv[] ) -{ - printTypeSign( char, "char" ); - printTypeSign( short, "short" ); - printTypeSign( int, "int" ); - printTypeSign( long, "long" ); - - printTypeSize( char, "char" ); - printTypeSize( short, "short" ); - printTypeSize( int, "int" ); - printTypeSize( long, "long" ); - printTypeSize( float, "float" ); - printTypeSize( double, "double" ); - printTypeSize( void *, "void *" ); - - if ( IsBigEndian() ) - printf( "BIGENDIAN (Sparc, MC680x0, RS6000, IP22, IP32, g3)\n" ); - else - printf( "LITTLEENDIAN (Intel, VAX, PowerPC)\n" ); - - if( IsStackGrowingDown() ) - printf( "Stack waechst nach unten\n" ); - else - printf( "Stack waechst nach oben\n" ); - - printf( "STACKALIGNMENT : %d\n", GetStackAlignment() ); - - /* PrintArgs( 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 ); */ - - if ( argc > 1 ) - { - struct Description description; - Description_Ctor( &description ); - Description_Print( &description, argv[1] ); - } - { - char* p = NULL; - InfoMemoryAccess( p ); - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); - InfoMemoryTypeAccess( t_int ); - InfoMemoryTypeAccess( t_long ); - InfoMemoryTypeAccess( t_double ); - } - - exit( 0 ); -} diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 1574addcf59c..568baaacd8f1 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -87,19 +87,6 @@ SHL1STDLIBS += $(ZLIB3RDLIB) \ LIB1FILES+= $(SLB)$/dll.lib - -.IF "$(BIG_TOOLS)"!="" -.IF "$(GUI)"=="WNT" -#SOLARLIBDIR=$(SOLARVER)\$((INPATH)\lib -#SOLARLIBDIR=..\$(INPATH)\lib -# bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen ! -LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ - $(SOLARLIBDIR)\xrtl.lib \ - $(SOLARLIBDIR)\xvos.lib -SHL1STDLIBS+= $(WSOCK32LIB) -.ENDIF -.ENDIF # "$(BIG_TOOLS)"!="" - # --- TOOLS.DLL --- SHL1TARGET= tl$(DLLPOSTFIX) diff --git a/tools/win/inc/parser.hxx b/tools/win/inc/parser.hxx deleted file mode 100644 index 08b0d7968d54..000000000000 --- a/tools/win/inc/parser.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _PARSER_HXX -#define _PARSER_HXX - -#if defined WNT - -#include -#include - -void * NewBinaryFromString( const String & rBinStr ); -String CreateStringFromData( const void *pData, ULONG nBytes ); - -String CreateStringFromItemIDList( const CItemIDList & rIDList ); - -String GetURLFromHostNotation( const String & rPath ); -String GetHostNotationFromURL( const String & rURL ); - -CItemIDList MakeIDToken( const String &rToken ); -CItemIDList ParseSpecialURL( const String & rURL ); - -#endif - -#endif // _PARSER_HXX diff --git a/tools/win/inc/shellex.h b/tools/win/inc/shellex.h deleted file mode 100644 index f81502a3382b..000000000000 --- a/tools/win/inc/shellex.h +++ /dev/null @@ -1,115 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SHELLEX_H_ -#define _SHELLEX_H_ - -#ifndef _SHLOBJ_H_ -#include -#endif - -#ifdef __cplusplus -extern "C" { -#define WINSHELLCALL inline -#else -#define WINSHELLCALL static -#endif - -#define SHChangeNotifyRegister_PROC_STR MAKEINTRESOURCE(2) -#define SHChangeNotifyDeregister_PROC_STR MAKEINTRESOURCE(4) - -#define SHCNF_ACCEPT_INTERRUPTS 0x0001 -#define SHCNF_ACCEPT_NON_INTERRUPTS 0x0002 -#define SHCNF_NO_PROXY 0x8000 - -#define SHCNF_ACCEPT_ALL (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS) - -typedef struct tagNOTIFYREGISTER { - LPCITEMIDLIST pidlPath; - BOOL bWatchSubtree; -} NOTIFYREGISTER; - -typedef NOTIFYREGISTER *LPNOTIFYREGISTER; -typedef NOTIFYREGISTER const *LPCNOTIFYREGISTER; - -typedef HANDLE (WINAPI *SHChangeNotifyRegister_PROC)( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems); - - -WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems) - -{ - HMODULE hModule = GetModuleHandle( "SHELL32" ); - HANDLE hNotify = NULL; - - if ( hModule ) - { - SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR ); - if ( lpfnSHChangeNotifyRegister ) - hNotify = lpfnSHChangeNotifyRegister( hWnd, dwFlags, wEventMask, uMsg, cItems, lpItems ); - } - - return hNotify; -} - - - -typedef BOOL (WINAPI *SHChangeNotifyDeregister_PROC)( - HANDLE hNotify); - -WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify ) -{ - HMODULE hModule = GetModuleHandle( "SHELL32" ); - BOOL fSuccess = FALSE; - - if ( hModule ) - { - SHChangeNotifyDeregister_PROC lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR ); - if ( lpfnSHChangeNotifyDeregister ) - fSuccess = lpfnSHChangeNotifyDeregister( hNotify ); - } - - return fSuccess; -} - - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h deleted file mode 100644 index 1daae442292d..000000000000 --- a/tools/win/inc/shutil.h +++ /dev/null @@ -1,215 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SHUTIL_H_ -#define _SHUTIL_H_ - -#if defined WNT - -#ifndef _SHOBJ_H -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define PROTOCOL_FILE "file:" -#define MAX_URL (MAX_PATH + sizeof(PROTOCOL_FILE)) - -#define SHUTIL_TO_DELIVER - -//-------------------------------------------------------------------------- - -void * WINAPI WIN_SHAlloc( ULONG cb ); -void * WINAPI WIN_SHRealloc( void *pv, ULONG cb ); -void WINAPI WIN_SHFree( void *pv ); - -//-------------------------------------------------------------------------- - -ULONG WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -BOOL WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -LONG WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 ); - -LONG WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl ); - -BOOL WINAPI WIN_SHSplitIDList( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlFolder, - LPITEMIDLIST * pidlItem - ); - -BOOL WINAPI WIN_SHSplitIDListEx( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlParent, - LPITEMIDLIST * pidlChild, - ULONG nLevel - ); - -//-------------------------------------------------------------------------- - -#define WIN_SHGetSpecialFolderLocation( nFolder, ppidl ) \ - ((BOOL)(NOERROR == SHGetSpecialFolderLocation( GetFocus(), nFolder, ppidl ))) - -#define WIN_SHGetPathFromIDList( pidl, pszPath ) \ - SHGetPathFromIDList( pidl, pszPath ) - -// #define SHGP_CLSID 0x00000001 - -// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags ); - -BOOL WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl ); - -BOOL WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath ); -BOOL WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL ); - -BOOL WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf ); - -BOOL WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath ); - -HRESULT WINAPI WIN_SHGetDataFromIDList( - LPSHELLFOLDER psf, - LPCITEMIDLIST pidl, - int nFormat, - PVOID pv, - int cb - ); - - -//-------------------------------------------------------------------------- - -#define SHIC_PIDL 0x00000001 -#define SHIC_NO_UI 0x00000002 - -#define CMDSTR_OPENA "open" -#define CMDSTR_EXPLOREA "explore" -#define CMDSTR_FINDA "find" - -#define CMDSTR_OPENW L"open" -#define CMDSTR_EXPLOREW L"explore" -#define CMDSTR_FINDW L"find" - -#ifdef UNICODE -#define CMDSTR_OPEN CMDSTR_OPENW -#define CMDSTR_EXPLORE CMDSTR_EXPLOREW -#define CMDSTR_FIND CMDSTR_FINDW -#else -#define CMDSTR_OPEN CMDSTR_OPENA -#define CMDSTR_EXPLORE CMDSTR_EXPLOREA -#define CMDSTR_FIND CMDSTR_FINDA -#endif - -#define CMDSTR_DEFAULT MAKEINTRESOURCE(0x00) - -#define CMDSTR_LINK MAKEINTRESOURCE(0x10) -#define CMDSTR_DELETE MAKEINTRESOURCE(0x11) -#define CMDSTR_RENAME MAKEINTRESOURCE(0x12) -#define CMDSTR_PROPERTIES MAKEINTRESOURCE(0x13) -#define CMDSTR_CUT MAKEINTRESOURCE(0x18) -#define CMDSTR_COPY MAKEINTRESOURCE(0x19) - -BOOL WINAPI WIN_SHInvokeCommand( - HWND hwndOwner, - DWORD dwFlags, - LPCTSTR lpPath, - LPCSTR lpVerb, - LPCSTR lpParameters, - LPCSTR lpDirectory, - int nShow - ); - -//-------------------------------------------------------------------------- - -BOOL WINAPI WIN_SHStrRetToMultiByte( - LPCITEMIDLIST pidl, - const STRRET * pStr, - LPSTR lpMultiByte, - int cchMultiByte - ); - -DWORD WIN_SHBuildCRC( LPVOID pBytes, ULONG nBytes ); - -DWORD WINAPI WIN_GetShellVersion(VOID); - -HIMAGELIST WINAPI WIN_SHGetSystemImageList( UINT uFlags ); - -//-------------------------------------------------------------------------- - -/* - -ULONG WINAPI WIN_CreateStringFromBinary ( - LPCVOID pv, - ULONG cbSize, - LPSTR pszString, - ULONG cbStringSize - ); - -ULONG WINAPI WIN_CreateBinaryFromString( - LPCSTR pszStr, - LPVOID pBuffer, - ULONG cbSize - ); -*/ - -//-------------------------------------------------------------------------- - -DWORD WINAPI WIN_SHSetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - DWORD dwType, - LPCVOID pvData, - DWORD cbData - ); - -DWORD WINAPI WIN_SHGetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - LPDWORD pdwType, - LPVOID pvData, - LPDWORD pcbData - ); - -DWORD WINAPI WIN_SHDeleteValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue - ); - -#ifdef __cplusplus -} -#endif - -#endif - -#endif // _SHUTIL_H_ - diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx deleted file mode 100644 index a8be1e7d1344..000000000000 --- a/tools/win/inc/winshell.hxx +++ /dev/null @@ -1,386 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _WINSHELL_HXX -#define _WINSHELL_HXX - -#if defined WNT - -#include -#include "shutil.h" -#include - -#include - -//---------------------------------------------------------------------------- -// CItemIDList -//---------------------------------------------------------------------------- - -class CItemIDList -{ -public: - CItemIDList(); - CItemIDList( const CItemIDList & ); - CItemIDList( LPCITEMIDLIST ); - CItemIDList( const String & ); - CItemIDList( int nFolder ); - ~CItemIDList(); - - CItemIDList & operator = ( const CItemIDList & ); - CItemIDList & operator += ( const CItemIDList & ); - CItemIDList operator + ( const CItemIDList & ) const; - - int operator == ( const CItemIDList & ) const; - int operator != ( const CItemIDList & rIDList ) const - { return ! operator == ( rIDList ); }; - - operator LPCITEMIDLIST() const - { return m_pidl; }; - - int GetTokenCount() const; - CItemIDList GetToken( int nIndex ) const; - CItemIDList GetParent( int nLevelFromBottom = 1) const; - CItemIDList GetChild( int nLevelFromBottom = 1 ) const; - void Split( CItemIDList & rParent, CItemIDList & rChild, int nLevelFromBottom = 1 ) const; - - CItemIDList operator []( int nIndex ) const - { return GetToken( nIndex ); }; - - String GetFilePath() const; - - BOOL IsValid() const - { return m_pidl != NULL && m_pidl->mkid.cb != sizeof(USHORT); } - - int GetRootID() const - { return m_nFolder; } - -protected: - ITEMIDLIST *m_pidl; - int m_nFolder; -}; - - -inline CItemIDList CItemIDList::operator + ( const CItemIDList & rIDList ) const -{ - CItemIDList aCopy( *this ); - aCopy += rIDList; - return aCopy; -} - -//---------------------------------------------------------------------------- -// Types for CShellFolder -//---------------------------------------------------------------------------- - -// Notification Events fuer CShellFolder - -enum NotificationEvent -{ - NotificationEvent_Error, - NotificationEvent_Signaled, - NotificationEvent_Canceled -}; - -// Volume information - -typedef struct _WIN32_VOLUME_DATA -{ - TCHAR cDeviceName[MAX_PATH]; - TCHAR cVolumeName[MAX_PATH]; - TCHAR cFileSystemName[MAX_PATH]; - DWORD dwSerialNumber; - DWORD dwFileSystemFlags; - DWORD nMaxComponentLength; -} WIN32_VOLUME_DATA; - -// Bekannte Class-IDs fuer wichtige Ordner - -// {871C5380-42A0-1069-A2EA-08002B30309D} Internet Explorer 4.0 -static const GUID CLSID_IE4 = -{ 0x871C5380, 0x42A0, 0x1069, { 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {208D2C60-3AEA-1069-A2D7-08002B30309D} Netzwerkumgebung -static const GUID CLSID_Network = -{ 0x208D2C60, 0x3AEA, 0x1069, { 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {645FF040-5081-101B-9F08-00AA002F954E} Papierkorb -static const GUID CLSID_RecycleBin = -{ 0x645FF040, 0x5081, 0x101B, { 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E } }; - -// {20D04FE0-3AEA-1069-A2D8-08002B30309D} Arbeitsplatz -static const GUID CLSID_MyComputer = -{ 0x20D04FE0, 0x3AEA, 0x1069, { 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {D6277990-4C6A-11CF-8D87-00AA0060F5BF} Geplante Vorgänge -static const GUID CLSID_Tasks = -{ 0xD6277990, 0x4C6A, 0x11CF, { 0x8D, 0x87, 0x00, 0xAA, 0x00, 0x60, 0xF5, 0xBF } }; - -// Fehlt im Header - -#define SHGDN_INCLUDE_NONFILESYS 0x2000 - -#define CSIDL_UNKNOWN -1 -#define CSIDL_ROOT -2 -#define CSIDL_SYSTEM -3 - -// Suchmaske fuer IEnumIDList - -#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN) - -// SHITEM Prefix Kinds - -#define SHGII_CONTAINER_MASK 0x70 - -#define SHGII_COMPUTER 0x20 - -#define SHGII_COMPUTER_REMOVABLE 0x22 -#define SHGII_COMPUTER_FIXED 0x23 -#define SHGII_COMPUTER_REMOTE 0x24 -#define SHGII_COMPUTER_CDROM 0x25 -#define SHGII_COMPUTER_RAMDISK 0x26 -#define SHGII_COMPUTER_FLOPPY525 0x28 -#define SHGII_COMPUTER_FLOPPY35 0x29 -#define SHGII_COMPUTER_NETWORK 0x2A -#define SHGII_COMPUTER_REGITEM 0x2E - -#define SHGII_ROOT 0x10 -#define SHGII_ROOT_REGITEM 0x1F - -#define SHGII_NETWORK 0x40 -#define SHGII_NETWORK_TREE 0x47 -#define SHGII_NETWORK_SERVER 0x42 -#define SHGII_NETWORK_DIRECTORY 0x43 -#define SHGII_NETWORK_PRINTER 0x41 - -#define SHGII_FILESYSTEM 0x30 -#define SHGII_FILESYSTEM_FILE 0x31 -#define SHGII_FILESYSTEM_DIRECTORY 0x32 - -#define SHGII_ANCESTOR 0x80 - -#define SHITEMCONTAINER( pidl ) ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK) -#define SHITEMKIND( pidl ) ((pidl)->mkid.abID[0] & 0x7F) - -//---------------------------------------------------------------------------- -// CShellFolderData -//---------------------------------------------------------------------------- - -class CShellFolderData -{ -protected: - CShellFolderData(); - virtual ~CShellFolderData(); - - IShellFolder *m_pShellFolder; - IEnumIDList *m_pEnumIDList; - IShellIcon *m_pShellIcon; - BOOL m_bIsOpen; - HANDLE m_hCancelEvent; - DWORD m_dwContentFlags; -}; - -//---------------------------------------------------------------------------- -// CShellFolder -//---------------------------------------------------------------------------- - -// Ganz "normaler" Ordner basierend auf dem IShellFolder Interface - -class CShellFolder : public CShellFolderData -{ -public: - CShellFolder( const CItemIDList & ); - CShellFolder( const CShellFolder & ); - CShellFolder( IShellFolder * ); - - // Retrieval of Item IDs - - virtual BOOL Reset(); - - BOOL GetNextValidID( CItemIDList & ); - - virtual BOOL GetNextID( CItemIDList & ); - virtual BOOL ValidateID( const CItemIDList & ); - - // Getting information about Items - - virtual BOOL GetAttributesOf( const CItemIDList &, LPDWORD pdwInOut ); - virtual BOOL GetNameOf( const CItemIDList &, String & ); - - virtual BOOL GetFileInfo( const CItemIDList &, WIN32_FIND_DATA * ); - virtual BOOL GetVolumeInfo( const CItemIDList & rIDList, WIN32_VOLUME_DATA * ); - - // Modifying the folder contents - - virtual BOOL SetNameOf( const CItemIDList &, const String &, CItemIDList & ); - virtual BOOL DeleteItem( const CItemIDList & ); - - // Comparison of IDs - - virtual int CompareIDs( const CItemIDList &, const CItemIDList & ); - - // UI Components - - virtual IContextMenu *GetContextMenu( int nItems, const CItemIDList * ); - virtual String GetIconLocation( const CItemIDList & ); - - // Notifications - - virtual NotificationEvent WaitForChanges(); - virtual void CancelWaitNotifications(); - -protected: - CShellFolder() : CShellFolderData() {}; - - void Initialize( IShellFolder *pShellFolder ); - void Initialize( LPCITEMIDLIST ); -}; - -//---------------------------------------------------------------------------- -// CFileSystemFolder -//---------------------------------------------------------------------------- - -// Reiner !!! Filesystem-Ordner. Benutzt optimierten Notification Mechanismus - -class CFileSystemFolder : public CShellFolder -{ -public: - CFileSystemFolder( LPCSTR pszPath ); - - virtual NotificationEvent WaitForChanges(); - -protected: - CFileSystemFolder() : CShellFolder() {}; - - void Initialize( LPCTSTR pszPath ); - - TCHAR m_szPath[MAX_PATH]; -}; - -//---------------------------------------------------------------------------- -// CSpecialFolder -//---------------------------------------------------------------------------- - -// Wie SHellFolder, aber andere Konstruktion ueber definierte Junktion-Points - -class CSpecialFolder : public CShellFolder -{ -public: - CSpecialFolder( int nFolder ); - -protected: - CSpecialFolder() : CShellFolder() {}; - - void Initialize( int nFolder ); - - int m_nFolder; -}; - -//---------------------------------------------------------------------------- -// CMyComputerFolder -//---------------------------------------------------------------------------- - -// Der MS-Windows "Arbeitsplatz" - -class CMyComputerFolder : public CSpecialFolder -{ -public: - CMyComputerFolder() : CSpecialFolder( CSIDL_DRIVES ) {}; -}; - -//---------------------------------------------------------------------------- -// CVolumesFolder -//---------------------------------------------------------------------------- - -// Wie CMyComputersFolder, enthält aber nur die Laufwerke - -class CVolumesFolder : public CMyComputerFolder -{ -public: - CVolumesFolder() : CMyComputerFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CWorkplaceFolder -//---------------------------------------------------------------------------- - -// Wie CMyComputersFolder, enthält aber keine!!! Laufwerke - -class CWorkplaceFolder : public CMyComputerFolder -{ - CWorkplaceFolder() : CMyComputerFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CDesktopFolder -//---------------------------------------------------------------------------- - -// Der MS-Windows Desktop - -class CDesktopFolder : public CSpecialFolder -{ -public: - CDesktopFolder() : CSpecialFolder( CSIDL_DESKTOP ) {}; -}; - -//---------------------------------------------------------------------------- -// CDesktopAncestorsFolder -//---------------------------------------------------------------------------- - -// Wie CDesktopFolder, enthält aber nur Arbeitsplatz und Netzwerk - -class CDesktopAncestorsFolder : public CDesktopFolder -{ -public: - CDesktopAncestorsFolder() : CDesktopFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CDesktopContentsFolder -//---------------------------------------------------------------------------- - -// Wie CDesktopFolder, aber ohne!!! Arbeitsplatz und Netzwerk - -class CDesktopContentsFolder : public CDesktopFolder -{ -public: - CDesktopContentsFolder() : CDesktopFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -#endif - -#endif // _WINSHELL_HXX diff --git a/tools/win/source/fastfsys/makefile.mk b/tools/win/source/fastfsys/makefile.mk deleted file mode 100644 index 12df85d6a2f3..000000000000 --- a/tools/win/source/fastfsys/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..\..\.. - -PRJNAME=TOOLS -TARGET=fastfsys - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- WNT ---------------------------------------------------------- - -.IF "$(GUI)" == "WNT" - -# --- Files -------------------------------------------------------- - - -OBJFILES= $(OBJ)$/shutil.obj \ - $(OBJ)$/shidl.obj \ - $(OBJ)$/shmalloc.obj \ - $(OBJ)$/fffolder.obj \ - $(OBJ)$/ffmenu.obj \ - $(OBJ)$/ffitem.obj \ - $(OBJ)$/fflink.obj \ - $(OBJ)$/ffparser.obj \ - $(OBJ)$/wincidl.obj \ - $(OBJ)$/wincshf.obj - - -SLOFILES= $(SLO)$/shutil.obj \ - $(SLO)$/shidl.obj \ - $(SLO)$/shmalloc.obj \ - $(SLO)$/fffolder.obj \ - $(SLO)$/ffmenu.obj \ - $(SLO)$/ffitem.obj \ - $(SLO)$/fflink.obj \ - $(SLO)$/ffparser.obj \ - $(SLO)$/wincidl.obj \ - $(SLO)$/wincshf.obj - -# --- Targets ------------------------------------------------------ - -.ENDIF - -.INCLUDE : target.mk -- cgit From 3eda2cfb75c8bc483d8377a1fac24974b1864440 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 6 May 2010 15:13:08 +0200 Subject: CWS gnumake2: don't create static libs in tools --- tools/bootstrp/addexes2/makefile.mk | 2 +- tools/bootstrp/command.cxx | 690 ----------------- tools/bootstrp/makefile.mk | 18 +- tools/bootstrp/prj.cxx | 1438 +---------------------------------- tools/bootstrp/sstring.cxx | 317 -------- tools/inc/bootstrp/command.hxx | 165 ---- tools/inc/bootstrp/listmacr.hxx | 60 -- tools/inc/bootstrp/mkcreate.hxx | 4 +- tools/inc/bootstrp/prj.hxx | 273 ------- tools/inc/bootstrp/sstring.hxx | 105 --- tools/prj/d.lst | 17 +- tools/util/makefile.mk | 39 +- 12 files changed, 31 insertions(+), 3097 deletions(-) delete mode 100644 tools/bootstrp/command.cxx delete mode 100644 tools/bootstrp/sstring.cxx delete mode 100644 tools/inc/bootstrp/command.hxx delete mode 100644 tools/inc/bootstrp/listmacr.hxx delete mode 100644 tools/inc/bootstrp/sstring.hxx (limited to 'tools') diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk index 492d6f3105ed..7e4d3d0da7fa 100644 --- a/tools/bootstrp/addexes2/makefile.mk +++ b/tools/bootstrp/addexes2/makefile.mk @@ -47,7 +47,7 @@ APP1STDLIBS+=-lpthread APP1STDLIBS+=-lpthread .ENDIF APP1LIBS= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib -APP1DEPN= $(LB)$/atools.lib $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib +APP1DEPN= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib DEPOBJFILES = $(APP1OBJS) diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx deleted file mode 100644 index 605965339b0e..000000000000 --- a/tools/bootstrp/command.cxx +++ /dev/null @@ -1,690 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_tools.hxx" - -#ifdef SCO -#define _IOSTREAM_H -#endif - -#ifdef PRECOMPILED -#include "first.hxx" -#endif - -#include -#include -#include "bootstrp/command.hxx" -#include -#include "bootstrp/appdef.hxx" - -#ifdef _MSC_VER -#pragma warning (push,1) -#endif - -#include -#include -#include -#include -#include -#include - -#ifdef _MSC_VER -#pragma warning (pop) -#endif - -//#define MH_TEST2 1 // fuers direkte Testen - -#if defined(WNT) || defined(OS2) -#ifdef _MSC_VER -#pragma warning (push,1) -#endif -#include // for _SPAWN -#ifdef _MSC_VER -#pragma warning (pop) -#endif -#endif -#ifdef UNX -#include -#include -#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \ - || defined (HPUX) || defined (MACOSX) -#include -#else -#include -#endif -#define P_WAIT 1 // erstmal einen dummz -#endif - -#if defined WNT -#include -#endif - -#if defined(WNT) || defined(OS2) -#define cPathSeperator ';' -#endif -#ifdef UNX -#define cPathSeperator ':' -#endif - -/*****************************************************************************/ -CommandLine::CommandLine(BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - CommandBuffer[0] = '\0'; - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); -} - -/*****************************************************************************/ -CommandLine::CommandLine(const char *CommandString, BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); - - BuildCommand(CommandString); -} - -/*****************************************************************************/ -CommandLine::CommandLine(const CommandLine& CCommandLine, BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); - - BuildCommand(CCommandLine.CommandBuffer); -} - -/*****************************************************************************/ -CommandLine::~CommandLine() -/*****************************************************************************/ -{ - delete [] CommandBuffer; - delete [] ComShell; - //for (int i = 0; ppArgv[i] != '\0'; i++) { - for (int i = 0; ppArgv[i] != 0; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - -} - -/*****************************************************************************/ -CommandLine& CommandLine::operator=(const CommandLine& CCommandLine) -/*****************************************************************************/ -{ - strcpy (CommandBuffer, CCommandLine.CommandBuffer); - for (int i = 0; i != nArgc; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - BuildCommand(CommandBuffer); - return *this; -} - -/*****************************************************************************/ -CommandLine& CommandLine::operator=(const char *CommandString) -/*****************************************************************************/ -{ - strcpy (CommandBuffer, CommandString); - for (int i = 0; i != nArgc; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - BuildCommand(CommandBuffer); - - return *this; -} - -/*****************************************************************************/ -void CommandLine::Print() -/*****************************************************************************/ -{ - //cout << "******* start print *******" << endl; - //cout << "nArgc = " << nArgc << endl; - //cout << "CommandBuffer = " << CommandBuffer << endl; - for (int i = 0; ppArgv[i] != NULL; i++) { - //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl; - } - //cout << "******** end print ********" << endl; -} - -/*****************************************************************************/ -void CommandLine::BuildCommand(const char *CommandString) -/*****************************************************************************/ -{ - int index = 0, pos=0; - char buffer[1024]; - char WorkString[1024]; - - strcpy(WorkString,CommandString); - - //falls LogWindow -> in tmpfile schreiben - if(bTmpWrite) - { - strcpy(&WorkString[strlen(WorkString)]," >&"); - strcpy(&WorkString[strlen(WorkString)],getenv("TMP")); - strcpy(&WorkString[strlen(WorkString)],TMPNAME); - } - - // delete old memory and get some new memory for CommandBuffer - - delete [] CommandBuffer; - CommandBuffer = new char [strlen(ComShell)+strlen(WorkString)+1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - strcpy (CommandBuffer, ComShell); - strcpy (&CommandBuffer[strlen(ComShell)], WorkString); - - CommandString = CommandBuffer; - - // get the number of tokens - Strtokens(CommandString); - - // delete the space for the old CommandLine - - for (int i = 0; ppArgv[i] != 0; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - - /* get space for the new command line */ - - ppArgv = (char **) new char * [nArgc+1]; - if (ppArgv == NULL) { - //cout << "Error: no space" << endl; - exit(0); - } - - // flush the white space - - while ( isspace(*CommandString) ) - CommandString++; - - index = 0; - - // start the loop to build all the individual tokens - - while (*CommandString != '\0') { - - pos = 0; - - // copy the token until white space is found - - while ( !isspace(*CommandString) && *CommandString != '\0') { - - buffer[pos++] = *CommandString++; - - } - - buffer[pos] = '\0'; - - // get space for the individual tokens - - ppArgv[index] = (char *) new char [strlen(buffer)+1]; - if (ppArgv[index] == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - - // copy the token - - strcpy (ppArgv[index++], buffer); - - // flush while space - - while ( isspace(*CommandString) ) - CommandString++; - - } - - // finish by setting the las pointer to NULL - ppArgv[nArgc]= NULL; - -} - -/*****************************************************************************/ -void CommandLine::Strtokens(const char *CommandString) -/*****************************************************************************/ -{ - int count = 0; - const char *temp; - - temp = CommandString; - - /* bypass white space */ - - while (isspace(*temp)) temp++; - - for (count=0; *temp != '\0'; count++) { - - /* continue until white space of string terminator is found */ - - while ((!isspace(*temp)) && (*temp != '\0')) temp++; - - /* bypass white space */ - - while (isspace(*temp)) temp++; - - } - nArgc = count; -} - -/*****************************************************************************/ -CCommand::CCommand( ByteString &rString ) -/*****************************************************************************/ -{ - rString.SearchAndReplace( '\t', ' ' ); - aCommand = rString.GetToken( 0, ' ' ); - aCommandLine = Search(); -#ifndef UNX - aCommandLine += " /c "; -#else - aCommandLine += " -c "; -#endif - - ByteString sCmd( rString.GetToken( 0, ' ' )); - ByteString sParam( rString.Copy( sCmd.Len())); - - aCommandLine += Search( thePath, sCmd ); - aCommandLine += sParam; - - ImplInit(); -} - -/*****************************************************************************/ -CCommand::CCommand( const char *pChar ) -/*****************************************************************************/ -{ - ByteString aString = pChar; - aString.SearchAndReplace( '\t', ' ' ); - aCommand = aString.GetToken( 0, ' ' ); - - aCommandLine = Search(); -#ifndef UNX - aCommandLine += " /c "; -#else - aCommandLine += " -c "; -#endif - ByteString rString( pChar ); - - ByteString sCmd( rString.GetToken( 0, ' ' )); - ByteString sParam( rString.Copy( sCmd.Len())); - - aCommandLine += Search( thePath, sCmd ); - aCommandLine += sParam; - - ImplInit(); -} - -/*****************************************************************************/ -void CCommand::ImplInit() -/*****************************************************************************/ -{ - char pTmpStr[255]; - size_t *pPtr; - char *pChar; - int nVoid = sizeof( size_t * ); - nArgc = aCommandLine.GetTokenCount(' '); - ULONG nLen = aCommandLine.Len(); - - ppArgv = (char **) new char[ (ULONG)(nLen + nVoid * (nArgc +2) + nArgc ) ]; - pChar = (char *) ppArgv + ( (1+nArgc) * nVoid ); - pPtr = (size_t *) ppArgv; - for ( xub_StrLen i=0; i #include -#include "bootstrp/sstring.hxx" +//#include "bootstrp/sstring.hxx" #include #include @@ -37,6 +37,8 @@ #include "bootstrp/prj.hxx" #include "bootstrp/inimgr.hxx" +DECLARE_LIST( UniStringList, UniString* ) + //#define TEST 1 #if defined(WNT) || defined(OS2) @@ -47,7 +49,7 @@ #define PATH_DELIMETER '/' #endif -Link Star::aDBNotFoundHdl; +//Link Star::aDBNotFoundHdl; // // class SimpleConfig @@ -166,1435 +168,3 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) return aTmpStr; } - - -// -// class CommandData -// - -/*****************************************************************************/ -CommandData::CommandData() -/*****************************************************************************/ -{ - nOSType = 0; - nCommand = 0; - pDepList = 0; -} - -/*****************************************************************************/ -CommandData::~CommandData() -/*****************************************************************************/ -{ - if ( pDepList ) - { - ByteString *pString = pDepList->First(); - while ( pString ) - { - delete pString; - pString = pDepList->Next(); - } - delete pDepList; - - pDepList = NULL; - } -} - -/*****************************************************************************/ -ByteString CommandData::GetOSTypeString() -/*****************************************************************************/ -{ - ByteString aRetStr; - - switch (nOSType) - { - case OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX : - aRetStr = "all"; - break; - case OS_WIN32 | OS_WIN16 : - aRetStr = "w"; - break; - case OS_OS2 : - aRetStr = "p"; - break; - case OS_UNX : - aRetStr = "u"; - break; - case OS_WIN16 : - aRetStr = "d"; - break; - case OS_WIN32 : - aRetStr = "n"; - break; - default : - aRetStr = "none"; - } - - return aRetStr; -} - -/*****************************************************************************/ -ByteString CommandData::GetCommandTypeString() -/*****************************************************************************/ -{ - ByteString aRetStr; - - switch (nCommand) - { - case COMMAND_NMAKE : - aRetStr = "nmake"; - break; - case COMMAND_GET : - aRetStr = "get"; - break; - default : - aRetStr = "usr"; - aRetStr += ByteString::CreateFromInt64( nCommand + 1 - COMMAND_USER_START ); - - } - - return aRetStr; -} - -/*****************************************************************************/ -CommandData* Prj::GetDirectoryList ( USHORT, USHORT ) -/*****************************************************************************/ -{ - return (CommandData *)NULL; -} - -/*****************************************************************************/ -CommandData* Prj::GetDirectoryData( ByteString aLogFileName ) -/*****************************************************************************/ -{ - CommandData *pData = NULL; - ULONG nObjCount = Count(); - for ( ULONG i=0; iGetLogFile() == aLogFileName ) - return pData; - } - return NULL; -} - -// -// class Prj -// - -/*****************************************************************************/ -Prj::Prj() : - bVisited( FALSE ), - pPrjInitialDepList(0), - pPrjDepList(0), - bHardDependencies( FALSE ), - bSorted( FALSE ) -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -Prj::Prj( ByteString aName ) : - bVisited( FALSE ), - aProjectName( aName ), - pPrjInitialDepList(0), - pPrjDepList(0), - bHardDependencies( FALSE ), - bSorted( FALSE ) -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -Prj::~Prj() -/*****************************************************************************/ -{ - if ( pPrjDepList ) - { - ByteString *pString = pPrjDepList->First(); - while ( pString ) - { - delete pString; - pString = pPrjDepList->Next(); - } - delete pPrjDepList; - - pPrjDepList = NULL; - } - - if ( pPrjInitialDepList ) - { - ByteString *pString = pPrjInitialDepList->First(); - while ( pString ) - { - delete pString; - pString = pPrjInitialDepList->Next(); - } - delete pPrjInitialDepList; - - pPrjInitialDepList = NULL; - } -} - -/*****************************************************************************/ -void Prj::AddDependencies( ByteString aStr ) -/*****************************************************************************/ -{ - - // needs dirty flag - not expanded - if ( !pPrjDepList ) - pPrjDepList = new SByteStringList; - - pPrjDepList->PutString( new ByteString(aStr) ); - - if ( !pPrjInitialDepList ) - pPrjInitialDepList = new SByteStringList; - - pPrjInitialDepList->PutString( new ByteString(aStr) ); -} - -/*****************************************************************************/ -SByteStringList* Prj::GetDependencies( BOOL bExpanded ) -/*****************************************************************************/ -{ - if ( bExpanded ) - return pPrjDepList; - else - return pPrjInitialDepList; -} - - - -/*****************************************************************************/ -BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ) -/*****************************************************************************/ -{ - CommandData* pData = new CommandData(); - - pData->SetPath( aDirName ); - pData->SetCommandType( aWhat ); - pData->SetOSType( aWhatOS ); - pData->SetLogFile( aLogFileName ); - pData->SetClientRestriction( rClientRestriction ); - - Insert( pData ); - - return FALSE; -} - -/*****************************************************************************/ -// -// removes directory and existing dependencies on it -// -CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) -/*****************************************************************************/ -{ - ULONG nCountMember = Count(); - CommandData* pData; - CommandData* pDataFound = NULL; - SByteStringList* pDataDeps; - - for ( USHORT i = 0; i < nCountMember; i++ ) - { - pData = GetObject( i ); - if ( pData->GetLogFile() == aLogFileName ) - pDataFound = pData; - else - { - pDataDeps = pData->GetDependencies(); - if ( pDataDeps ) - { - ByteString* pString; - ULONG nDataDepsCount = pDataDeps->Count(); - for ( ULONG j = nDataDepsCount; j > 0; j-- ) - { - pString = pDataDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == aLogFileName ) - pDataDeps->Remove( pString ); - } - } - } - } - - Remove( pDataFound ); - - return pDataFound; -} - -// -// class Star -// - -/*****************************************************************************/ -Star::Star() -/*****************************************************************************/ -{ - // this ctor is only used by StarWriter -} - -/*****************************************************************************/ -Star::Star(String aFileName, USHORT nMode ) -/*****************************************************************************/ - : nStarMode( nMode ) -{ - Read( aFileName ); -} - -/*****************************************************************************/ -Star::Star( SolarFileList *pSolarFiles ) -/*****************************************************************************/ - : nStarMode( STAR_MODE_MULTIPLE_PARSE ) -{ - // this ctor is used by StarBuilder to get the information for the whole workspace - Read( pSolarFiles ); -} - -/*****************************************************************************/ -Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bLocal, const char *pSourceRoot ) -/*****************************************************************************/ -{ - ByteString sPath( rVersion ); - String sSrcRoot; - if ( pSourceRoot ) - sSrcRoot = String::CreateFromAscii( pSourceRoot ); - -#ifdef UNX - sPath += "/settings/UNXSOLARLIST"; -#else - sPath += "/settings/SOLARLIST"; -#endif - GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE ); - - if( pInfo && pInfo->GetValue().Len()) { - ByteString sFile( pInfo->GetValue()); - if ( bLocal ) { - IniManager aIniManager; - aIniManager.ToLocal( sFile ); - } - String sFileName( sFile, RTL_TEXTENCODING_ASCII_US ); - nStarMode = STAR_MODE_SINGLE_PARSE; - Read( sFileName ); - } - else { - SolarFileList *pFileList = new SolarFileList(); - - sPath = rVersion; - sPath += "/drives"; - - GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE ); - if ( pInfo2 && pInfo2->GetSubList()) { - GenericInformationList *pDrives = pInfo2->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { - GenericInformation *pDrive = pDrives->GetObject( i ); - if ( pDrive ) { - DirEntry aEntry; - BOOL bOk = FALSE; - if ( sSrcRoot.Len()) { - aEntry = DirEntry( sSrcRoot ); - bOk = TRUE; - } - else { -#ifdef UNX - sPath = "UnixVolume"; - GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath ); - if ( pUnixVolume ) { - String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); - aEntry = DirEntry( sRoot ); - bOk = TRUE; - } -#else - bOk = TRUE; - String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); - sRoot += String::CreateFromAscii( "\\" ); - aEntry = DirEntry( sRoot ); -#endif - } - if ( bOk ) { - sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); - if ( pProjectsKey ) { - if ( !sSrcRoot.Len()) { - sPath = rVersion; - sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); - if( pPath ) { - ByteString sAddPath( pPath->GetValue()); -#ifdef UNX - sAddPath.SearchAndReplaceAll( "\\", "/" ); -#else - sAddPath.SearchAndReplaceAll( "/", "\\" ); -#endif - String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US ); - aEntry += DirEntry( ssAddPath ); - } - } - GenericInformationList *pProjects = pProjectsKey->GetSubList(); - if ( pProjects ) { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - for ( ULONG j = 0; j < pProjects->Count(); j++ ) { - ByteString sProject( *pProjects->GetObject( j )); - String ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - - DirEntry aPrjEntry( aEntry ); - - aPrjEntry += DirEntry( ssProject ); - aPrjEntry += DirEntry( sPrjDir ); - aPrjEntry += DirEntry( sSolarFile ); - - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); - - ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - } - } - } - } - } - } - } - Read( pFileList ); - } -} - -/*****************************************************************************/ -Star::~Star() -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -BOOL Star::NeedsUpdate() -/*****************************************************************************/ -{ - aMutex.acquire(); - for ( ULONG i = 0; i < aLoadedFilesList.Count(); i++ ) - if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) { - aMutex.release(); - return TRUE; - } - - aMutex.release(); - return FALSE; -} - -/*****************************************************************************/ -void Star::Read( String &rFileName ) -/*****************************************************************************/ -{ - ByteString aString; - aFileList.Insert( new String( rFileName )); - - DirEntry aEntry( rFileName ); - aEntry.ToAbs(); - aEntry = aEntry.GetPath().GetPath().GetPath(); - sSourceRoot = aEntry.GetFull(); - - while( aFileList.Count()) { - StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetNext()) != "" ) - InsertToken (( char * ) aString.GetBuffer()); - } - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - aFileList.Remove(( ULONG ) 0 ); - } - // resolve all dependencies recursive - Expand_Impl(); -} - -/*****************************************************************************/ -void Star::Read( SolarFileList *pSolarFiles ) -/*****************************************************************************/ -{ - while( pSolarFiles->Count()) { - ByteString aString; - - StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetNext()) != "" ) - InsertToken (( char * ) aString.GetBuffer()); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); - } - delete pSolarFiles; - - Expand_Impl(); -} - -/*****************************************************************************/ -String Star::CreateFileName( String sProject ) -/*****************************************************************************/ -{ - // this method is used to find solarlist parts of nabours (other projects) - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - DirEntry aEntry( sSourceRoot ); - aEntry += DirEntry( sProject ); - aEntry += DirEntry( sPrjDir ); - aEntry += DirEntry( sSolarFile ); - - if ( !aEntry.Exists() && aDBNotFoundHdl.IsSet()) - aDBNotFoundHdl.Call( &sProject ); - - return aEntry.GetFull(); -} - -/*****************************************************************************/ -void Star::InsertSolarList( String sProject ) -/*****************************************************************************/ -{ - // inserts a new solarlist part of another project - String sFileName( CreateFileName( sProject )); - - for ( ULONG i = 0; i < aFileList.Count(); i++ ) { - if (( *aFileList.GetObject( i )) == sFileName ) - return; - } - - ByteString ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - if ( HasProject( ssProject )) - return; - - aFileList.Insert( new String( sFileName ), LIST_APPEND ); -} - -/*****************************************************************************/ -void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ) -/*****************************************************************************/ -{ - if ( pDepPrj->bVisited ) - return; - - pDepPrj->bVisited = TRUE; - - SByteStringList* pPrjLst = pPrj->GetDependencies(); - SByteStringList* pDepLst = NULL; - ByteString* pDepend; - ByteString* pPutStr; - Prj *pNextPrj = NULL; - ULONG i, nRetPos; - - if ( pPrjLst ) { - pDepLst = pDepPrj->GetDependencies(); - if ( pDepLst ) { - for ( i = 0; i < pDepLst->Count(); i++ ) { - pDepend = pDepLst->GetObject( i ); - pPutStr = new ByteString( *pDepend ); - nRetPos = pPrjLst->PutString( pPutStr ); - if( nRetPos == NOT_THERE ) - delete pPutStr; - pNextPrj = GetPrj( *pDepend ); - if ( pNextPrj ) { - ExpandPrj_Impl( pPrj, pNextPrj ); - } - } - } - } -} - -/*****************************************************************************/ -void Star::Expand_Impl() -/*****************************************************************************/ -{ - for ( ULONG i = 0; i < Count(); i++ ) { - for ( ULONG j = 0; j < Count(); j++ ) - GetObject( j )->bVisited = FALSE; - - Prj* pPrj = GetObject( i ); - ExpandPrj_Impl( pPrj, pPrj ); - } -} - -/*****************************************************************************/ -void Star::InsertToken ( char *yytext ) -/*****************************************************************************/ -{ - static int i = 0; - static ByteString aDirName, aWhat, aWhatOS, - sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; - static BOOL bPrjDep = FALSE; - static BOOL bHardDep = FALSE; - static USHORT nCommandType, nOSType; - CommandData* pCmdData; - static SByteStringList *pStaticDepList; - Prj* pPrj; - - switch (i) - { - case 0: - aPrefix = yytext; - pStaticDepList = 0; - break; - case 1: - aDirName = yytext; - break; - case 2: - if ( !strcmp( yytext, ":" )) - { - bPrjDep = TRUE; - bHardDep = FALSE; - i = 9; - } - else if ( !strcmp( yytext, "::" )) - { - bPrjDep = TRUE; - bHardDep = TRUE; - i = 9; - } - else - { - bPrjDep = FALSE; - bHardDep = FALSE; - - aWhat = yytext; - if ( aWhat == "nmake" ) - nCommandType = COMMAND_NMAKE; - else if ( aWhat == "get" ) - nCommandType = COMMAND_GET; - else { - ULONG nOffset = aWhat.Copy( 3 ).ToInt32(); - nCommandType = sal::static_int_cast< USHORT >( - COMMAND_USER_START + nOffset - 1); - } - } - break; - case 3: - if ( !bPrjDep ) - { - aWhat = yytext; - if ( aWhat == "-" ) - { - aCommandPara = ByteString(); - } - else - aCommandPara = aWhat; - } - break; - case 4: - if ( !bPrjDep ) - { - aWhatOS = yytext; - if ( aWhatOS.GetTokenCount( ',' ) > 1 ) { - sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 ); - aWhatOS = aWhatOS.GetToken( 0, ',' ); - } - if ( aWhatOS == "all" ) - nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ); - else if ( aWhatOS == "w" ) - nOSType = ( OS_WIN16 | OS_WIN32 ); - else if ( aWhatOS == "p" ) - nOSType = OS_OS2; - else if ( aWhatOS == "u" ) - nOSType = OS_UNX; - else if ( aWhatOS == "d" ) - nOSType = OS_WIN16; - else if ( aWhatOS == "n" ) - nOSType = OS_WIN32; - else - nOSType = OS_NONE; - } - break; - case 5: - if ( !bPrjDep ) - { - aLogFileName = yytext; - } - break; - default: - if ( !bPrjDep ) - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - } - else - { - // ggfs. Dependency liste anlegen und ergaenzen - if ( !pStaticDepList ) - pStaticDepList = new SByteStringList; - pStaticDepList->PutString( new ByteString( aItem )); - } - } - else - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - bPrjDep= FALSE; - } - else - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - pPrj->AddDependencies( aItem ); - pPrj->HasHardDependencies( bHardDep ); - - if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) { - String sItem( aItem, RTL_TEXTENCODING_ASCII_US ); - InsertSolarList( sItem ); - } - } - } - break; - } - /* Wenn dieses Project noch nicht vertreten ist, in die Liste - der Solar-Projekte einfuegen */ - if ( i == -1 ) - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - - pCmdData = new CommandData; - pCmdData->SetPath( aDirName ); - pCmdData->SetCommandType( nCommandType ); - pCmdData->SetCommandPara( aCommandPara ); - pCmdData->SetOSType( nOSType ); - pCmdData->SetLogFile( aLogFileName ); - pCmdData->SetClientRestriction( sClientRestriction ); - if ( pStaticDepList ) - pCmdData->SetDependencies( pStaticDepList ); - - pStaticDepList = 0; - pPrj->Insert ( pCmdData, LIST_APPEND ); - aDirName =""; - aWhat =""; - aWhatOS = ""; - sClientRestriction = ""; - aLogFileName = ""; - nCommandType = 0; - nOSType = 0; - } - i++; - - // und wer raeumt die depLst wieder ab ? -} - -/*****************************************************************************/ -BOOL Star::HasProject ( ByteString aProjectName ) -/*****************************************************************************/ -{ - Prj *pPrj; - int nCountMember; - - nCountMember = Count(); - - for ( int i=0; iGetProjectName().EqualsIgnoreCaseAscii(aProjectName) ) - return TRUE; - } - return FALSE; -} - -/*****************************************************************************/ -Prj* Star::GetPrj ( ByteString aProjectName ) -/*****************************************************************************/ -{ - Prj* pPrj; - int nCountMember = Count(); - for ( int i=0;iGetProjectName().EqualsIgnoreCaseAscii(aProjectName) ) - return pPrj; - } -// return (Prj*)NULL; - return 0L ; -} - -/*****************************************************************************/ -ByteString Star::GetPrjName( DirEntry &aPath ) -/*****************************************************************************/ -{ - ByteString aRetPrj, aDirName; - ByteString aFullPathName = ByteString( aPath.GetFull(), gsl_getSystemTextEncoding()); - - xub_StrLen nToken = aFullPathName.GetTokenCount(PATH_DELIMETER); - for ( xub_StrLen i=0; i< nToken; i++ ) - { - aDirName = aFullPathName.GetToken( i, PATH_DELIMETER ); - if ( HasProject( aDirName )) - { - aRetPrj = aDirName; - break; - } - } - - return aRetPrj; -} - - -// -// class StarWriter -// - -/*****************************************************************************/ -StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode ) -/*****************************************************************************/ -{ - Read ( aFileName, bReadComments, nMode ); -} - -/*****************************************************************************/ -StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) -/*****************************************************************************/ -{ - Read( pSolarFiles, bReadComments ); -} - -/*****************************************************************************/ -StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bLocal, const char *pSourceRoot ) -/*****************************************************************************/ -{ - ByteString sPath( rVersion ); - String sSrcRoot; - if ( pSourceRoot ) - sSrcRoot = String::CreateFromAscii( pSourceRoot ); - -#ifdef UNX - sPath += "/settings/UNXSOLARLIST"; -#else - sPath += "/settings/SOLARLIST"; -#endif - GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE ); - - if( pInfo && pInfo->GetValue().Len()) { - ByteString sFile( pInfo->GetValue()); - if ( bLocal ) { - IniManager aIniManager; - aIniManager.ToLocal( sFile ); - } - String sFileName( sFile, RTL_TEXTENCODING_ASCII_US ); - nStarMode = STAR_MODE_SINGLE_PARSE; - Read( sFileName ); - } - else { - SolarFileList *pFileList = new SolarFileList(); - - sPath = rVersion; - sPath += "/drives"; - - GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE ); - if ( pInfo2 && pInfo2->GetSubList()) { - GenericInformationList *pDrives = pInfo2->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { - GenericInformation *pDrive = pDrives->GetObject( i ); - if ( pDrive ) { - DirEntry aEntry; - BOOL bOk = FALSE; - if ( sSrcRoot.Len()) { - aEntry = DirEntry( sSrcRoot ); - bOk = TRUE; - } - else { -#ifdef UNX - sPath = "UnixVolume"; - GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath ); - if ( pUnixVolume ) { - String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); - aEntry = DirEntry( sRoot ); - bOk = TRUE; - } -#else - bOk = TRUE; - String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); - sRoot += String::CreateFromAscii( "\\" ); - aEntry = DirEntry( sRoot ); -#endif - } - if ( bOk ) { - sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); - if ( pProjectsKey ) { - if ( !sSrcRoot.Len()) { - sPath = rVersion; - sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); - if( pPath ) { - ByteString sAddPath( pPath->GetValue()); -#ifdef UNX - sAddPath.SearchAndReplaceAll( "\\", "/" ); -#else - sAddPath.SearchAndReplaceAll( "/", "\\" ); -#endif - String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US ); - aEntry += DirEntry( ssAddPath ); - } - } - GenericInformationList *pProjects = pProjectsKey->GetSubList(); - if ( pProjects ) { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - for ( ULONG j = 0; j < pProjects->Count(); j++ ) { - ByteString sProject( *pProjects->GetObject( j )); - String ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - - DirEntry aPrjEntry( aEntry ); - - aPrjEntry += DirEntry( ssProject ); - aPrjEntry += DirEntry( sPrjDir ); - aPrjEntry += DirEntry( sSolarFile ); - - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); - - ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - fprintf( stdout, "%s\n", sFile.GetBuffer()); - } - } - } - } - } - } - } - Read( pFileList ); - } -} - -/*****************************************************************************/ -void StarWriter::CleanUp() -/*****************************************************************************/ -{ - Expand_Impl(); -} - -/*****************************************************************************/ -USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode ) -/*****************************************************************************/ -{ - nStarMode = nMode; - - ByteString aString; - aFileList.Insert( new String( aFileName )); - - DirEntry aEntry( aFileName ); - aEntry.ToAbs(); - aEntry = aEntry.GetPath().GetPath().GetPath(); - sSourceRoot = aEntry.GetFull(); - - while( aFileList.Count()) { - - StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" ) - InsertTokenLine ( aString ); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete aFileList.Remove(( ULONG ) 0 ); - } - // resolve all dependencies recursive - Expand_Impl(); - - // Die gefundenen Abhaengigkeiten rekursiv aufloesen - Expand_Impl(); - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) -/*****************************************************************************/ -{ - nStarMode = STAR_MODE_MULTIPLE_PARSE; - - // this ctor is used by StarBuilder to get the information for the whole workspace - while( pSolarFiles->Count()) { - ByteString aString; - - StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" ) - InsertTokenLine ( aString ); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); - } - delete pSolarFiles; - - Expand_Impl(); - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) -/*****************************************************************************/ -{ - ByteString aDataString; - ByteString aTab('\t'); - ByteString aSpace(' '); - ByteString aEmptyString(""); - SByteStringList* pCmdDepList; - - CommandData* pCmdData = NULL; - if ( pPrj->Count() > 0 ) - { - pCmdData = pPrj->First(); - SByteStringList* pPrjDepList = pPrj->GetDependencies( FALSE ); - if ( pPrjDepList != 0 ) - { - aDataString = pPrj->GetPreFix(); - aDataString += aTab; - aDataString += pPrj->GetProjectName(); - aDataString += aTab; - if ( pPrj->HasHardDependencies()) - aDataString+= ByteString("::"); - else - aDataString+= ByteString(":"); - aDataString += aTab; - for ( USHORT i = 0; i< pPrjDepList->Count(); i++ ) { - aDataString += *pPrjDepList->GetObject( i ); - aDataString += aSpace; - } - aDataString+= "NULL"; - - rStream.WriteLine( aDataString ); - - pCmdData = pPrj->Next(); - } - if ( pCmdData ) { - do - { - if (( aDataString = pCmdData->GetComment()) == aEmptyString ) - { - aDataString = pPrj->GetPreFix(); - aDataString += aTab; - - aDataString+= pCmdData->GetPath(); - aDataString += aTab; - USHORT nPathLen = pCmdData->GetPath().Len(); - if ( nPathLen < 40 ) - for ( int i = 0; i < 9 - pCmdData->GetPath().Len() / 4 ; i++ ) - aDataString += aTab; - else - for ( int i = 0; i < 12 - pCmdData->GetPath().Len() / 4 ; i++ ) - aDataString += aTab; - aDataString += pCmdData->GetCommandTypeString(); - aDataString += aTab; - if ( pCmdData->GetCommandType() == COMMAND_GET ) - aDataString += aTab; - if ( pCmdData->GetCommandPara() == aEmptyString ) - aDataString+= ByteString("-"); - else - aDataString+= pCmdData->GetCommandPara(); - aDataString += aTab; - aDataString+= pCmdData->GetOSTypeString(); - if ( pCmdData->GetClientRestriction().Len()) { - aDataString += ByteString( "," ); - aDataString += pCmdData->GetClientRestriction(); - } - aDataString += aTab; - aDataString += pCmdData->GetLogFile(); - aDataString += aSpace; - - pCmdDepList = pCmdData->GetDependencies(); - if ( pCmdDepList ) - for ( USHORT i = 0; i< pCmdDepList->Count(); i++ ) { - aDataString += *pCmdDepList->GetObject( i ); - aDataString += aSpace; - } - aDataString += "NULL"; - } - - rStream.WriteLine( aDataString ); - - pCmdData = pPrj->Next(); - } while ( pCmdData ); - } - } - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::Write( String aFileName ) -/*****************************************************************************/ -{ - SvFileStream aFileStream; - - aFileStream.Open( aFileName, STREAM_WRITE | STREAM_TRUNC); - - if ( Count() > 0 ) - { - Prj* pPrj = First(); - do - { - WritePrj( pPrj, aFileStream ); - pPrj = Next(); - } while ( pPrj ); - } - - aFileStream.Close(); - - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::WriteMultiple( String rSourceRoot ) -/*****************************************************************************/ -{ - if ( Count() > 0 ) - { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - Prj* pPrj = First(); - do - { - String sName( pPrj->GetProjectName(), RTL_TEXTENCODING_ASCII_US ); - - DirEntry aEntry( rSourceRoot ); - aEntry += DirEntry( sName ); - aEntry += DirEntry( sPrjDir ); - aEntry += DirEntry( sSolarFile ); - - SvFileStream aFileStream; - aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC); - - WritePrj( pPrj, aFileStream ); - - aFileStream.Close(); - - pPrj = Next(); - } while ( pPrj ); - } - - return 0; -} - -/*****************************************************************************/ -void StarWriter::InsertTokenLine ( ByteString& rString ) -/*****************************************************************************/ -{ - int i = 0; - ByteString aWhat, aWhatOS, - sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; - static ByteString aDirName; - BOOL bPrjDep = FALSE; - BOOL bHardDep = FALSE; - USHORT nCommandType = 0; - USHORT nOSType = 0; - CommandData* pCmdData; - SByteStringList *pDepList2 = NULL; - Prj* pPrj; - - ByteString aEmptyString; - ByteString aToken = rString.GetToken( 0, '\t' ); - ByteString aCommentString; - - const char* yytext = aToken.GetBuffer(); - - while ( !( aToken == aEmptyString ) ) - { - switch (i) - { - case 0: - if ( rString.Search( "#" ) == 0 ) - { - i = -1; - aCommentString = rString; - rString = aEmptyString; - if ( Count() == 0 ) - aDirName = "null_entry" ; //comments at begin of file - break; - } - aPrefix = yytext; - pDepList2 = NULL; - break; - case 1: - aDirName = yytext; - break; - case 2: - if ( !strcmp( yytext, ":" )) - { - bPrjDep = TRUE; - bHardDep = FALSE; - i = 9; - } - else if ( !strcmp( yytext, "::" )) - { - bPrjDep = TRUE; - bHardDep = TRUE; - i = 9; - } - else - { - bPrjDep = FALSE; - bHardDep = FALSE; - - aWhat = yytext; - if ( aWhat == "nmake" ) - nCommandType = COMMAND_NMAKE; - else if ( aWhat == "get" ) - nCommandType = COMMAND_GET; - else { - ULONG nOffset = aWhat.Copy( 3 ).ToInt32(); - nCommandType = sal::static_int_cast< USHORT >( - COMMAND_USER_START + nOffset - 1); - } - } - break; - case 3: - if ( !bPrjDep ) - { - aWhat = yytext; - if ( aWhat == "-" ) - { - aCommandPara = ByteString(); - } - else - aCommandPara = aWhat; - } - break; - case 4: - if ( !bPrjDep ) - { - aWhatOS = yytext; - if ( aWhatOS.GetTokenCount( ',' ) > 1 ) { - sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 ); - aWhatOS = aWhatOS.GetToken( 0, ',' ); - } - aWhatOS = aWhatOS.GetToken( 0, ',' ); - if ( aWhatOS == "all" ) - nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ); - else if ( aWhatOS == "w" ) - nOSType = ( OS_WIN16 | OS_WIN32 ); - else if ( aWhatOS == "p" ) - nOSType = OS_OS2; - else if ( aWhatOS == "u" ) - nOSType = OS_UNX; - else if ( aWhatOS == "d" ) - nOSType = OS_WIN16; - else if ( aWhatOS == "n" ) - nOSType = OS_WIN32; - else - nOSType = OS_NONE; - } - break; - case 5: - if ( !bPrjDep ) - { - aLogFileName = yytext; - } - break; - default: - if ( !bPrjDep ) - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - } - else - { - // ggfs. Dependency liste anlegen und ergaenzen - if ( !pDepList2 ) - pDepList2 = new SByteStringList; - pDepList2->PutString( new ByteString( aItem )); - } - } - else - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - bPrjDep= FALSE; - } - else - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - pPrj->AddDependencies( aItem ); - pPrj->HasHardDependencies( bHardDep ); - - if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) { - String sItem( aItem, RTL_TEXTENCODING_ASCII_US ); - InsertSolarList( sItem ); - } - } - - } - break; - } - /* Wenn dieses Project noch nicht vertreten ist, in die Liste - der Solar-Projekte einfuegen */ - if ( i == -1 ) - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - - pCmdData = new CommandData; - pCmdData->SetPath( aDirName ); - pCmdData->SetCommandType( nCommandType ); - pCmdData->SetCommandPara( aCommandPara ); - pCmdData->SetOSType( nOSType ); - pCmdData->SetLogFile( aLogFileName ); - pCmdData->SetComment( aCommentString ); - pCmdData->SetClientRestriction( sClientRestriction ); - if ( pDepList2 ) - pCmdData->SetDependencies( pDepList2 ); - - pPrj->Insert ( pCmdData, LIST_APPEND ); - - } - i++; - - rString.Erase(0, aToken.Len()+1); - aToken = rString.GetToken( 0, '\t' ); - yytext = aToken.GetBuffer(); - - } - // und wer raeumt die depLst wieder ab ? -} - -/*****************************************************************************/ -BOOL StarWriter::InsertProject ( Prj* ) -/*****************************************************************************/ -{ - return FALSE; -} - -/*****************************************************************************/ -Prj* StarWriter::RemoveProject ( ByteString aProjectName ) -/*****************************************************************************/ -{ - ULONG nCountMember = Count(); - Prj* pPrj; - Prj* pPrjFound = NULL; - SByteStringList* pPrjDeps; - - for ( USHORT i = 0; i < nCountMember; i++ ) - { - pPrj = GetObject( i ); - if ( pPrj->GetProjectName() == aProjectName ) - pPrjFound = pPrj; - else - { - pPrjDeps = pPrj->GetDependencies( FALSE ); - if ( pPrjDeps ) - { - ByteString* pString; - ULONG nPrjDepsCount = pPrjDeps->Count(); - for ( ULONG j = nPrjDepsCount; j > 0; j-- ) - { - pString = pPrjDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == aProjectName ) - pPrjDeps->Remove( pString ); - } - } - } - } - - Remove( pPrjFound ); - - return pPrjFound; -} - -// -// class StarFile -// - -/*****************************************************************************/ -StarFile::StarFile( const String &rFile ) -/*****************************************************************************/ - : aFileName( rFile ) -{ - DirEntry aEntry( aFileName ); - if ( aEntry.Exists()) { - bExists = TRUE; - FileStat aStat( aEntry ); - aDate = aStat.DateModified(); - aTime = aStat.TimeModified(); - } - else - bExists = FALSE; -} - -/*****************************************************************************/ -BOOL StarFile::NeedsUpdate() -/*****************************************************************************/ -{ - DirEntry aEntry( aFileName ); - if ( aEntry.Exists()) { - if ( !bExists ) { - bExists = TRUE; - return TRUE; - } - FileStat aStat( aEntry ); - if (( aStat.DateModified() > aDate ) || - (( aStat.DateModified() == aDate ) && ( aStat.TimeModified() > aTime ))) - return TRUE; - } - return FALSE; -} - diff --git a/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx deleted file mode 100644 index 8c83dedf72ec..000000000000 --- a/tools/bootstrp/sstring.cxx +++ /dev/null @@ -1,317 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_tools.hxx" - -#ifndef _TOOLS_STRINGLIST -# define _TOOLS_STRINGLIST -#endif - -#define ENABLE_BYTESTRING_STREAM_OPERATORS -#include -#include "bootstrp/sstring.hxx" - -SByteStringList::SByteStringList() -{ -} - -SByteStringList::~SByteStringList() -{ -} - -ULONG SByteStringList::IsString( ByteString* pStr ) -{ - ULONG nRet = NOT_THERE; - if ( (nRet = GetPrevString( pStr )) != 0 ) - { - ByteString* pString = GetObject( nRet ); - if ( *pString == *pStr ) - return nRet; - else - return NOT_THERE; - } - else - { - ByteString* pString = GetObject( 0 ); - if ( pString && (*pString == *pStr) ) - return 0; - else - return NOT_THERE; - } -} - -ULONG SByteStringList::GetPrevString( ByteString* pStr ) -{ - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; - ByteString* pString; - - do - { - if ( (nCurrent == nLower) || (nCurrent == nUpper) ) - return nLower; - pString = GetObject( nCurrent ); - StringCompare nResult = pStr->CompareTo( *pString ); - if ( nResult == COMPARE_LESS ) - { - nUpper = nCurrent; - nCurrent = (nCurrent + nLower) /2; - } - else if ( nResult == COMPARE_GREATER ) - { - nLower = nCurrent; - nCurrent = (nUpper + nCurrent) /2; - } - else if ( nResult == COMPARE_EQUAL ) - return nCurrent; - if ( nRem == nCurrent ) - return nCurrent; - nRem = nCurrent; - } - while ( !bFound ); - return nRet; -} - -/************************************************************************** -* -* Sortiert einen ByteString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck -* -**************************************************************************/ - -ULONG SByteStringList::PutString( ByteString* pStr ) -{ - ULONG nPos = GetPrevString ( pStr ); - if ( Count() ) - { - { - ByteString* pString = GetObject( 0 ); - if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) - { - Insert( pStr, (ULONG)0 ); - return (ULONG)0; - } - } - ByteString* pString = GetObject( nPos ); - if ( *pStr != *pString ) - { - Insert( pStr, nPos+1 ); - return ( nPos +1 ); - } - } - else - { - Insert( pStr ); - return (ULONG)0; - } - - return NOT_THERE; -} - -ByteString* SByteStringList::RemoveString( const ByteString& rName ) -{ - ULONG i; - ByteString* pReturn; - - for( i = 0 ; i < Count(); i++ ) - { - if ( rName == *GetObject( i ) ) - { - pReturn = GetObject(i); - Remove(i); - return pReturn; - } - } - - return NULL; -} - -void SByteStringList::CleanUp() -{ - ByteString* pByteString = First(); - while (pByteString) { - delete pByteString; - pByteString = Next(); - } - Clear(); -} - -SByteStringList& SByteStringList::operator<< ( SvStream& rStream ) -{ - sal_uInt32 nListCount; - rStream >> nListCount; - for ( USHORT i = 0; i < nListCount; i++ ) { - ByteString* pByteString = new ByteString(); - rStream >> *pByteString; - Insert (pByteString, LIST_APPEND); - } - return *this; -} - -SByteStringList& SByteStringList::operator>> ( SvStream& rStream ) -{ - sal_uInt32 nListCount = Count(); - rStream << nListCount; - ByteString* pByteString = First(); - while (pByteString) { - rStream << *pByteString; - pByteString = Next(); - } - return *this; -} - - - - - - - -SUniStringList::SUniStringList() -{ -} - -SUniStringList::~SUniStringList() -{ -} - -ULONG SUniStringList::IsString( UniString* pStr ) -{ - ULONG nRet = NOT_THERE; - if ( (nRet = GetPrevString( pStr )) != 0 ) - { - UniString* pString = GetObject( nRet ); - if ( *pString == *pStr ) - return nRet; - else - return NOT_THERE; - } - else - { - UniString* pString = GetObject( 0 ); - if ( pString && (*pString == *pStr) ) - return 0; - else - return NOT_THERE; - } -} - -ULONG SUniStringList::GetPrevString( UniString* pStr ) -{ - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; - UniString* pString; - - do - { - if ( (nCurrent == nLower) || (nCurrent == nUpper) ) - return nLower; - pString = GetObject( nCurrent ); - StringCompare nResult = pStr->CompareTo( *pString ); - if ( nResult == COMPARE_LESS ) - { - nUpper = nCurrent; - nCurrent = (nCurrent + nLower) /2; - } - else if ( nResult == COMPARE_GREATER ) - { - nLower = nCurrent; - nCurrent = (nUpper + nCurrent) /2; - } - else if ( nResult == COMPARE_EQUAL ) - return nCurrent; - if ( nRem == nCurrent ) - return nCurrent; - nRem = nCurrent; - } - while ( !bFound ); - return nRet; -} - -/************************************************************************** -* -* Sortiert einen UniString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck -* -**************************************************************************/ - -ULONG SUniStringList::PutString( UniString* pStr ) -{ - ULONG nPos = GetPrevString ( pStr ); - if ( Count() ) - { - { - UniString* pString = GetObject( 0 ); - if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) - { - Insert( pStr, (ULONG)0); - return (ULONG)0; - } - } - UniString* pString = GetObject( nPos ); - if ( *pStr != *pString ) - { - Insert( pStr, nPos+1 ); - return ( nPos +1 ); - } - } - else - { - Insert( pStr ); - return (ULONG)0; - } - - return NOT_THERE; -} - -UniString* SUniStringList::RemoveString( const UniString& rName ) -{ - ULONG i; - UniString* pReturn; - - for( i = 0 ; i < Count(); i++ ) - { - if ( rName == *GetObject( i ) ) - { - pReturn = GetObject(i); - Remove(i); - return pReturn; - } - } - - return NULL; -} diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx deleted file mode 100644 index e0d8f1e39aeb..000000000000 --- a/tools/inc/bootstrp/command.hxx +++ /dev/null @@ -1,165 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef COMMAND_HXX -#define COMMAND_HXX - -#include - -#include -#define STRLEN 100 -#ifndef UNX -#define TMPNAME "\\command.tmp" -#else -#define TMPNAME "/tmp/command.tmp" -#endif - -/** Different types of spawnable programs -*/ -enum ExeType -{ - EXE, /// programm is a native executable - BAT, /// programm is a DOS-Batch - BTM /// programm is a 4DOS-Batch -}; - -#define COMMAND_NOTFOUND 0x0001 -#define COMMAND_TOOBIG 0x0002 -#define COMMAND_INVALID 0x0004 -#define COMMAND_NOEXEC 0x0008 -#define COMMAND_NOMEM 0x0010 -#define COMMAND_UNKNOWN 0x0020 - -#ifdef WNT -#define COMMAND_SHELL "4nt.exe" -#endif -#ifdef OS2 -#define COMMAND_SHELL "4os2.exe" -#endif -#ifdef UNX -#define COMMAND_SHELL "csh" -#endif - -class CommandLine; -class LogWindow; - -class CommandLine -{ -friend class ChildProcess; -private: - char *CommandBuffer; - char *ComShell; - char **ppArgv; - BOOL bTmpWrite; - -public: - CommandLine(BOOL bTmpWrite = FALSE); - CommandLine(const char *, BOOL bTmpWrite = FALSE); - CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); - virtual ~CommandLine(); - - int nArgc; - - CommandLine& operator=(const CommandLine&); - CommandLine& operator=(const char *); - void BuildCommand(const char *); - char** GetCommand(void) { return ppArgv; } - void Strtokens(const char *); - void Print(); -}; - -static ByteString thePath( "PATH" ); - -/** Declares and spawns a child process. - The spawned programm could be a native executable or a schell script. -*/ -class CCommand -{ -private: - ByteString aCommandLine; - ByteString aCommand; - char *pArgv; - char **ppArgv; - ULONG nArgc; - int nError; - -protected: - void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); - -public: - /** Creates the process specified without spawning it - @param rString specifies the programm or shell scrip - */ - CCommand( ByteString &rString ); - - /** Creates the process specified without spawning it - @param pChar specifies the programm or shell scrip - */ - CCommand( const char *pChar ); - - /** Try to find the given programm in specified path - @param sEnv specifies the current search path, defaulted by environment - @param sItem specifies the system shell - @return the Location (when programm was found) - */ - static ByteString Search( ByteString sEnv = thePath, - ByteString sItem = COMMAND_SHELL ); - - /** Spawns the Process - @return 0 when spawned without errors, otherwise a error code - */ - operator int(); - - ByteString GetCommandLine_() { return aCommandLine; } - ByteString GetCommand() { return aCommand; } - - char** GetCommandStr() { return ppArgv; } -}; - -#define COMMAND_EXECUTE_WINDOW 0x0000001 -#define COMMAND_EXECUTE_CONSOLE 0x0000002 -#define COMMAND_EXECUTE_HIDDEN 0x0000004 -#define COMMAND_EXECUTE_START 0x0000008 -#define COMMAND_EXECUTE_WAIT 0x0000010 -#define COMMAND_EXECUTE_REMOTE 0x1000000 - -typedef ULONG CommandBits; - -/** Allowes to spawn programms hidden, waiting etc. - @see CCommand -*/ -class CCommandd : public CCommand -{ - CommandBits nFlag; -public: - CCommandd( ByteString &rString, CommandBits nBits ); - CCommandd( const char *pChar, CommandBits nBits ); - operator int(); -}; - -#endif diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx deleted file mode 100644 index 8c678ff32275..000000000000 --- a/tools/inc/bootstrp/listmacr.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LISTMACR_HXX -#define _LISTMACR_HXX - -#define DECL_DEST_LIST( TmpListType, ListType, PointerType ) \ -DECLARE_LIST(TmpListType, PointerType) \ -class ListType : public TmpListType \ -{ \ -public: \ - void ClearAndDelete() \ - { \ - while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ - delete pTmp; \ - Remove(( ULONG ) 0 ); \ - } \ - } \ - ~ListType() \ - { \ - ClearAndDelete(); \ - } \ -}; \ - -#endif - - - - - - - - - - diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index 991b5961a096..5510fb87f7b9 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -29,7 +29,9 @@ #define _MK_CREATE_HXX #include -#include "bootstrp/sstring.hxx" +//#include "bootstrp/sstring.hxx" + +DECLARE_LIST( UniStringList, UniString* ) #include #include "bootstrp/prj.hxx" diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..4b1ff91feb7b 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -30,98 +30,6 @@ #include #include -#include "bootstrp/listmacr.hxx" -#include - -#define OS_NONE 0x0000 -#define OS_WIN16 0x0001 -#define OS_WIN32 0x0002 -#define OS_OS2 0x0004 -#define OS_UNX 0x0008 -#define OS_ALL ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ) - -#define COMMAND_PROJECTROOT 0x0000 -#define COMMAND_NMAKE 0x0001 -#define COMMAND_GET 0x0002 -#define COMMAND_USER_START 0x0003 -#define COMMAND_USER_END 0xFFFE -#define COMMAND_ALLDIRS 0xFFFF - -class SByteStringList; -class GenericInformationList; - -/* -// Pfade auf Konfigurationsdateien des Build-Servers - -#define REQUEST_DIR \\src\data4\source\b_server\server\newjob -*/ -/********************************************************************* -* -* Die Klasse CommandData haelte alle Informationen, die fuer die -* Abarbeitung eines Kommandos (nmake, get) noetig sind -* -*********************************************************************/ - -class CommandData -{ - ByteString aPrj; - ByteString aLogFileName; - ByteString aInpath; - ByteString aUpd; - ByteString aUpdMinor; - ByteString aProduct; - ByteString aCommand; - ByteString aPath; - ByteString aPrePath; - ByteString aPreFix; - ByteString aCommandPara; - ByteString aComment; - ByteString sClientRestriction; - SByteStringList *pDepList; - USHORT nOSType; - USHORT nCommand; - - ULONG nDepth; // Tiefe der Abhaenigkeit - -public: - CommandData(); - ~CommandData(); - ByteString GetProjectName(){return aPrj;} - void SetProjectName( ByteString aName ){aPrj = aName;} - ByteString GetLogFile(){return aLogFileName;} - void SetLogFile( ByteString aName ){aLogFileName = aName;} - ByteString GetInpath(){return aInpath;} - void SetInpath( ByteString aName ){aInpath = aName;} - ByteString GetUpd(){return aUpd;} - void SetUpd( ByteString aName ){aUpd = aName;} - ByteString GetUpdMinor(){return aUpdMinor;} - void SetUpdMinor( ByteString aName ){aUpdMinor = aName;} - ByteString GetProduct(){return aProduct;} - void SetProduct( ByteString aName ){aProduct = aName;} - ByteString GetCommand(){return aCommand;} - void SetCommand ( ByteString aName ){aCommand = aName;} - ByteString GetCommandPara(){return aCommandPara;} - void SetCommandPara ( ByteString aName ){aCommandPara = aName;} - ByteString GetComment(){return aComment;} - void SetComment ( ByteString aCommentString ){aComment = aCommentString;} - ByteString GetPath(){return aPath;} - void SetPath( ByteString aName ){aPath = aName;} - ByteString GetPrePath(){return aPrePath;} - void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} - ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} - ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} - SByteStringList* GetDependencies(){return pDepList;} - void SetDependencies( SByteStringList *pList ){pDepList = pList;} - ByteString GetClientRestriction() { return sClientRestriction; } - void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } - - void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} -}; /********************************************************************* * @@ -147,185 +55,4 @@ public: ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 -#define ENV_OUTPATH 0x00000010 -#define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 -#define ENV_CPUNAME 0x00000400 -#define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 -#define ENV_COMPATH 0x00002000 -#define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 -#define ENV_SOLROOT 0x00080000 -#define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 - -/********************************************************************* -* -* class Prj -* alle Daten eines Projektes werden hier gehalten -* -*********************************************************************/ - -DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * ) - -class Star; -class Prj : public PrjList -{ -friend class Star; -private: - BOOL bVisited; - - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; - -public: - Prj(); - Prj( ByteString aName ); - ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() - {return aProjectName;} - void SetProjectName(ByteString aName) - {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) - { return GetDirectoryData( aLogFileName ); }; - - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } -}; - -/********************************************************************* -* -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus -* -*********************************************************************/ - -DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) -DECLARE_LIST ( SolarFileList, String* ) - -class StarFile -{ -private: - String aFileName; - Date aDate; - Time aTime; - - BOOL bExists; - -public: - StarFile( const String &rFile ); - const String &GetName() { return aFileName; } - Date GetDate() { return aDate; } - Time GetTime() { return aTime; } - - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } -}; - -DECLARE_LIST( StarFileList, StarFile * ) - -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 - -class Star : public StarList -{ -private: - ByteString aStarName; - - static Link aDBNotFoundHdl; -protected: - NAMESPACE_VOS( OMutex ) aMutex; - - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; - - void InsertSolarList( String sProject ); - String CreateFileName( String sProject ); - - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - -private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); - -public: - Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - ~Star(); - - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - - ByteString GetName(){ return aStarName; }; - - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); - - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); - - USHORT GetMode() { return nStarMode; } -}; - -class StarWriter : public Star -{ -private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); - -public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - void CleanUp(); - - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); - - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); - - void InsertTokenLine( ByteString& rString ); -}; - #endif diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx deleted file mode 100644 index 933770887e37..000000000000 --- a/tools/inc/bootstrp/sstring.hxx +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SSTRING_HXX -#define _SSTRING_HXX - -#include -#include - -#define NOT_THERE LIST_ENTRY_NOTFOUND - -#define SStringList SUniStringList -#define StringList UniStringList - -DECLARE_LIST( ByteStringList, ByteString* ) -DECLARE_LIST( UniStringList, UniString* ) - -class SvStream; - -// --------------------- -// - class SStringList - -// --------------------- - -class SByteStringList : public ByteStringList -{ -public: - SByteStringList(); - ~SByteStringList(); - - // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); - ByteString* RemoveString( const ByteString& rName ); - - // Position des ByteString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( ByteString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( ByteString* ); - void CleanUp(); - - SByteStringList& operator<< ( SvStream& rStream ); - SByteStringList& operator>> ( SvStream& rStream ); -}; - -// --------------------- -// - class SUniStringList - -// --------------------- - -class SUniStringList : public UniStringList -{ -public: - SUniStringList(); - ~SUniStringList(); - - // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); - UniString* RemoveString( const UniString& rName ); - - // Position des UniString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( UniString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( UniString* ); -}; - -class Text -{ -protected: - String aString; - -public: - Text( char* pChar ); - Text( String &rStr ) { aString = rStr; } - void Stderr(); -}; - -#endif diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 854a6179739a..1c0b5271071d 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,27 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\bootstrp +mkdir: %_DEST%\inc%_EXT%\tools ..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% ..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll ..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym -..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib -..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib -..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib ..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib -..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map -..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib - -..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx -..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx -..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx -..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx -..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx -..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx ..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h ..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 568baaacd8f1..735b5380614d 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -38,26 +38,25 @@ ENABLE_EXCEPTIONS=true # --- Allgemein ---------------------------------------------------- # --- STDSTRM.LIB --- -LIB3TARGET= $(LB)$/stdstrm.lib -LIB3ARCHIV= $(LB)$/libstdstrm.a -LIB3FILES= $(LB)$/stream.lib - -LIB7TARGET= $(LB)$/a$(TARGET).lib -LIB7ARCHIV= $(LB)$/liba$(TARGET).a -LIB7FILES= $(LB)$/gen.lib \ - $(LB)$/str.lib \ - $(LB)$/mtools.lib \ - $(LB)$/datetime.lib \ - $(LB)$/fsys.lib \ - $(LB)$/communi.lib \ - $(LB)$/stream.lib \ - $(LB)$/ref.lib \ - $(LB)$/rc.lib \ - $(LB)$/inet.lib \ - $(LB)$/debug.lib - - -LIB7FILES+= $(LB)$/dll.lib +#LIB3TARGET= $(LB)$/stdstrm.lib +#LIB3ARCHIV= $(LB)$/libstdstrm.a +#LIB3FILES= $(LB)$/stream.lib + +#LIB7TARGET= $(LB)$/a$(TARGET).lib +#LIB7ARCHIV= $(LB)$/liba$(TARGET).a +#LIB7FILES= $(LB)$/gen.lib \ +# $(LB)$/str.lib \ +# $(LB)$/mtools.lib \ +# $(LB)$/datetime.lib \ +# $(LB)$/fsys.lib \ +# $(LB)$/communi.lib \ +# $(LB)$/stream.lib \ +# $(LB)$/ref.lib \ +# $(LB)$/rc.lib \ +# $(LB)$/inet.lib \ +# $(LB)$/debug.lib +# +#LIB7FILES+= $(LB)$/dll.lib # --- TOOLS.LIB --- LIB1TARGET:= $(SLB)$/$(TARGET).lib -- cgit From 9ae1020765800cee95851e866d388e9394408471 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 7 May 2010 14:39:55 +0200 Subject: CWS gnumake2: adapt gbuild makefiles to changes in tools/bootstrp --- tools/prj/target_exe_mkunroll.mk | 3 --- tools/prj/target_exe_rscdep.mk | 3 --- tools/prj/target_exe_sspretty.mk | 3 --- tools/prj/target_package_inc.mk | 6 ------ 4 files changed, 15 deletions(-) (limited to 'tools') diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk index 9d00d75b4bc1..b1ce83680ef8 100644 --- a/tools/prj/target_exe_mkunroll.mk +++ b/tools/prj/target_exe_mkunroll.mk @@ -52,12 +52,9 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/addexes2/mkfilt \ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk index 99a717470f19..20f4d22b186c 100644 --- a/tools/prj/target_exe_rscdep.mk +++ b/tools/prj/target_exe_rscdep.mk @@ -48,13 +48,10 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ tools/bootstrp/rscdep \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk index 6751c53fae84..5b8c83977dcd 100644 --- a/tools/prj/target_exe_sspretty.mk +++ b/tools/prj/target_exe_sspretty.mk @@ -49,13 +49,10 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\ $(eval $(call gb_Executable_add_exception_objects,sspretty,\ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ tools/bootstrp/sspretty \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk index 14e70973b276..5deb59a7b0da 100644 --- a/tools/prj/target_package_inc.mk +++ b/tools/prj/target_package_inc.mk @@ -26,12 +26,6 @@ #************************************************************************* $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/command.hxx,bootstrp/command.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/inimgr.hxx,bootstrp/inimgr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/listmacr.hxx,bootstrp/listmacr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/mkcreate.hxx,bootstrp/mkcreate.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/prj.hxx,bootstrp/prj.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/sstring.hxx,bootstrp/sstring.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) -- cgit From 829b5e25d01442907ce061f1f1eb50bd4c8320f2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 19:03:40 +0200 Subject: CWS gnumake2: enabling precompiled headers where possible --- tools/prj/target_lib_tl.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 30c64badc265..2fc00ec68a8b 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,tl)) -$(call gb_Library_get_headers_target,tl) : $(call gb_Package_get_target,tools_inc) +$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 47bc0f3fb1220451173c1972dd83dd2a8e75509b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 21 Jun 2010 16:17:24 +0200 Subject: CWS gnumake2: pch for debug builds, fixing header package deps --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 2fc00ec68a8b..6d85f6f39722 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_add_package_headers,tl,tools_inc)) -$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) +#$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 1801d21c82fbdc8e63785313c488ea220456dda4 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 22 Jun 2010 14:37:57 +0200 Subject: CWS gnumake2: fixing dep generation, pch flags --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 6d85f6f39722..2fc00ec68a8b 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_add_package_headers,tl,tools_inc)) -#$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 1f79d3036954bfca21f6ff7ee9a27bf38439924d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 25 Jun 2010 21:46:32 +0200 Subject: CWS gnumake2: intermediate commit (module rework) --- tools/Makefile | 5 +---- tools/prj/target_exe_mkunroll.mk | 2 ++ tools/prj/target_module_tools.mk | 11 ++--------- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 9ab4b8ba83f4..265fdac07bb1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -28,9 +28,6 @@ GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk index b1ce83680ef8..9200ab8a3971 100644 --- a/tools/prj/target_exe_mkunroll.mk +++ b/tools/prj/target_exe_mkunroll.mk @@ -73,4 +73,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ dl \ )) endif + +$(info --- $(gb_Module_TARGETSTACK)) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk index 70d14b03dc45..cd260e7709fe 100644 --- a/tools/prj/target_module_tools.mk +++ b/tools/prj/target_module_tools.mk @@ -25,16 +25,9 @@ # #************************************************************************* -$(eval $(call gb_Module_Module,tools,\ - $(call gb_Executable_get_target,mkunroll) \ - $(call gb_Executable_get_target,rscdep) \ - $(call gb_Executable_get_target,so_checksum) \ - $(call gb_Executable_get_target,sspretty) \ - $(call gb_Library_get_target,tl) \ - $(call gb_Package_get_target,tools_inc) \ -)) +$(eval $(call gb_Module_Module,tools)) -$(eval $(call gb_Module_read_includes,tools,\ +$(eval $(call gb_Module_add_targets,tools,\ exe_mkunroll \ exe_rscdep \ exe_so_checksum \ -- cgit From f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- tools/Executable_mkunroll.mk | 77 +++++++++++++++ tools/Executable_rscdep.mk | 73 +++++++++++++++ tools/Executable_so_checksum.mk | 69 ++++++++++++++ tools/Executable_sspretty.mk | 74 +++++++++++++++ tools/Library_tl.mk | 180 ++++++++++++++++++++++++++++++++++++ tools/Makefile | 6 +- tools/Module_tools.mk | 54 +++++++++++ tools/Package_inc.mk | 115 +++++++++++++++++++++++ tools/prj/target_exe_mkunroll.mk | 78 ---------------- tools/prj/target_exe_rscdep.mk | 73 --------------- tools/prj/target_exe_so_checksum.mk | 69 -------------- tools/prj/target_exe_sspretty.mk | 74 --------------- tools/prj/target_lib_tl.mk | 180 ------------------------------------ tools/prj/target_module_tools.mk | 52 ----------- tools/prj/target_package_inc.mk | 115 ----------------------- 15 files changed, 647 insertions(+), 642 deletions(-) create mode 100644 tools/Executable_mkunroll.mk create mode 100644 tools/Executable_rscdep.mk create mode 100644 tools/Executable_so_checksum.mk create mode 100644 tools/Executable_sspretty.mk create mode 100644 tools/Library_tl.mk create mode 100644 tools/Module_tools.mk create mode 100644 tools/Package_inc.mk delete mode 100644 tools/prj/target_exe_mkunroll.mk delete mode 100644 tools/prj/target_exe_rscdep.mk delete mode 100644 tools/prj/target_exe_so_checksum.mk delete mode 100644 tools/prj/target_exe_sspretty.mk delete mode 100644 tools/prj/target_lib_tl.mk delete mode 100644 tools/prj/target_module_tools.mk delete mode 100644 tools/prj/target_package_inc.mk (limited to 'tools') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk new file mode 100644 index 000000000000..4ee724d8ffc0 --- /dev/null +++ b/tools/Executable_mkunroll.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,mkunroll)) + +$(eval $(call gb_Executable_set_include,mkunroll,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + basegfx \ + sal \ + stl \ + tl \ + vos3 \ +)) + +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ + tools/bootstrp/addexes2/mkfilt \ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + pthread \ + dl \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk new file mode 100644 index 000000000000..20f4d22b186c --- /dev/null +++ b/tools/Executable_rscdep.mk @@ -0,0 +1,73 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,rscdep)) + +$(eval $(call gb_Executable_set_include,rscdep,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,rscdep,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + sal \ + stl \ + tl \ + vos3 \ +)) + +$(eval $(call gb_Executable_add_exception_objects,rscdep,\ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ + tools/bootstrp/rscdep \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk new file mode 100644 index 000000000000..d852c22ef5de --- /dev/null +++ b/tools/Executable_so_checksum.mk @@ -0,0 +1,69 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,so_checksum)) + +$(eval $(call gb_Executable_set_include,so_checksum,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + sal \ + tl \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ + tools/bootstrp/md5 \ + tools/bootstrp/so_checksum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk new file mode 100644 index 000000000000..5b8c83977dcd --- /dev/null +++ b/tools/Executable_sspretty.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,sspretty)) + +$(eval $(call gb_Executable_set_include,sspretty,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,sspretty,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + sal \ + stl \ + tl \ + vos3 \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,sspretty,\ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ + tools/bootstrp/sspretty \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk new file mode 100644 index 000000000000..2fc00ec68a8b --- /dev/null +++ b/tools/Library_tl.mk @@ -0,0 +1,180 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tl)) + +$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) + +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/tools \ + -I$(SRCDIR)/tools/inc \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(SRCDIR)/solenv/inc/Xp31 \ + -I$(OUTDIR)/inc/tools \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ +)) + +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSHARED_LIB \ + -DTOOLS_DLLIMPLEMENTATION \ + -DVCL \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + basegfx \ + comphelper \ + i18nisolang1 \ + stl \ + cppu \ + sal \ + vos3 \ +)) + + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/geninfo \ + tools/source/communi/parser \ + tools/source/datetime/datetime \ + tools/source/datetime/tdate \ + tools/source/datetime/ttime \ + tools/source/debug/debug \ + tools/source/debug/stcktree \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ + tools/source/fsys/tdir \ + tools/source/fsys/tempfile \ + tools/source/fsys/urlobj \ + tools/source/fsys/wldcrd \ + tools/source/generic/b3dtrans \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ + tools/source/generic/line \ + tools/source/generic/link \ + tools/source/generic/poly \ + tools/source/generic/poly2 \ + tools/source/generic/svborder \ + tools/source/generic/toolsin \ + tools/source/inet/inetmime \ + tools/source/inet/inetmsg \ + tools/source/inet/inetstrm \ + tools/source/memtools/contnr \ + tools/source/memtools/mempool \ + tools/source/memtools/multisel \ + tools/source/memtools/table \ + tools/source/memtools/unqidx \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ + tools/source/misc/solarmutex \ + tools/source/rc/isofallback \ + tools/source/rc/rc \ + tools/source/rc/resary \ + tools/source/rc/resmgr \ + tools/source/ref/errinf \ + tools/source/ref/globname \ + tools/source/ref/pstm \ + tools/source/ref/ref \ + tools/source/stream/cachestr \ + tools/source/stream/stream \ + tools/source/stream/strmsys \ + tools/source/stream/vcompat \ + tools/source/string/debugprint \ + tools/source/string/tenccvt \ + tools/source/string/tstring \ + tools/source/string/tustring \ + tools/source/testtoolloader/testtoolloader \ + tools/source/zcodec/zcodec \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/unx/source/dll/toolsdll \ +)) +endif + +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSYSTEM_ZLIB \ +)) +$(eval $(call gb_Library_add_linked_libs,tl,\ + z \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/win/inc \ +)) + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/win/source/dll/toolsdll \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g +# -DOPTIMIZE +# no -DTOOLS_DLLIMPLEMENTATION on toolsdll +# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader +# vim: set noet sw=4 ts=4: diff --git a/tools/Makefile b/tools/Makefile index 265fdac07bb1..60d34122e271 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,9 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk new file mode 100644 index 000000000000..447aba59cb50 --- /dev/null +++ b/tools/Module_tools.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,tools)) + +$(eval $(call gb_Module_add_targets,tools,\ + Executable_mkunroll \ + Executable_rscdep \ + Executable_so_checksum \ + Executable_sspretty \ + Library_tl \ + Package_inc \ +)) + +# TODO: +#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib +#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib +#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib +#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a +#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a +#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a +#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a +#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib +#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj +#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj + +#todo: link tools dynamically everywhere +#todo: ALWAYSDBGFLAG etc. + +# vim: set noet sw=4 ts=4: diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk new file mode 100644 index 000000000000..5deb59a7b0da --- /dev/null +++ b/tools/Package_inc.mk @@ -0,0 +1,115 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk deleted file mode 100644 index 9200ab8a3971..000000000000 --- a/tools/prj/target_exe_mkunroll.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,mkunroll)) - -$(eval $(call gb_Executable_set_include,mkunroll,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - basegfx \ - sal \ - stl \ - tl \ - vos3 \ -)) - -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ - tools/bootstrp/addexes2/mkfilt \ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - pthread \ - dl \ -)) -endif - -$(info --- $(gb_Module_TARGETSTACK)) -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk deleted file mode 100644 index 20f4d22b186c..000000000000 --- a/tools/prj/target_exe_rscdep.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,rscdep)) - -$(eval $(call gb_Executable_set_include,rscdep,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - sal \ - stl \ - tl \ - vos3 \ -)) - -$(eval $(call gb_Executable_add_exception_objects,rscdep,\ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ - tools/bootstrp/rscdep \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_so_checksum.mk b/tools/prj/target_exe_so_checksum.mk deleted file mode 100644 index d852c22ef5de..000000000000 --- a/tools/prj/target_exe_so_checksum.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,so_checksum)) - -$(eval $(call gb_Executable_set_include,so_checksum,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - sal \ - tl \ -)) -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ - tools/bootstrp/md5 \ - tools/bootstrp/so_checksum \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk deleted file mode 100644 index 5b8c83977dcd..000000000000 --- a/tools/prj/target_exe_sspretty.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,sspretty)) - -$(eval $(call gb_Executable_set_include,sspretty,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,sspretty,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - sal \ - stl \ - tl \ - vos3 \ -)) -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,sspretty,\ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ - tools/bootstrp/sspretty \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk deleted file mode 100644 index 2fc00ec68a8b..000000000000 --- a/tools/prj/target_lib_tl.mk +++ /dev/null @@ -1,180 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,tl)) - -$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) - -$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) - -$(eval $(call gb_Library_set_include,tl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/tools \ - -I$(SRCDIR)/tools/inc \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/solenv/inc \ - -I$(SRCDIR)/solenv/inc/Xp31 \ - -I$(OUTDIR)/inc/tools \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ -)) - -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSHARED_LIB \ - -DTOOLS_DLLIMPLEMENTATION \ - -DVCL \ -)) - -$(eval $(call gb_Library_add_linked_libs,tl,\ - basegfx \ - comphelper \ - i18nisolang1 \ - stl \ - cppu \ - sal \ - vos3 \ -)) - - -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/source/communi/geninfo \ - tools/source/communi/parser \ - tools/source/datetime/datetime \ - tools/source/datetime/tdate \ - tools/source/datetime/ttime \ - tools/source/debug/debug \ - tools/source/debug/stcktree \ - tools/source/fsys/comdep \ - tools/source/fsys/dirent \ - tools/source/fsys/filecopy \ - tools/source/fsys/fstat \ - tools/source/fsys/tdir \ - tools/source/fsys/tempfile \ - tools/source/fsys/urlobj \ - tools/source/fsys/wldcrd \ - tools/source/generic/b3dtrans \ - tools/source/generic/bigint \ - tools/source/generic/color \ - tools/source/generic/config \ - tools/source/generic/fract \ - tools/source/generic/gen \ - tools/source/generic/line \ - tools/source/generic/link \ - tools/source/generic/poly \ - tools/source/generic/poly2 \ - tools/source/generic/svborder \ - tools/source/generic/toolsin \ - tools/source/inet/inetmime \ - tools/source/inet/inetmsg \ - tools/source/inet/inetstrm \ - tools/source/memtools/contnr \ - tools/source/memtools/mempool \ - tools/source/memtools/multisel \ - tools/source/memtools/table \ - tools/source/memtools/unqidx \ - tools/source/misc/appendunixshellword \ - tools/source/misc/extendapplicationenvironment \ - tools/source/misc/getprocessworkingdir \ - tools/source/misc/solarmutex \ - tools/source/rc/isofallback \ - tools/source/rc/rc \ - tools/source/rc/resary \ - tools/source/rc/resmgr \ - tools/source/ref/errinf \ - tools/source/ref/globname \ - tools/source/ref/pstm \ - tools/source/ref/ref \ - tools/source/stream/cachestr \ - tools/source/stream/stream \ - tools/source/stream/strmsys \ - tools/source/stream/vcompat \ - tools/source/string/debugprint \ - tools/source/string/tenccvt \ - tools/source/string/tstring \ - tools/source/string/tustring \ - tools/source/testtoolloader/testtoolloader \ - tools/source/zcodec/zcodec \ -)) - -ifeq ($(GUI),UNX) -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/unx/source/dll/toolsdll \ -)) -endif - -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSYSTEM_ZLIB \ -)) -$(eval $(call gb_Library_add_linked_libs,tl,\ - z \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,tl,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_set_include,tl,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/win/inc \ -)) - -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/win/source/dll/toolsdll \ -)) - -$(eval $(call gb_Library_add_linked_libs,tl,\ - advapi32 \ - kernel32 \ - mpr \ - msvcrt \ - oldnames \ - ole32 \ - shell32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g -# -DOPTIMIZE -# no -DTOOLS_DLLIMPLEMENTATION on toolsdll -# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk deleted file mode 100644 index cd260e7709fe..000000000000 --- a/tools/prj/target_module_tools.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,tools)) - -$(eval $(call gb_Module_add_targets,tools,\ - exe_mkunroll \ - exe_rscdep \ - exe_so_checksum \ - exe_sspretty \ - lib_tl \ - package_inc \ -)) - -# TODO: -#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib -#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib -#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib -#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a -#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a -#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a -#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a -#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib -#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj -#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj - -#todo: link tools dynamically everywhere -#todo: ALWAYSDBGFLAG etc. diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk deleted file mode 100644 index 5deb59a7b0da..000000000000 --- a/tools/prj/target_package_inc.mk +++ /dev/null @@ -1,115 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) -- cgit From 5fc7423878d02fac53b3140aff0d6d89fd74232d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- tools/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 396a4b3141eef99475a4f4b61ae754db69531e12 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 5 Jul 2010 18:06:39 +0200 Subject: CWS gnumake2: more multi-repo work for modules --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 60d34122e271..cd5308a477df 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,6 +32,7 @@ endif GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_set_current_repo,$(realpath $(gb_Module_CURRENTREPO)..))) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From 35d5e1b45653eafe422c281356df9d833da43e04 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 6 Jul 2010 12:47:44 +0200 Subject: CWS gnumake2: more multi-repo work --- tools/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index cd5308a477df..903d994acd8b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,14 +25,9 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - -GBUILDDIR := $(SOLARENV)/gbuild +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePaths.mk include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_set_current_repo,$(realpath $(gb_Module_CURRENTREPO)..))) -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From b2f9ce87249dfe76e25e2d6062c50c38fc60df23 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 7 Jul 2010 13:17:37 +0200 Subject: CWS gnumake2: resolved dep generation dep cycle --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 903d994acd8b..b198cc3d4c32 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,8 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePaths.mk +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) -- cgit From 13650e71469d579a91f3de3eefa977e825567b57 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 8 Jul 2010 13:58:34 +0200 Subject: CWS gnumake2: using gnu make directly from build.pl --- tools/prj/build.lst | 32 +++----------------------------- tools/prj/gbuild.lst | 3 --- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 tools/prj/gbuild.lst (limited to 'tools') diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 6f07015178d2..3194cbb4e87c 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,29 +1,3 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\inc nmake - all tl_inc NULL -tl tools\prj get - all tl_prj NULL -tl tools\prj usr7 - all tl_deliver NULL -tl tools\prj usr42 - all tl_zn NULL -tl tools\workben get - all tl_wben NULL -tl tools\source\testtoolloader nmake - all tl_ttloader tl_inc NULL -tl tools\source\generic nmake - all tl_gen tl_fsys tl_inc NULL -tl tools\source\memtools nmake - all tl_mem tl_fsys tl_inc NULL -tl tools\source\debug nmake - all tl_deb tl_fsys tl_inc NULL -tl tools\source\datetime nmake - all tl_dat tl_fsys tl_inc NULL -tl tools\source\stream nmake - all tl_str tl_fsys tl_inc NULL -tl tools\source\rc nmake - all tl_rc tl_fsys tl_inc NULL -tl tools\source\ref nmake - all tl_ref tl_fsys tl_inc NULL -tl tools\source\fsys nmake - all tl_fsys tl_inc NULL -tl tools\source\zcodec nmake - all tl_zco tl_fsys tl_inc NULL -tl tools\source\communi nmake - all tl_com tl_fsys tl_inc NULL -tl tools\source\inet nmake - all tl_inet tl_fsys tl_inc NULL -tl tools\source\string nmake - all tl_string tl_fsys tl_inc NULL -tl tools\source\misc nmake - all tl_misc tl_inc NULL -tl tools\win\source\dll nmake - w tl_dllw tl_inc NULL -tl tools\os2\source\dll nmake - p tl_dllp tl_inc NULL -tl tools\unx\source\dll nmake - u tl_dllu tl_inc NULL -tl tools\util nmake - all tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL -tl tools\bootstrp nmake - all tl_bstrp tl_utl tl_inc NULL -tl tools\bootstrp\addexes2 nmake - all tl_bsexes2 tl_bstrp tl_inc NULL - +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/gbuild.lst b/tools/prj/gbuild.lst deleted file mode 100644 index 3194cbb4e87c..000000000000 --- a/tools/prj/gbuild.lst +++ /dev/null @@ -1,3 +0,0 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\prj nmake - all tl_prj NULL -- cgit From 74284c8e763f19cd9f7891c5c836e0a53abf06b3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 20 Jul 2010 16:48:23 +0200 Subject: CWS gnumake2: using GNUMAKE variable from configure --- tools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 93a3eed87acd6581f851ff92a3332de8e0ff8c29 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Jul 2010 12:48:45 +0200 Subject: gnumake2: some more checks for module makefiles --- tools/Makefile | 10 +++++++++- tools/prj/makefile.mk | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 6f339a64fa98a3517dca2f6aae8bbe2b176382aa Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 26 Jul 2010 17:26:37 +0200 Subject: gnumake2: fixing rscdep on windows, delivering manifests for executables on windows --- tools/Executable_rscdep.mk | 1 + tools/bootstrp/rscdep.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 20f4d22b186c..3f3a283da65b 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ + gnu_getopt \ kernel32 \ user32 \ msvcrt \ diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index 37edfc6a8c18..9eddce53a678 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -80,7 +80,7 @@ void RscHrcDep::Execute() //static String aDelim; -SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) +int main( int argc, char** argv ) { int c; char aBuf[255]; -- cgit From c240e18cddbef2bc3eda6210e02b9dc274b59728 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 Aug 2010 16:32:43 +0200 Subject: gnumake2: added static ooopathutils lib --- tools/Module_tools.mk | 3 +-- tools/StaticLibrary_ooopathutils.mk | 51 +++++++++++++++++++++++++++++++++++++ tools/source/misc/pathutils.cxx | 1 - 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100755 tools/StaticLibrary_ooopathutils.mk (limited to 'tools') diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk index 447aba59cb50..bba1d8240cdf 100644 --- a/tools/Module_tools.mk +++ b/tools/Module_tools.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,tools,\ Executable_sspretty \ Library_tl \ Package_inc \ + StaticLibrary_ooopathutils \ )) # TODO: @@ -45,8 +46,6 @@ $(eval $(call gb_Module_add_targets,tools,\ #COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a #COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a #COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib -#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj -#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj #todo: link tools dynamically everywhere #todo: ALWAYSDBGFLAG etc. diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk new file mode 100755 index 000000000000..914b478345d7 --- /dev/null +++ b/tools/StaticLibrary_ooopathutils.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) + +$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ + tools/source/misc/pathutils \ +)) + + +# HACK for now +define StaticLibrary_ooopathutils_hack +$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) + +$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) + cp -f $$< $$@ + +endef + +ifeq ($(OS),WNT) +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.obj)) +else +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.o)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx index 397bade136e7..4685f96ca187 100644 --- a/tools/source/misc/pathutils.cxx +++ b/tools/source/misc/pathutils.cxx @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "precompiled_tools.hxx" #include "sal/config.h" #if defined WNT -- cgit From acbb009ba0992ec4ad4c9848c0b0ac9ee81effa4 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Thu, 2 Sep 2010 15:13:41 +0200 Subject: gnumake2: move make 3.81 check into configure --- tools/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 3225bc97e12c..c19100ee9a5b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,10 +25,6 @@ # #************************************************************************* -ifneq ($(MAKE_VERSION),3.81) -$(error You need at least GNU Make 3.81!) -endif - ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif -- cgit From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- tools/Package_inc.mk | 6 -- tools/inc/bootstrp/prj.hxx | 184 --------------------------------------------- tools/prj/d.lst | 99 ------------------------ 3 files changed, 289 deletions(-) (limited to 'tools') diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index 5deb59a7b0da..27088fd06a48 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -27,12 +27,9 @@ $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) @@ -40,9 +37,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) @@ -103,7 +98,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index a6ef7338472b..4b1ff91feb7b 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -55,188 +55,4 @@ public: ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -<<<<<<< local -======= -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 -#define ENV_OUTPATH 0x00000010 -#define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 -#define ENV_CPUNAME 0x00000400 -#define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 -#define ENV_COMPATH 0x00002000 -#define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 -#define ENV_SOLROOT 0x00080000 -#define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 - -/********************************************************************* -* -* class Prj -* alle Daten eines Projektes werden hier gehalten -* -*********************************************************************/ - -DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * ) - -class Star; -class Prj : public PrjList -{ -friend class Star; -private: - BOOL bVisited; - - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; - -public: - Prj(); - Prj( ByteString aName ); - ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() - {return aProjectName;} - void SetProjectName(ByteString aName) - {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) - { return GetDirectoryData( aLogFileName ); }; - - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } -}; - -/********************************************************************* -* -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus -* -*********************************************************************/ - -DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) -DECLARE_LIST ( SolarFileList, String* ) - -class StarFile -{ -private: - String aFileName; - Date aDate; - Time aTime; - - BOOL bExists; - -public: - StarFile( const String &rFile ); - const String &GetName() { return aFileName; } - Date GetDate() { return aDate; } - Time GetTime() { return aTime; } - - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } -}; - -DECLARE_LIST( StarFileList, StarFile * ) - -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 - -class Star : public StarList -{ -private: - ByteString aStarName; - - static Link aDBNotFoundHdl; -protected: - vos:: OMutex aMutex; - - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; - - void InsertSolarList( String sProject ); - String CreateFileName( String sProject ); - - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - -private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); - -public: - Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - ~Star(); - - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - - ByteString GetName(){ return aStarName; }; - - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); - - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); - - USHORT GetMode() { return nStarMode; } -}; - -class StarWriter : public Star -{ -private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); - -public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - void CleanUp(); - - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); - - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); - - void InsertTokenLine( ByteString& rString ); -}; - ->>>>>>> other #endif diff --git a/tools/prj/d.lst b/tools/prj/d.lst index a8e08784f199..1c0b5271071d 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -8,107 +8,8 @@ mkdir: %_DEST%\inc%_EXT%\tools ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -<<<<<<< local ..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h ..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx -======= -..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx -..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx -..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx -..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx -..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx -..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx - -..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h -..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx -..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h - -..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h -..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h - -..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h -..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h - -..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx -..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx -..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx -..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx -..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx -..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx -..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx -..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx -..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx -..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx -..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx -..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx -..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx -..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx -..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx -..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx -..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h -..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx -..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx -..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx -..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx -..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx -..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx -..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx -..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx -..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx -..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx -..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx -..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx -..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx -..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx -..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx -..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx -..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx -..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx -..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx -..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h -..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h -..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx -..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx -..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h -..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx -..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h -..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx -..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx -..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx -..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx -..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx -..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx -..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx -..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx -..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h -..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx -..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx -..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx -..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h -..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx -..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx -..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx -..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h -..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx -..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx -..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx -..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx -..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx -..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx -..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx -..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx -..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx -..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx -..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx -..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx -..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx -..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx -..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx -..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx -..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx -..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx -..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx ->>>>>>> other ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep -- cgit From 43f3c543a5421b6e8db127818088433ac34a87bc Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 10 Nov 2010 15:26:03 +0100 Subject: gnumake2: first try at local build dirs --- tools/Makefile | 1 + tools/prj/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index c19100ee9a5b..45de5eecabc0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif +gb_PARTITIALBUILD := T include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 3b1b54d4357f..3d495209d74a 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install -- cgit From 7db4aad0c12b0a5646d0c5d3be6ebaed942a1bb9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 11 Nov 2010 00:37:05 +0100 Subject: gnumake2: fixing module makefile --- tools/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 45de5eecabc0..b7391a8db240 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -30,10 +30,9 @@ $(error No environment set!) endif gb_PARTITIALBUILD := T -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) # vim: set noet sw=4 ts=4: -- cgit From 0fb5c9ef69c9913f2a610437f7244da1a2f36cbc Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 11 Nov 2010 15:46:29 +0100 Subject: gnumake2: fix naming for partial build vars --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index b7391a8db240..5002d3f122a1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif -gb_PARTITIALBUILD := T +gb_PARTIALBUILD := T GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -- cgit From 61c3e02187368b2dfcc91fa9a443f4fc2270300a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 17 Nov 2010 14:33:18 +0100 Subject: gnumake2: updated license headers --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 5002d3f122a1..a79aff831024 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -- cgit From caaac3582b0c20195ca80d989105dc11a4908425 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 17 Nov 2010 14:43:40 +0100 Subject: gnumake2: updated license headers --- tools/Module_tools.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'tools') diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk index bba1d8240cdf..9e233408b317 100644 --- a/tools/Module_tools.mk +++ b/tools/Module_tools.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,17 +14,18 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # #************************************************************************* + $(eval $(call gb_Module_Module,tools)) $(eval $(call gb_Module_add_targets,tools,\ @@ -37,17 +38,4 @@ $(eval $(call gb_Module_add_targets,tools,\ StaticLibrary_ooopathutils \ )) -# TODO: -#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib -#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib -#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib -#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a -#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a -#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a -#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a -#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib - -#todo: link tools dynamically everywhere -#todo: ALWAYSDBGFLAG etc. - # vim: set noet sw=4 ts=4: -- cgit From bcb92b923a2bc7656c5fb0d9f261385c0cf94907 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 17 Nov 2010 14:55:19 +0100 Subject: gnumake2: updated license headers --- tools/Executable_mkunroll.mk | 2 +- tools/Executable_rscdep.mk | 2 +- tools/Executable_so_checksum.mk | 2 +- tools/Executable_sspretty.mk | 2 +- tools/Library_tl.mk | 2 +- tools/Package_inc.mk | 2 +- tools/StaticLibrary_ooopathutils.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 4ee724d8ffc0..e08a83bb651c 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 3f3a283da65b..244e5fdc9bd7 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index d852c22ef5de..4498f3e29abc 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk index 5b8c83977dcd..5f5ab4e98f4f 100644 --- a/tools/Executable_sspretty.mk +++ b/tools/Executable_sspretty.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 48abccd4bf85..0e327527bef0 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index 27088fd06a48..bd1b72d9908a 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 914b478345d7..5eac00c4193c 100755 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -- cgit From 0a33b085ad71bbd5df1b89f6fd852c601bf79f26 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 19 Nov 2010 11:47:42 +0100 Subject: gnumake2: clean up d.lst of switched modules; fix svl/Package_inc.mk --- tools/prj/d.lst | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'tools') diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 1c0b5271071d..e69de29bb2d1 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,20 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\tools - -..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% -..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll -..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym -..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib - -..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h -..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx - -..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe -..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep -..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe -..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum - -..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj -..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj -- cgit From dcec10a0b731fac660456e889997f35245e08954 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 19 Nov 2010 17:14:27 +0100 Subject: gnumake2: last bunch of missing headers --- tools/Package_inc.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index bd1b72d9908a..d1026b05a43c 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -26,8 +26,8 @@ #************************************************************************* $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) @@ -87,15 +87,17 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) @@ -106,4 +108,3 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbas $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) -- cgit From c8e2c920be9958a3f211a983d2c88bac6ea351c3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 21:45:41 +0100 Subject: gnumake2: removing old dmake file in migrated modules --- tools/bootstrp/addexes/makefile.mk | 49 ---------- tools/bootstrp/addexes2/makefile.mk | 56 ----------- tools/bootstrp/makefile.mk | 96 ------------------- tools/inc/makefile.mk | 48 ---------- tools/os2/source/dll/makefile.mk | 46 --------- tools/qa/makefile.mk | 52 ----------- tools/source/communi/makefile.mk | 50 ---------- tools/source/datetime/makefile.mk | 50 ---------- tools/source/debug/makefile.mk | 53 ----------- tools/source/fsys/makefile.mk | 67 -------------- tools/source/generic/makefile.mk | 71 -------------- tools/source/inet/makefile.mk | 45 --------- tools/source/makefile.mk | 58 ------------ tools/source/memtools/makefile.mk | 56 ----------- tools/source/misc/makefile.mk | 47 ---------- tools/source/rc/makefile.mk | 53 ----------- tools/source/ref/makefile.mk | 53 ----------- tools/source/stream/makefile.mk | 58 ------------ tools/source/string/makefile.mk | 79 ---------------- tools/source/testtoolloader/makefile.mk | 45 --------- tools/source/zcodec/makefile.mk | 47 ---------- tools/test/makefile.mk | 65 ------------- tools/unx/source/dll/makefile.mk | 48 ---------- tools/util/makefile.mk | 159 -------------------------------- tools/win/source/dll/makefile.mk | 56 ----------- tools/workben/makefile.mk | 89 ------------------ 26 files changed, 1596 deletions(-) delete mode 100644 tools/bootstrp/addexes/makefile.mk delete mode 100644 tools/bootstrp/addexes2/makefile.mk delete mode 100644 tools/bootstrp/makefile.mk delete mode 100644 tools/inc/makefile.mk delete mode 100644 tools/os2/source/dll/makefile.mk delete mode 100644 tools/qa/makefile.mk delete mode 100644 tools/source/communi/makefile.mk delete mode 100644 tools/source/datetime/makefile.mk delete mode 100644 tools/source/debug/makefile.mk delete mode 100644 tools/source/fsys/makefile.mk delete mode 100644 tools/source/generic/makefile.mk delete mode 100644 tools/source/inet/makefile.mk delete mode 100644 tools/source/makefile.mk delete mode 100644 tools/source/memtools/makefile.mk delete mode 100644 tools/source/misc/makefile.mk delete mode 100644 tools/source/rc/makefile.mk delete mode 100644 tools/source/ref/makefile.mk delete mode 100644 tools/source/stream/makefile.mk delete mode 100644 tools/source/string/makefile.mk delete mode 100644 tools/source/testtoolloader/makefile.mk delete mode 100644 tools/source/zcodec/makefile.mk delete mode 100644 tools/test/makefile.mk delete mode 100644 tools/unx/source/dll/makefile.mk delete mode 100644 tools/util/makefile.mk delete mode 100644 tools/win/source/dll/makefile.mk delete mode 100644 tools/workben/makefile.mk (limited to 'tools') diff --git a/tools/bootstrp/addexes/makefile.mk b/tools/bootstrp/addexes/makefile.mk deleted file mode 100644 index 324de9479502..000000000000 --- a/tools/bootstrp/addexes/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=addexes -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS+=-D_TOOLS_STRINGLIST - -# --- Files -------------------------------------------------------- - -APP1TARGET= txtrepl -APP1OBJS= $(OBJ)$/replace.obj -APP1STDLIBS=$(TOOLSLIB) - -DEPOBJFILES = $(APP1OBJS) -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk deleted file mode 100644 index 7e4d3d0da7fa..000000000000 --- a/tools/bootstrp/addexes2/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=addexes2 -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -APP1TARGET= mkunroll -APP1OBJS= $(OBJ)$/mkfilt.obj -APP1STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) -.IF "$(OS)"=="LINUX" -APP1STDLIBS+=-lpthread -.ENDIF -.IF "$(OS)"=="NETBSD" -APP1STDLIBS+=-lpthread -.ENDIF -APP1LIBS= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib -APP1DEPN= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib - - -DEPOBJFILES = $(APP1OBJS) -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk deleted file mode 100644 index 3db493cbe162..000000000000 --- a/tools/bootstrp/makefile.mk +++ /dev/null @@ -1,96 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=tools -TARGET=btstrp -TARGET1=bootstrp2 -TARGETTYPE=CUI -LIBTARGET=NO -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS+=-D_TOOLS_STRINGLIST - -.IF "$(HAVE_GETOPT)" == "YES" -CDEFS += -DHAVE_GETOPT -.ENDIF - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/appdef.obj \ - $(OBJ)$/cppdep.obj\ - $(OBJ)$/inimgr.obj - -SLOFILES= \ - $(SLO)$/appdef.obj \ - $(SLO)$/cppdep.obj \ - $(SLO)$/inimgr.obj - -LIB1TARGET= $(LB)$/$(TARGET).lib -LIB1ARCHIV= $(LB)$/lib$(TARGET).a -LIB1OBJFILES=\ - $(OBJ)$/appdef.obj \ - $(OBJ)$/cppdep.obj \ - $(OBJ)$/inimgr.obj - -LIB2TARGET= $(LB)$/$(TARGET1).lib -LIB2ARCHIV= $(LB)$/lib$(TARGET1).a -LIB2OBJFILES=\ - $(OBJ)$/prj.obj - -APP1TARGET= sspretty -APP1OBJS= $(OBJ)$/sspretty.obj -APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib -APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) - -APP2TARGET= rscdep -APP2OBJS= $(OBJ)$/rscdep.obj -APP2LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib -APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) -.IF "$(HAVE_GETOPT)" != "YES" -.IF "$(OS)"=="WNT" -APP2STDLIBS+=gnu_getopt.lib -.ENDIF -.ENDIF -APP2RPATH= NONE -APP2RPATH= NONE -APP2RPATH= NONE - -APP3TARGET= so_checksum -APP3OBJS= $(OBJ)$/md5.obj \ - $(OBJ)$/so_checksum.obj -APP3STDLIBS= $(TOOLSLIB) $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) - -DEPOBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/inc/makefile.mk b/tools/inc/makefile.mk deleted file mode 100644 index a3a76dc94a11..000000000000 --- a/tools/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=tools -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/tools/os2/source/dll/makefile.mk b/tools/os2/source/dll/makefile.mk deleted file mode 100644 index 97cff795defb..000000000000 --- a/tools/os2/source/dll/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=TOOLS -TARGET=dll - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -CXXFILES= toolsdll.cxx - -SLOFILES= $(SLO)$/toolsdll.obj - -OBJFILES= $(OBJ)$/toolsdll.obj -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk deleted file mode 100644 index abaea848c1db..000000000000 --- a/tools/qa/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = .. -PRJNAME = tools -TARGET = qa -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE: settings.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files - -SHL1TARGET = test_pathutils -SHL1OBJS = $(SLO)$/test_pathutils.obj $(SLO)$/pathutils.obj -SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) -SHL1VERSIONMAP = version.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk - -ALLTAR: test - -test .PHONY: $(SHL1TARGETN) - $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb diff --git a/tools/source/communi/makefile.mk b/tools/source/communi/makefile.mk deleted file mode 100644 index 1795081a9ec5..000000000000 --- a/tools/source/communi/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=TOOLS -TARGET=communi - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/parser.obj \ - $(OBJ)$/geninfo.obj \ - -SLOFILES= \ - $(SLO)$/parser.obj \ - $(SLO)$/geninfo.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/datetime/makefile.mk b/tools/source/datetime/makefile.mk deleted file mode 100644 index 3d46cc6ce1b0..000000000000 --- a/tools/source/datetime/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=datetime - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/tdate.obj \ - $(SLO)$/ttime.obj \ - $(SLO)$/datetime.obj - -OBJFILES= $(OBJ)$/tdate.obj \ - $(OBJ)$/ttime.obj \ - $(OBJ)$/datetime.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/debug/makefile.mk b/tools/source/debug/makefile.mk deleted file mode 100644 index 925ae90f333d..000000000000 --- a/tools/source/debug/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=debug - -ENABLE_EXCEPTIONS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CXXFILES= debug.cxx \ - stcktree.cxx - -SLOFILES= $(SLO)$/debug.obj \ - $(SLO)$/stcktree.obj - -OBJFILES= $(OBJ)$/debug.obj \ - $(OBJ)$/stcktree.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/fsys/makefile.mk b/tools/source/fsys/makefile.mk deleted file mode 100644 index b1d34d6347f3..000000000000 --- a/tools/source/fsys/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=fsys -ENABLE_EXCEPTIONS=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.IF "$(COM)"=="GCC" -CFLAGSCXX+=-fexceptions -.ENDIF - - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/tempfile.obj \ - $(SLO)$/wldcrd.obj \ - $(SLO)$/fstat.obj \ - $(SLO)$/comdep.obj \ - $(SLO)$/filecopy.obj \ - $(SLO)$/dirent.obj \ - $(SLO)$/tdir.obj \ - $(SLO)$/urlobj.obj - -OBJFILES= $(OBJ)$/wldcrd.obj \ - $(OBJ)$/fstat.obj \ - $(OBJ)$/comdep.obj \ - $(OBJ)$/filecopy.obj \ - $(OBJ)$/dirent.obj \ - $(OBJ)$/tdir.obj \ - $(OBJ)$/urlobj.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/tools/source/generic/makefile.mk b/tools/source/generic/makefile.mk deleted file mode 100644 index 07bab82f32b0..000000000000 --- a/tools/source/generic/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=gen - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = $(SLO)$/poly.obj $(OBJ)$/poly.obj $(SLO)$/svlibrary.obj - -SLOFILES= $(SLO)$/toolsin.obj \ - $(SLO)$/svlibrary.obj \ - $(SLO)$/b3dtrans.obj \ - $(SLO)$/link.obj \ - $(SLO)$/bigint.obj \ - $(SLO)$/fract.obj \ - $(SLO)$/color.obj \ - $(SLO)$/gen.obj \ - $(SLO)$/config.obj \ - $(SLO)$/poly.obj \ - $(SLO)$/poly2.obj \ - $(SLO)$/svborder.obj \ - $(SLO)$/line.obj - -OBJFILES= $(OBJ)$/toolsin.obj \ - $(OBJ)$/b3dtrans.obj \ - $(OBJ)$/link.obj \ - $(OBJ)$/bigint.obj \ - $(OBJ)$/fract.obj \ - $(OBJ)$/color.obj \ - $(OBJ)$/gen.obj \ - $(OBJ)$/config.obj \ - $(OBJ)$/poly.obj \ - $(OBJ)$/poly2.obj \ - $(OBJ)$/svborder.obj \ - $(OBJ)$/line.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/inet/makefile.mk b/tools/source/inet/makefile.mk deleted file mode 100644 index 1e0bdfdd2391..000000000000 --- a/tools/source/inet/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = tools -TARGET = inet - -.INCLUDE: settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -SLOFILES=\ - $(SLO)$/inetmime.obj \ - $(SLO)$/inetmsg.obj \ - $(SLO)$/inetstrm.obj - -OBJFILES=\ - $(OBJ)$/inetmime.obj \ - $(OBJ)$/inetmsg.obj \ - $(OBJ)$/inetstrm.obj - -.INCLUDE: target.mk diff --git a/tools/source/makefile.mk b/tools/source/makefile.mk deleted file mode 100644 index 8c3f3167635e..000000000000 --- a/tools/source/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -TARGET=source - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(GUI)" == "UNX" -SUBDIRS+= solar -.ENDIF - -SUBDIRS+= \ - datetime \ - timestamp \ - debug \ - fsys \ - generic \ - intntl \ - memtools \ - misc \ - rc \ - ref \ - stream \ - zcodec - - -.INCLUDE : target.mk - diff --git a/tools/source/memtools/makefile.mk b/tools/source/memtools/makefile.mk deleted file mode 100644 index de03a0d50cc3..000000000000 --- a/tools/source/memtools/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=mtools - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/contnr.obj \ - $(SLO)$/table.obj \ - $(SLO)$/unqidx.obj \ - $(SLO)$/mempool.obj \ - $(SLO)$/multisel.obj - -EXCEPTIONSFILES= $(SLO)$/multisel.obj $(OBJ)$/multisel.obj - -OBJFILES= $(OBJ)$/contnr.obj \ - $(OBJ)$/table.obj \ - $(OBJ)$/unqidx.obj \ - $(OBJ)$/mempool.obj \ - $(OBJ)$/multisel.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk deleted file mode 100644 index a426bb4053c3..000000000000 --- a/tools/source/misc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = tools -TARGET = misc -LIBTARGET = NO -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE: settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -LIB1TARGET = $(SLB)$/$(TARGET).lib -LIB1OBJFILES = \ - $(SLO)$/appendunixshellword.obj \ - $(SLO)$/extendapplicationenvironment.obj \ - $(SLO)$/solarmutex.obj \ - $(SLO)$/getprocessworkingdir.obj - -OBJFILES = $(OBJ)$/pathutils.obj -SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES) $(SLO)$/solarmutex.obj - -.INCLUDE: target.mk diff --git a/tools/source/rc/makefile.mk b/tools/source/rc/makefile.mk deleted file mode 100644 index f8b46f38a0f7..000000000000 --- a/tools/source/rc/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=rc -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/rc.obj \ - $(SLO)$/isofallback.obj \ - $(SLO)$/resmgr.obj \ - $(SLO)$/resary.obj - -OBJFILES= $(OBJ)$/rc.obj \ - $(OBJ)$/isofallback.obj \ - $(OBJ)$/resmgr.obj \ - $(OBJ)$/resary.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/ref/makefile.mk b/tools/source/ref/makefile.mk deleted file mode 100644 index c87f8a740a4f..000000000000 --- a/tools/source/ref/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=ref -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/ref.obj \ - $(SLO)$/pstm.obj \ - $(SLO)$/globname.obj \ - $(SLO)$/errinf.obj - -OBJFILES= $(OBJ)$/ref.obj \ - $(OBJ)$/pstm.obj \ - $(OBJ)$/globname.obj \ - $(OBJ)$/errinf.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/stream/makefile.mk b/tools/source/stream/makefile.mk deleted file mode 100644 index ee548934c6c6..000000000000 --- a/tools/source/stream/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=stream - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/stream.obj \ - $(SLO)$/strmsys.obj \ - $(SLO)$/cachestr.obj \ - $(SLO)$/vcompat.obj - -OBJFILES+= $(OBJ)$/stream.obj \ - $(OBJ)$/strmsys.obj \ - $(OBJ)$/cachestr.obj \ - $(OBJ)$/vcompat.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SLO)$/strmsys.obj : \ - strmwnt.cxx \ - strmos2.cxx \ - strmunx.cxx - diff --git a/tools/source/string/makefile.mk b/tools/source/string/makefile.mk deleted file mode 100644 index 4caa31672472..000000000000 --- a/tools/source/string/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=str - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -ALWAYSDBGFILES = $(SLO)$/debugprint.obj - -.IF "$(ALWAYSDBGFILES)" != "" -ALWAYSDBGTARGET=do_it_alwaysdebug -.ENDIF - -SLOFILES= $(SLO)$/tstring.obj \ - $(SLO)$/tustring.obj \ - $(SLO)$/tenccvt.obj \ - $(SLO)$/debugprint.obj - -OBJFILES= $(OBJ)$/tstring.obj \ - $(OBJ)$/tustring.obj \ - $(OBJ)$/tenccvt.obj \ - $(OBJ)$/debugprint.obj - -# --- Targets ------------------------------------------------------ - -.IF "$(ALWAYSDBG_FLAG)"=="" -TARGETDEPS+=$(ALWAYSDBGTARGET) -.ENDIF - -.INCLUDE : target.mk - -.IF "$(ALWAYSDBGTARGET)" != "" -.IF "$(ALWAYSDBG_FLAG)" == "" -# -------------------------------------------------- -# - ALWAYSDBG - files always compiled with debugging -# -------------------------------------------------- -$(ALWAYSDBGTARGET): - @echo --- ALWAYSDBGFILES --- - @dmake $(MFLAGS) $(MAKEFILE) debug=true $(ALWAYSDBGFILES) ALWAYSDBG_FLAG=TRUE $(CALLMACROS) - @echo --- ALWAYSDBGFILES OVER --- - -$(ALWAYSDBGFILES): - @echo --- ALWAYSDBG --- - @dmake $(MFLAGS) $(MAKEFILE) debug=true ALWAYSDBG_FLAG=TRUE $(CALLMACROS) $@ - @echo --- ALWAYSDBG OVER --- -.ENDIF -.ENDIF diff --git a/tools/source/testtoolloader/makefile.mk b/tools/source/testtoolloader/makefile.mk deleted file mode 100644 index 3d5cb8223e3f..000000000000 --- a/tools/source/testtoolloader/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=TOOLS -TARGET=testtoolloader - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/testtoolloader.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/source/zcodec/makefile.mk b/tools/source/zcodec/makefile.mk deleted file mode 100644 index 9067b45c3b5d..000000000000 --- a/tools/source/zcodec/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=zcodec - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF -SLOFILES= $(SLO)$/zcodec.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk deleted file mode 100644 index ab2cfd8e6676..000000000000 --- a/tools/test/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=tools -TARGET=tests - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# --- Common ---------------------------------------------------------- - -SHL1OBJS= \ - $(SLO)$/tests.obj - -SHL1TARGET= tests -SHL1STDLIBS= $(SALLIB) \ - $(TOOLSLIB) \ - $(TESTSHL2LIB) \ - $(CPPUNITLIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map - -#------------------------------- All object files ---------------------------- - -# do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk diff --git a/tools/unx/source/dll/makefile.mk b/tools/unx/source/dll/makefile.mk deleted file mode 100644 index da1d73f04682..000000000000 --- a/tools/unx/source/dll/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=TOOLS -TARGET=dll - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -CXXFILES= toolsdll.cxx - -SLOFILES= $(SLO)$/toolsdll.obj - -OBJFILES= $(OBJ)$/toolsdll.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk deleted file mode 100644 index 735b5380614d..000000000000 --- a/tools/util/makefile.mk +++ /dev/null @@ -1,159 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=TOOLS -TARGET=tools -ENABLE_EXCEPTIONS=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------- - -# --- STDSTRM.LIB --- -#LIB3TARGET= $(LB)$/stdstrm.lib -#LIB3ARCHIV= $(LB)$/libstdstrm.a -#LIB3FILES= $(LB)$/stream.lib - -#LIB7TARGET= $(LB)$/a$(TARGET).lib -#LIB7ARCHIV= $(LB)$/liba$(TARGET).a -#LIB7FILES= $(LB)$/gen.lib \ -# $(LB)$/str.lib \ -# $(LB)$/mtools.lib \ -# $(LB)$/datetime.lib \ -# $(LB)$/fsys.lib \ -# $(LB)$/communi.lib \ -# $(LB)$/stream.lib \ -# $(LB)$/ref.lib \ -# $(LB)$/rc.lib \ -# $(LB)$/inet.lib \ -# $(LB)$/debug.lib -# -#LIB7FILES+= $(LB)$/dll.lib - -# --- TOOLS.LIB --- -LIB1TARGET:= $(SLB)$/$(TARGET).lib -LIB1FILES+= \ - $(SLB)$/gen.lib \ - $(SLB)$/str.lib \ - $(SLB)$/mtools.lib \ - $(SLB)$/datetime.lib \ - $(SLB)$/fsys.lib \ - $(SLB)$/communi.lib \ - $(SLB)$/stream.lib \ - $(SLB)$/ref.lib \ - $(SLB)$/rc.lib \ - $(SLB)$/debug.lib \ - $(SLB)$/zcodec.lib \ - $(SLB)$/inet.lib \ - $(SLB)$/testtoolloader.lib \ - $(SLB)$/misc.lib - -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += $(CPPULIB) \ - $(ZLIB3RDLIB) -.ELSE -SHL1STDLIBS += $(ZLIB3RDLIB) \ - $(CPPULIB) -.ENDIF - -LIB1FILES+= $(SLB)$/dll.lib - -# --- TOOLS.DLL --- - -SHL1TARGET= tl$(DLLPOSTFIX) -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1IMPLIB= itools -SHL1USE_EXPORTS=name -SHL1STDLIBS+= $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(COMPHELPERLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(SHELL32LIB) \ - $(MPRLIB) \ - $(OLE32LIB) \ - $(UUIDLIB) \ - $(ADVAPI32LIB) -.ENDIF - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN = \ - $(MISC)$/$(SHL1TARGET).flt \ - $(HXX1FILES) \ - $(HXX2FILES) \ - $(HXX3FILES) \ - $(HXX4FILES) \ - $(HXX5FILES) \ - $(HXX6FILES) \ - $(HXX7FILES) \ - $(HXX8FILES) \ - $(HXX9FILES) \ - $(HXX10FILES) \ - $(HXX11FILES) \ - $(HXX12FILES) \ - $(HXX13FILES) \ - $(HXX14FILES) \ - $(HXX15FILES) \ - $(HXX16FILES) \ - $(HXX17FILES) \ - $(HXX18FILES) \ - $(HXX19FILES) \ - $(HXX20FILES) \ - makefile.mk - -DEFLIB1NAME =tools - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -# --- TOOLS.FLT --- -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo Imp>$@ - @echo PointerList>>$@ - @echo DbgCheck>>$@ - @echo LabelList>>$@ - @echo ActionList>>$@ - @echo CBlock>>$@ - @echo DirEntryStack>>$@ - @echo readdir>>$@ - @echo closedir>>$@ - @echo opendir>>$@ - @echo volumeid>>$@ - @echo MsDos2Time>>$@ - @echo MsDos2Date>>$@ - @echo __new_alloc>>$@ - @echo __CT>>$@ - @echo unnamed>>$@ -.IF "$(COM)"=="BLC" - @echo WEP>>$@ -.ENDIF diff --git a/tools/win/source/dll/makefile.mk b/tools/win/source/dll/makefile.mk deleted file mode 100644 index 403da065d653..000000000000 --- a/tools/win/source/dll/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=TOOLS -TARGET=dll - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- WNT ---------------------------------------------------------- - -.IF "$(GUI)" == "WNT" - -# --- Files -------------------------------------------------------- - -CXXFILES= toolsdll.cxx - -SLOFILES= $(SLO)$/toolsdll.obj - -OBJFILES= $(OBJ)$/toolsdll.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ENDIF - diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk deleted file mode 100644 index 73d5753fe233..000000000000 --- a/tools/workben/makefile.mk +++ /dev/null @@ -1,89 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = .. -PRJNAME = tl -TARGET = tldem -LIBTARGET = NO -TARGETTYPE = CUI -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE: settings.mk - -OBJFILES = \ - $(OBJ)$/solar.obj \ - $(OBJ)$/urltest.obj \ - $(OBJ)$/inetmimetest.obj -# $(OBJ)$/demostor.obj \ -# $(OBJ)$/fstest.obj \ -# $(OBJ)$/tldem.obj \ - -APP1TARGET = solar -APP1OBJS = $(OBJ)$/solar.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" -APP1STDLIBS = $(TOOLSLIB) -.ELSE -APP1LIBS = $(LB)$/itools.lib -.ENDIF - -APP2TARGET = urltest -APP2OBJS = $(OBJ)$/urltest.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" -APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) -.ELSE -APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) -.ENDIF - -APP3TARGET = inetmimetest -APP3OBJS = $(OBJ)$/inetmimetest.obj -APP3STDLIBS = $(SALLIB) $(TOOLSLIB) - -# APP3TARGET = tldem -# APP3OBJS = $(OBJ)$/tldem.obj -# .IF "$(GUI)" == "UNX" -# APP3STDLIBS = $(TOOLSLIB) -# .ELSE -# APP3STDLIBS = $(LB)$/itools.lib -# .ENDIF - -# APP4TARGET = demostor -# APP4OBJS = $(OBJ)$/demostor.obj -# .IF "$(GUI)" == "UNX" -# APP4STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) -# .ELSE -# APP4STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) -# .ENDIF - -# APP5TARGET = fstest -# APP5OBJS = $(OBJ)$/fstest.obj -# .IF "$(GUI)" == "UNX" -# APP5STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) -# .ELSE -# APP5STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) -# .ENDIF - -.INCLUDE: target.mk -- cgit From 7c69e9471c4985a24a1d6957245ee58ec1eed6ea Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 22 Nov 2010 13:40:19 +0100 Subject: gnumake2: getting rid of obsolete install and uninstall targets --- tools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 3d495209d74a..3b1b54d4357f 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From ae831144a3de6f721547bbce87a542cd8eb69b99 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 23 Nov 2010 14:24:46 +0100 Subject: gnumake2: enable packmodule in setsolar mws builds --- tools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 3b1b54d4357f..c73a3d944bbf 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) -- cgit From e16777656a71ae48b0d9d9e87b035018ff1f20ee Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Nov 2010 15:28:37 +0100 Subject: gnumake2: fix for really ugly pathutils hack to register delivered object in for gb_deliver.log --- tools/StaticLibrary_ooopathutils.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 5eac00c4193c..a5b12532c60b 100755 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -35,11 +35,14 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ # HACK for now +# We really should fix the clients of this to link against the static library +# Instead of this evil linking of an object from $(OUTDIR) define StaticLibrary_ooopathutils_hack $(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) +$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils))) $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) - cp -f $$< $$@ + $$(call gb_Deliver_deliver,$$<,$$@) endef -- cgit From 7c153ad4212964199f431c90ab521c3a8b550614 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 24 Nov 2010 22:30:09 +0100 Subject: gnumake2: using set_defs instead of set_cxxflags in library tl as we should --- tools/Library_tl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 0e327527bef0..35ed1b4af783 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -44,8 +44,8 @@ $(eval $(call gb_Library_set_include,tl,\ -I$(OUTDIR)/inc/stl \ )) -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_defs,tl,\ + $$(DEFS) \ -DSHARED_LIB \ -DTOOLS_DLLIMPLEMENTATION \ -DVCL \ -- cgit From d2e5e59c6b28235a832cdc06480e30f0ed96b580 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 26 Nov 2010 13:37:22 +0100 Subject: gnumake2: sorting all lists in makefiles --- tools/Executable_mkunroll.mk | 4 ++-- tools/Executable_rscdep.mk | 4 ++-- tools/Executable_so_checksum.mk | 4 ++-- tools/Executable_sspretty.mk | 4 ++-- tools/Package_inc.mk | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index e08a83bb651c..6a88e48f232a 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -60,17 +60,17 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ kernel32 \ - user32 \ msvcrt \ oldnames \ + user32 \ uwinapi \ )) endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - pthread \ dl \ + pthread \ )) endif diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 244e5fdc9bd7..d6f2c25a1763 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -58,17 +58,17 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ gnu_getopt \ kernel32 \ - user32 \ msvcrt \ oldnames \ + user32 \ uwinapi \ )) endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ - pthread \ dl \ + pthread \ )) endif # vim: set noet sw=4 ts=4: diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 4498f3e29abc..071f0c5bb7b0 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -53,17 +53,17 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ kernel32 \ - user32 \ msvcrt \ oldnames \ + user32 \ uwinapi \ )) endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - pthread \ dl \ + pthread \ )) endif # vim: set noet sw=4 ts=4: diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk index 5f5ab4e98f4f..0c83b7137eea 100644 --- a/tools/Executable_sspretty.mk +++ b/tools/Executable_sspretty.mk @@ -58,17 +58,17 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,sspretty,\ kernel32 \ - user32 \ msvcrt \ oldnames \ + user32 \ uwinapi \ )) endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,sspretty,\ - pthread \ dl \ + pthread \ )) endif # vim: set noet sw=4 ts=4: diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index d1026b05a43c..97d99653c312 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -26,6 +26,7 @@ #************************************************************************* $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) @@ -87,7 +88,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) @@ -96,8 +96,8 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfil $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) -- cgit From 550dd2b5017ddc6c37a27bc8f32cc1671507ee8b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 9 Dec 2010 16:05:29 +0100 Subject: gnumake2: #i105735# removed obsolete defines --- tools/Library_tl.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'tools') diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 35ed1b4af783..dde1f8f5dd92 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_include,tl,\ $(eval $(call gb_Library_set_defs,tl,\ $$(DEFS) \ - -DSHARED_LIB \ -DTOOLS_DLLIMPLEMENTATION \ -DVCL \ )) -- cgit