[PATCH] gbuild conversion: registry module

Hi,

unfortunately gerrit is out of sync now, so i can not push it for review.
I have some questions to this patch:

1.
Test and workben directories are not used: let the old makefiles in place?

2.
What is this for:
CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"

3.
Where these versions are used?
.INCLUDE :  ..$/version.mk

4. Have no idea what is this for => ignored ;-)
makedocpp: $(DOCPPFILES)
     docpp -H -m -f  -u -d $(OUT)$/doc$/$(PRJNAME) $(DOCPPFILES)

5. how to handle this?
TARGET=reg
[...]
.IF "$(COM)" == "MSC"
SHL1IMPLIB= ireg
.ELSE
SHL1IMPLIB= $(TARGET)
.ENDIF

Thanks
David

From 93bd0969ffec13003bdbd3e2f117374650b7ba20 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Fri, 4 May 2012 23:41:10 +0200
Subject: [PATCH] gbuild conversion: registry module

Change-Id: I9dbd2a05602e7d415ca76850458129f68583c83f
---
 Makefile                                  |    2 +-
 Repository.mk                             |    9 +++
 registry/Executable_checksingleton.mk     |   43 +++++++++++++
 registry/Executable_rdbedit.mk            |   43 +++++++++++++
 registry/Executable_regcompare.mk         |   43 +++++++++++++
 registry/Executable_regmerge.mk           |   42 +++++++++++++
 registry/Executable_regview.mk            |   42 +++++++++++++
 registry/Library_regcpp.mk                |   49 +++++++++++++++
 registry/Makefile                         |    7 ++
 registry/Module_registry.mk               |   47 +++++++++++++++
 registry/Package_inc.mk                   |   42 +++++++++++++
 registry/StaticLibrary_registry_helper.mk |   35 +++++++++++
 registry/inc/makefile.mk                  |   39 ------------
 registry/prj/build.lst                    |    8 +--
 registry/prj/d.lst                        |   19 ------
 registry/source/makefile.mk               |   53 -----------------
 registry/tools/makefile.mk                |   92 -----------------------------
 registry/util/makefile.mk                 |   80 -------------------------
 18 files changed, 405 insertions(+), 290 deletions(-)
 create mode 100644 registry/Executable_checksingleton.mk
 create mode 100644 registry/Executable_rdbedit.mk
 create mode 100644 registry/Executable_regcompare.mk
 create mode 100644 registry/Executable_regmerge.mk
 create mode 100644 registry/Executable_regview.mk
 create mode 100644 registry/Library_regcpp.mk
 create mode 100644 registry/Makefile
 create mode 100644 registry/Module_registry.mk
 create mode 100644 registry/Package_inc.mk
 create mode 100644 registry/StaticLibrary_registry_helper.mk
 delete mode 100644 registry/inc/makefile.mk
 delete mode 100644 registry/prj/dmake
 delete mode 100644 registry/source/makefile.mk
 delete mode 100644 registry/tools/makefile.mk
 delete mode 100644 registry/util/makefile.mk

diff --git a/Makefile b/Makefile
index 7051099..f32ca72 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ padmin\
 psprint_config\
 qadevOOo\
 regexp\
+registry\
 reportdesign\
 rdbmaker\
 ridljar\
@@ -220,7 +221,6 @@ python\
 pyuno\
 readlicense_oo\
 redland\
-registry\
 remotebridges\
 reportbuilder\
 rhino\
diff --git a/Repository.mk b/Repository.mk
index bd54358..aa74ad1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     bestreversemap \
     bmp \
     bmpsum \
+    checksingleton \
     cfgex \
     cppunit/cppunittester \
     g2g \
@@ -44,6 +45,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     osl_process_child \
     pdf2xml \
     pdfunzip \
+    rdbedit \
     rdbmaker \
     regsingleton \
     rsc \
@@ -71,6 +73,7 @@ ifneq ($(OS),IOS)
 $(eval $(call gb_Helper_register_executables,SDK, \
     javamaker \
     cppumaker \
+    regcompare \
     uno-skeletonmaker \
 ))
 
@@ -157,6 +160,8 @@ ifneq ($(OS),IOS)
 
 $(eval $(call gb_Helper_register_executables,UREBIN,\
        regcomp \
+       regmerge \
+       regview \
        uno \
 ))
 
@@ -373,6 +378,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     juhx \
     log_uno \
     reg \
+    regcpp \
     sal_textenc \
     store \
     sunjavaplugin \
@@ -588,6 +594,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     ulingu \
     vclmain \
     writerperfect \
+    $(if $(filter-out $(OS),IOS), \
+        registry_helper \
+    ) \
     $(if $(filter $(OS),IOS), \
         uno \
     ) \
