summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Executable_mkunroll.mk77
-rw-r--r--tools/Executable_rscdep.mk74
-rw-r--r--tools/Executable_so_checksum.mk69
-rw-r--r--tools/Executable_sspretty.mk74
-rw-r--r--tools/Library_tl.mk180
-rw-r--r--tools/Makefile (renamed from tools/unx/source/dll/makefile.mk)26
-rw-r--r--tools/Module_tools.mk (renamed from tools/os2/source/dll/makefile.mk)27
-rw-r--r--tools/Package_inc.mk110
-rwxr-xr-xtools/StaticLibrary_ooopathutils.mk54
-rw-r--r--tools/bootstrp/addexes/makefile.mk49
-rw-r--r--tools/bootstrp/addexes2/makefile.mk56
-rw-r--r--tools/bootstrp/command.cxx690
-rw-r--r--tools/bootstrp/makefile.mk108
-rw-r--r--tools/bootstrp/prj.cxx1438
-rw-r--r--tools/bootstrp/rscdep.cxx2
-rw-r--r--tools/bootstrp/sstring.cxx317
-rw-r--r--tools/inc/bootstrp/command.hxx163
-rw-r--r--tools/inc/bootstrp/listmacr.hxx60
-rw-r--r--tools/inc/bootstrp/mkcreate.hxx4
-rw-r--r--tools/inc/bootstrp/prj.hxx273
-rw-r--r--tools/inc/bootstrp/sstring.hxx105
-rw-r--r--tools/inc/makefile.mk48
-rw-r--r--tools/prj/build.lst33
-rw-r--r--tools/prj/d.lst124
-rw-r--r--tools/prj/makefile.mk (renamed from tools/source/inet/makefile.mk)25
-rw-r--r--tools/qa/makefile.mk52
-rw-r--r--tools/source/communi/makefile.mk50
-rw-r--r--tools/source/datetime/makefile.mk50
-rw-r--r--tools/source/debug/makefile.mk53
-rw-r--r--tools/source/fsys/makefile.mk67
-rw-r--r--tools/source/generic/makefile.mk71
-rw-r--r--tools/source/makefile.mk58
-rw-r--r--tools/source/memtools/makefile.mk56
-rw-r--r--tools/source/misc/makefile.mk47
-rw-r--r--tools/source/misc/pathutils.cxx1
-rw-r--r--tools/source/rc/makefile.mk53
-rw-r--r--tools/source/ref/makefile.mk53
-rw-r--r--tools/source/stream/makefile.mk58
-rw-r--r--tools/source/string/makefile.mk79
-rw-r--r--tools/source/testtoolloader/makefile.mk45
-rw-r--r--tools/source/zcodec/makefile.mk47
-rw-r--r--tools/test/makefile.mk65
-rw-r--r--tools/util/makefile.mk173
-rw-r--r--tools/win/inc/parser.hxx48
-rw-r--r--tools/win/inc/shellex.h115
-rw-r--r--tools/win/inc/shutil.h215
-rw-r--r--tools/win/inc/winshell.hxx386
-rw-r--r--tools/win/source/dll/makefile.mk56
-rw-r--r--tools/win/source/fastfsys/makefile.mk71
-rw-r--r--tools/workben/makefile.mk89
50 files changed, 678 insertions, 5566 deletions
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
new file mode 100644
index 000000000000..6a88e48f232a
--- /dev/null
+++ b/tools/Executable_mkunroll.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
+ dl \
+ pthread \
+))
+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..d6f2c25a1763
--- /dev/null
+++ b/tools/Executable_rscdep.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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,\
+ gnu_getopt \
+ kernel32 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+ dl \
+ pthread \
+))
+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..071f0c5bb7b0
--- /dev/null
+++ b/tools/Executable_so_checksum.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
+ dl \
+ pthread \
+))
+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..0c83b7137eea
--- /dev/null
+++ b/tools/Executable_sspretty.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,sspretty,\
+ dl \
+ pthread \
+))
+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..dde1f8f5dd92
--- /dev/null
+++ b/tools/Library_tl.mk
@@ -0,0 +1,180 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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_defs,tl,\
+ $$(DEFS) \
+ -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/generic/svlibrary \
+ 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/unx/source/dll/makefile.mk b/tools/Makefile
index da1d73f04682..a79aff831024 100644
--- a/tools/unx/source/dll/makefile.mk
+++ b/tools/Makefile
@@ -25,24 +25,14 @@
#
#*************************************************************************
-PRJ=..$/..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-PRJNAME=TOOLS
-TARGET=dll
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES= toolsdll.cxx
-
-SLOFILES= $(SLO)$/toolsdll.obj
-
-OBJFILES= $(OBJ)$/toolsdll.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/tools/os2/source/dll/makefile.mk b/tools/Module_tools.mk
index 97cff795defb..9e233408b317 100644
--- a/tools/os2/source/dll/makefile.mk
+++ b/tools/Module_tools.mk
@@ -25,22 +25,17 @@
#
#*************************************************************************
-PRJ=..$/..$/..
-PRJNAME=TOOLS
-TARGET=dll
+$(eval $(call gb_Module_Module,tools))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,tools,\
+ Executable_mkunroll \
+ Executable_rscdep \
+ Executable_so_checksum \
+ Executable_sspretty \
+ Library_tl \
+ Package_inc \
+ StaticLibrary_ooopathutils \
+))
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES= toolsdll.cxx
-
-SLOFILES= $(SLO)$/toolsdll.obj
-
-OBJFILES= $(OBJ)$/toolsdll.obj
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# 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..97d99653c312
--- /dev/null
+++ b/tools/Package_inc.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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/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))
+$(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/dynary.hxx,tools/dynary.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/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/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))
+$(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))
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
new file mode 100755
index 000000000000..a5b12532c60b
--- /dev/null
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -0,0 +1,54 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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
+# 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)
+ $$(call gb_Deliver_deliver,$$<,$$@)
+
+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/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
-# <http://www.openoffice.org/license.html>
-# 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 492d6f3105ed..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
-# <http://www.openoffice.org/license.html>
-# 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)$/atools.lib $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib
-
-
-DEPOBJFILES = $(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
deleted file mode 100644
index 2ab0cc8dc4a6..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
- * <http://www.openoffice.org/license.html>
- * 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 <tools/fsys.hxx>
-#include <tools/stream.hxx>
-#include "bootstrp/command.hxx"
-#include <tools/debug.hxx>
-#include "bootstrp/appdef.hxx"
-
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-
-#include <iostream>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-
-#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 <process.h> // for _SPAWN
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-#endif
-#ifdef UNX
-#include <sys/types.h>
-#include <unistd.h>
-#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
- || defined (HPUX) || defined (MACOSX)
-#include <sys/wait.h>
-#else
-#include <wait.h>
-#endif
-#define P_WAIT 1 // erstmal einen dummz
-#endif
-
-#if defined WNT
-#include <tools/svwin.h>
-#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( "PATH" );
-#ifndef UNX
- aCommandLine += " /c ";
-#else
- aCommandLine += " -c ";
-#endif
-
- ByteString sCmd( rString.GetToken( 0, ' ' ));
- ByteString sParam( rString.Copy( sCmd.Len()));
-
- aCommandLine += Search( "PATH", sCmd );
- aCommandLine += sParam;
-
- ImplInit();
-}
-
-/*****************************************************************************/
-CCommand::CCommand( const char *pChar )
-/*****************************************************************************/
-{
- ByteString aString = pChar;
- aString.SearchAndReplace( '\t', ' ' );
- aCommand = aString.GetToken( 0, ' ' );
-
- aCommandLine = Search( "PATH" );
-#ifndef UNX
- aCommandLine += " /c ";
-#else
- aCommandLine += " -c ";
-#endif
- ByteString rString( pChar );
-
- ByteString sCmd( rString.GetToken( 0, ' ' ));
- ByteString sParam( rString.Copy( sCmd.Len()));
-
- aCommandLine += Search( "PATH", 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<nArgc; i++ )
- {
- (void) strcpy( pTmpStr, aCommandLine.GetToken(i, ' ' ).GetBuffer() );
- size_t nStrLen = strlen( pTmpStr ) + 1;
- strcpy( pChar, pTmpStr );
- *pPtr = (sal_uIntPtr) pChar;
- pChar += nStrLen;
- pPtr += 1;
-#ifdef UNX
- if ( i == 1 )
- {
- USHORT nWo = aCommandLine.Search("csh -c ");
- if (nWo != STRING_NOTFOUND)
- aCommandLine.Erase(0, nWo + 7);
- else
- aCommandLine.Erase(0, 16);
- i = nArgc;
- strcpy( pChar, aCommandLine.GetBuffer() );
- *pPtr = (sal_uIntPtr) pChar;
- pPtr += 1;
- }
-#endif
- }
- *pPtr = 0;
-}
-
-/*****************************************************************************/
-CCommand::operator int()
-/*****************************************************************************/
-{
- int nRet;
-#if defined WNT
- nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv );
-#elif defined OS2
- nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv );
-#elif defined UNX
- //fprintf( stderr, "CComand : operator (int) not implemented\n");
- // **** Unix Implementierung ***************
- pid_t pid;
-
- if (( pid = fork()) < 0 )
- {
- DBG_ASSERT( FALSE, "fork error" );
- }
- else if ( pid == 0 )
- {
- if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 )
- {
- DBG_ASSERT( FALSE, "execv failed" );
- }
- }
- //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] );
- if ( (nRet = waitpid( pid, NULL, 0 ) < 0) )
- {
- DBG_ASSERT( FALSE, "wait error" );
- }
-#endif
-
- switch ( errno )
- {
- case E2BIG :
- nError = COMMAND_TOOBIG;
- break;
- case EINVAL :
- nError = COMMAND_INVALID;
- break;
- case ENOENT:
- nError = COMMAND_NOTFOUND;
- break;
- case ENOEXEC :
- nError = COMMAND_NOEXEC;
- break;
- case ENOMEM :
- nError = COMMAND_NOMEM;
- break;
- default:
- nError = COMMAND_UNKNOWN;
- }
-
- if ( nRet )
- fprintf( stderr, "Program returned with errros\n");
- return nRet;
-}
-
-/*****************************************************************************/
-ByteString CCommand::Search(ByteString aEnv, ByteString sItem)
-/*****************************************************************************/
-{
- // default wird eine Shell im Path gesucht,
- // wenn aber compsec gestzt ist holen wir uns die
- // Shell von dort
- if ( sItem.Equals( COMMAND_SHELL ))
- {
- ByteString aComspec = GetEnv( "COMSPEC" );
- if ( !aComspec.Equals(""))
- return aComspec;
- }
-
- DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US ));
- if ( aItem.Exists())
- return sItem;
-
- ByteString aEntry, sReturn;
- ByteString sEnv( aEnv );
- ByteString sEnvironment = GetEnv( sEnv.GetBuffer());
- xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator );
-
- BOOL bFound = FALSE;
-
- for ( xub_StrLen i=0; i<nCount && !bFound; i++ )
- {
- aEntry = sEnvironment.GetToken(i, cPathSeperator );
-#ifndef UNX
- aEntry += '\\';
-#else
- aEntry += '/';
-#endif
- aEntry += sItem;
-
- String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
- DirEntry aDirEntry( sEntry );
- aDirEntry.ToAbs();
- if ( aDirEntry.Exists()) {
- sReturn = aEntry;
- bFound = TRUE;
- }
- }
- if ( !bFound )
- {
- sEnv = sEnv.ToUpperAscii();
- ByteString sEnvironment2 = GetEnv(sEnv.GetBuffer() );
- xub_StrLen nCount2 = sEnvironment2.GetTokenCount( cPathSeperator );
- for ( xub_StrLen i=0; i<nCount2 && !bFound; i++ )
- {
- aEntry = sEnvironment2.GetToken(i, cPathSeperator );
-#ifndef UNX
- aEntry += '\\';
-#else
- aEntry += '/';
-#endif
- aEntry += sItem;
-
- String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
- DirEntry aDirEntry( sEntry );
- aDirEntry.ToAbs();
- if ( aDirEntry.Exists()) {
- sReturn = aEntry;
- bFound = TRUE;
- }
- }
- }
-
- if ( sReturn.Equals( "" ))
- sReturn = sItem;
-
- return sReturn;
-}
-
-/*****************************************************************************/
-CCommandd::CCommandd( ByteString &rString, CommandBits nBits )
-/*****************************************************************************/
- : CCommand( rString ),
- nFlag( nBits )
-{
-}
-
-
-/*****************************************************************************/
-CCommandd::CCommandd( const char *pChar, CommandBits nBits )
-/*****************************************************************************/
- : CCommand( pChar ),
- nFlag( nBits )
-{
-}
-
-/*****************************************************************************/
-CCommandd::operator int()
-/*****************************************************************************/
-{
- int nRet = 0;
-
-#ifdef WNT
- LPCTSTR lpApplicationName = NULL;
- LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer();
- LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL;
- LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
- BOOL bInheritHandles = TRUE;
-
- // wie wuenschen wir denn gestartet zu werden ??
- DWORD dwCreationFlags;
-
- if ( nFlag & COMMAND_EXECUTE_START )
- dwCreationFlags = DETACHED_PROCESS;
- else
- dwCreationFlags = CREATE_NEW_CONSOLE;
-
- // wir erben vom Vaterprozess
- LPVOID lpEnvironment = NULL;
-
- // das exe im Pfad suchen
- LPCTSTR lpCurrentDirectory = NULL;
-
- // in dieser Struktur bekommen wir die erzeugte Processinfo
- // zurueck
- PROCESS_INFORMATION aProcessInformation;
-
- // weiteres Startupinfo anlegen
- STARTUPINFO aStartupInfo;
-
- aStartupInfo.cb = sizeof( STARTUPINFO );
- aStartupInfo.lpReserved = NULL;
- aStartupInfo.lpDesktop = NULL;
-
- // das Fenster bekommt den Namen des Exes
- aStartupInfo.lpTitle = NULL;
- aStartupInfo.dwX = 100;
- aStartupInfo.dwY = 100;
- //aStartupInfo.dwXSize = 400;
- //aStartupInfo.dwYSize = 400;
- aStartupInfo.dwXCountChars = 40;
- aStartupInfo.dwYCountChars = 40;
-
- // Farben setzen
- aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
- BACKGROUND_BLUE | BACKGROUND_GREEN;
-
-// aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
- //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
- //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
- aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
- aStartupInfo.cbReserved2 = NULL;
- aStartupInfo.lpReserved2 = NULL;
- //aStartupInfo.hStdInput = stdin;
- //aStartupInfo.hStdOutput = stdout;
- //aStartupInfo.hStdError = stderr;
-
- if ( nFlag & COMMAND_EXECUTE_HIDDEN )
- {
- aStartupInfo.wShowWindow = SW_HIDE;
- aStartupInfo.dwFlags = aStartupInfo.dwFlags | STARTF_USESHOWWINDOW;
- }
-
- bool bProcess = CreateProcess( lpApplicationName,
- lpCommandLine, lpProcessAttributes,
- lpThreadAttributes, bInheritHandles,
- dwCreationFlags, lpEnvironment, lpCurrentDirectory,
- &aStartupInfo, &aProcessInformation );
-
- LPVOID lpMsgBuf;
-
- if ( bProcess )
- {
- FormatMessage(
- FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
- (LPTSTR) &lpMsgBuf,
- 0,
- NULL );
-
- ByteString aErrorString = (char *) lpMsgBuf;
-
- if ( nFlag & COMMAND_EXECUTE_WAIT )
- {
- DWORD aProcessState = STILL_ACTIVE;
- while(aProcessState == STILL_ACTIVE)
- {
- GetExitCodeProcess(aProcessInformation.hProcess,&aProcessState);
- }
- }
- }
- else
- fprintf( stderr, "Can not start Process !" );
-
-#endif
- return nRet;
-}
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
deleted file mode 100644
index 41188d2117d0..000000000000
--- a/tools/bootstrp/makefile.mk
+++ /dev/null
@@ -1,108 +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
-# <http://www.openoffice.org/license.html>
-# 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)$/command.obj \
- $(OBJ)$/cppdep.obj\
- $(OBJ)$/inimgr.obj\
- $(OBJ)$/mkcreate.obj \
- $(OBJ)$/sstring.obj \
- $(OBJ)$/prj.obj
-
-SLOFILES= \
- $(SLO)$/appdef.obj \
- $(SLO)$/command.obj \
- $(SLO)$/cppdep.obj \
- $(SLO)$/inimgr.obj \
- $(SLO)$/mkcreate.obj \
- $(SLO)$/sstring.obj \
- $(SLO)$/prj.obj
-
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-LIB1OBJFILES=\
- $(OBJ)$/appdef.obj \
- $(OBJ)$/command.obj \
- $(OBJ)$/cppdep.obj \
- $(OBJ)$/inimgr.obj \
- $(OBJ)$/mkcreate.obj \
- $(OBJ)$/sstring.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/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 4f4d44a33536..e5ed5b2451e9 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -29,7 +29,7 @@
#include "precompiled_tools.hxx"
#include <stdlib.h>
#include <stdio.h>
-#include "bootstrp/sstring.hxx"
+//#include "bootstrp/sstring.hxx"
#include <vos/mutex.hxx>
#include <tools/stream.hxx>
@@ -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; i<nObjCount; i++ )
- {
- pData = GetObject(i);
- if ( pData->GetLogFile() == 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; i<nCountMember; i++)
- {
- pPrj = GetObject(i);
- if ( pPrj->GetProjectName().EqualsIgnoreCaseAscii(aProjectName) )
- return TRUE;
- }
- return FALSE;
-}
-
-/*****************************************************************************/
-Prj* Star::GetPrj ( ByteString aProjectName )
-/*****************************************************************************/
-{
- Prj* pPrj;
- int nCountMember = Count();
- for ( int i=0;i<nCountMember;i++)
- {
- pPrj = GetObject(i);
- if ( pPrj->GetProjectName().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/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];
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
- * <http://www.openoffice.org/license.html>
- * 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 <tools/stream.hxx>
-#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 638beb6cce1f..000000000000
--- a/tools/inc/bootstrp/command.hxx
+++ /dev/null
@@ -1,163 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef COMMAND_HXX
-#define COMMAND_HXX
-
-#include <iostream>
-
-#include <tools/stream.hxx>
-#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();
-};
-
-/** 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,
- 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
- * <http://www.openoffice.org/license.html>
- * 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 <tools/string.hxx>
-#include "bootstrp/sstring.hxx"
+//#include "bootstrp/sstring.hxx"
+
+DECLARE_LIST( UniStringList, UniString* )
#include <tools/list.hxx>
#include "bootstrp/prj.hxx"
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 994418bae4b5..4b1ff91feb7b 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -30,98 +30,6 @@
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
-#include "bootstrp/listmacr.hxx"
-#include <vos/mutex.hxx>
-
-#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:
- 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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SSTRING_HXX
-#define _SSTRING_HXX
-
-#include <tools/string.hxx>
-#include <tools/list.hxx>
-
-#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/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
-# <http://www.openoffice.org/license.html>
-# 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/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 f2c508342015..e69de29bb2d1 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -1,124 +0,0 @@
-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\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
-
-..\%__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/source/inet/makefile.mk b/tools/prj/makefile.mk
index 1e0bdfdd2391..c73a3d944bbf 100644
--- a/tools/source/inet/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -25,21 +25,16 @@
#
#*************************************************************************
-PRJ = ..$/..
-PRJNAME = tools
-TARGET = inet
+PRJ=..
+TARGET=prj
-.INCLUDE: settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.INCLUDE : settings.mk
-SLOFILES=\
- $(SLO)$/inetmime.obj \
- $(SLO)$/inetmsg.obj \
- $(SLO)$/inetstrm.obj
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
-OBJFILES=\
- $(OBJ)$/inetmime.obj \
- $(OBJ)$/inetmsg.obj \
- $(OBJ)$/inetstrm.obj
-
-.INCLUDE: target.mk
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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/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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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/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
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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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
-# <http://www.openoffice.org/license.html>
-# 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/util/makefile.mk b/tools/util/makefile.mk
deleted file mode 100644
index 1574addcf59c..000000000000
--- a/tools/util/makefile.mk
+++ /dev/null
@@ -1,173 +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
-# <http://www.openoffice.org/license.html>
-# 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
-
-
-.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)
-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/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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _PARSER_HXX
-#define _PARSER_HXX
-
-#if defined WNT
-
-#include <tools/string.hxx>
-#include <winshell.hxx>
-
-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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SHELLEX_H_
-#define _SHELLEX_H_
-
-#ifndef _SHLOBJ_H_
-#include <shlobj.h>
-#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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SHUTIL_H_
-#define _SHUTIL_H_
-
-#if defined WNT
-
-#ifndef _SHOBJ_H
-#include <shlobj.h>
-#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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _WINSHELL_HXX
-#define _WINSHELL_HXX
-
-#if defined WNT
-
-#include <tools/prewin.h>
-#include "shutil.h"
-#include <tools/postwin.h>
-
-#include <tools/string.hxx>
-
-//----------------------------------------------------------------------------
-// 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/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
-# <http://www.openoffice.org/license.html>
-# 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/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
-# <http://www.openoffice.org/license.html>
-# 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
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
-# <http://www.openoffice.org/license.html>
-# 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