diff --git a/registry/Executable_checksingleton.mk b/registry/Executable_checksingleton.mk
new file mode 100644
index 0000000..dc191c8
--- /dev/null
+++ b/registry/Executable_checksingleton.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,checksingleton))
+
+$(eval $(call gb_Executable_use_libraries,checksingleton,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,checksingleton,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,checksingleton,\
+    registry/tools/checksingleton \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_rdbedit.mk b/registry/Executable_rdbedit.mk
new file mode 100644
index 0000000..a9b31ff
--- /dev/null
+++ b/registry/Executable_rdbedit.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,rdbedit))
+
+$(eval $(call gb_Executable_use_libraries,rdbedit,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,rdbedit,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,rdbedit,\
+    registry/tools/rdbedit \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regcompare.mk b/registry/Executable_regcompare.mk
new file mode 100644
index 0000000..bb3b6dc
--- /dev/null
+++ b/registry/Executable_regcompare.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regcompare))
+
+$(eval $(call gb_Executable_use_libraries,regcompare,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regcompare,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcompare,\
+    registry/tools/regcompare \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regmerge.mk b/registry/Executable_regmerge.mk
new file mode 100644
index 0000000..7aafd7d
--- /dev/null
+++ b/registry/Executable_regmerge.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regmerge))
+
+$(eval $(call gb_Executable_use_libraries,regmerge,\
+    sal \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regmerge,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regmerge,\
+    registry/tools/regmerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk
new file mode 100644
index 0000000..581c381
--- /dev/null
+++ b/registry/Executable_regview.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regview))
+
+$(eval $(call gb_Executable_use_libraries,regview,\
+    sal \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regview,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regview,\
+    registry/tools/regview \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Library_regcpp.mk b/registry/Library_regcpp.mk
new file mode 100644
index 0000000..d25db59
--- /dev/null
+++ b/registry/Library_regcpp.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,regcpp))
+
+$(eval $(call gb_Library_set_soversion_script,regcpp,3,$(SRCDIR)/registry/util/reg.map))
+
+$(eval $(call gb_Library_use_packages,regcpp,\
+       registry_inc \
+))
+
+$(eval $(call gb_Library_use_libraries,regcpp,\
+       sal \
+       store \
+))
+
+$(eval $(call gb_Library_add_exception_objects,regcpp,\
+       registry/source/keyimpl \
+       registry/source/reflread \
+       registry/source/reflwrit \
+       registry/source/regimpl \
+       registry/source/registry \
+       registry/source/regkey \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/Makefile b/registry/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/registry/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
new file mode 100644
index 0000000..0bf446d
--- /dev/null
+++ b/registry/Module_registry.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,registry))
+
+$(eval $(call gb_Module_add_targets,registry,\
+    Library_regcpp \
+    Package_inc \
+))
+
+ifneq ($(OS),IOS)
+
+$(eval $(call gb_Module_add_targets,registry,\
+    StaticLibrary_registry_helper \
+    Executable_regmerge \
+    Executable_regview \
+    Executable_regcompare \
+    Executable_checksingleton \
+    Executable_rdbedit \
+))
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
new file mode 100644
index 0000000..b2944d3
--- /dev/null
+++ b/registry/Package_inc.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,registry_inc,$(SRCDIR)/registry/inc/registry))
+
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk
new file mode 100644
index 0000000..a7d4671
--- /dev/null
+++ b/registry/StaticLibrary_registry_helper.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\
+    registry/tools/fileurl \
+    registry/tools/options \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/inc/makefile.mk b/registry/inc/makefile.mk
deleted file mode 100644
index 203cb85..0000000
--- a/registry/inc/makefile.mk
+++ /dev/null
@@ -1,39 +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=registry
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/registry/prj/build.lst b/registry/prj/build.lst
index 6246012..65eb6e5 100644
--- a/registry/prj/build.lst
+++ b/registry/prj/build.lst
@@ -1,7 +1,3 @@
 rg     registry        :       salhelper store NULL
-rg     registry                                                                usr1    -       all 
    rg_mkout NULL
-rg     registry\inc                                                    nmake   -       all     
rg_inc NULL
-rg     registry\prj                                                    get             -       all 
    rg_prj rg_inc NULL
-rg     registry\source                                                 nmake   -       all     
rg_src rg_inc NULL
-rg     registry\util                                                   nmake   -       all     
rg_utl rg_src NULL
-rg     registry\tools                                                  nmake   -       all     
rg_tls rg_utl NULL
+rg     registry                                                        usr1    -       all     
rg_mkout NULL
+rg     registry\prj                                                    get     -       all     
rg_prj rg_inc NULL
diff --git a/registry/prj/d.lst b/registry/prj/d.lst
index f1dfa72..e69de29 100644
--- a/registry/prj/d.lst
+++ b/registry/prj/d.lst
@@ -1,19 +0,0 @@
-mkdir: %_DEST%\inc\registry
-
-..\inc\registry\*.h %_DEST%\inc\registry\*.h
-..\inc\registry\*.hxx %_DEST%\inc\registry\*.hxx
-
-..\%__SRC%\lib\ireg.lib %_DEST%\lib\ireg.lib
-..\%__SRC%\lib\libreg.* %_DEST%\lib\*
-..\%__SRC%\bin\reg*.dll %_DEST%\bin\reg*.dll
-
-..\%__SRC%\bin\checksingleton.exe %_DEST%\bin\checksingleton.exe
-..\%__SRC%\bin\regcompare.exe %_DEST%\bin\regcompare.exe
-..\%__SRC%\bin\regmerge.exe %_DEST%\bin\regmerge.exe
-..\%__SRC%\bin\regview.exe %_DEST%\bin\regview.exe
-..\%__SRC%\bin\checksingleton %_DEST%\bin\checksingleton
-..\%__SRC%\bin\regcompare %_DEST%\bin\regcompare
-..\%__SRC%\bin\regmerge %_DEST%\bin\regmerge
-..\%__SRC%\bin\regview %_DEST%\bin\regview
-
-linklib: libreg.*.*
diff --git a/registry/prj/dmake b/registry/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/registry/source/makefile.mk b/registry/source/makefile.mk
deleted file mode 100644
index 9b9cb5c..0000000
--- a/registry/source/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=registry
-TARGET=regcpp
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : ..$/version.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/regimpl.obj                \
-            $(SLO)$/regkey.obj         \
-            $(SLO)$/registry.obj       \
-            $(SLO)$/keyimpl.obj        \
-            $(SLO)$/reflread.obj       \
-            $(SLO)$/reflwrit.obj
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
deleted file mode 100644
index 4304371..0000000
--- a/registry/tools/makefile.mk
+++ /dev/null
@@ -1,92 +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=registry
-TARGET=regmerge
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-.INCLUDE :  ..$/version.mk
-
-.IF "$(OS)"!="IOS"
-
-# --- Files --------------------------------------------------------
-CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
-
-APP1TARGET= $(TARGET)
-APP1OBJS=   $(OBJ)$/regmerge.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP1RPATH=  UREBIN
-
-APP1STDLIBS=\
-            $(SALLIB) \
-            $(REGLIB)
-
-APP2TARGET= regview
-APP2OBJS=   $(OBJ)$/regview.obj $(OBJ)/fileurl.obj
-APP2RPATH=  UREBIN
-
-APP2STDLIBS=\
-            $(SALLIB) \
-            $(REGLIB)
-
-APP3TARGET= regcompare
-APP3OBJS=   $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP3RPATH=  SDKBIN
-
-APP3STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-APP4TARGET= checksingleton
-APP4OBJS=   $(OBJ)$/checksingleton.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-
-APP4STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-APP5TARGET= rdbedit
-APP5OBJS=   $(OBJ)$/rdbedit.obj
-
-APP5STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
-
-.ENDIF
-
-.INCLUDE :  target.mk
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
deleted file mode 100644
index ecc356c..0000000
--- a/registry/util/makefile.mk
+++ /dev/null
@@ -1,80 +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=registry
-TARGET=reg
-
-UNIXVERSIONNAMES=UDK
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-USE_LDUMP2=TRUE
-LDUMP2=LDUMP3
-
-DOCPPFILES= $(INC)$/registry$/registry.hxx \
-            $(INC)$/registry$/registry.h \
-            $(INC)$/registry$/regtype.h \
-            $(INC)$/registry$/reflread.hxx \
-            $(INC)$/registry$/reflwrit.hxx \
-            $(INC)$/registry$/refltype.hxx \
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1FILES=     $(SLB)$/$(TARGET)cpp.lib
-
-SHL1TARGET= $(TARGET)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB= ireg
-.ELSE
-SHL1IMPLIB= $(TARGET)
-.ENDIF
-SHL1STDLIBS= \
-    $(SALLIB) \
-    $(STORELIB)
-
-SHL1VERSIONMAP=        $(TARGET).map
-
-SHL1LIBS= $(LIB1TARGET)        
-SHL1DEPN= $(LIB1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEF1DES        = RegistryRuntime
-SHL1RPATH=URELIB
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-makedocpp: $(DOCPPFILES)
-     docpp -H -m -f  -u -d $(OUT)$/doc$/$(PRJNAME) $(DOCPPFILES)
-
-- 
1.7.5.4