switch cli_ure to gbuild

Change-Id: Icad2f8019130781f036b5d46105cf5a99709663f

15 files changed, 1 insertions, 811 deletions

diff --git a/cli_ure/inc/makefile.mk b/cli_ure/inc/makefile.mk
deleted file mode 100644
index 6316a83b953f..000000000000
--- a/cli_ure/inc/makefile.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-PRJ=..
-
-PRJNAME=cli_ure
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index a46a8297d12d..5af3de37e3b6 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,12 +1,3 @@
 ure     cli_ure :       cppu cppuhelper sal DESKTOP:codemaker stoc udkapi bridges NULL
 ure	cli_ure						usr1	-	all	ure_mkout NULL
-ure	cli_ure\inc					nmake   -   all   ure_inc NULL
-ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
-ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
-ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
-ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
-ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
-ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
-ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
-ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-#ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
+ure	cli_ure\prj					nmake   -   all   ure_prj NULL
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst
index dff5e25583d7..e69de29bb2d1 100644
--- a/cli_ure/prj/d.lst
+++ b/cli_ure/prj/d.lst
@@ -1,13 +0,0 @@
-..\%__SRC%\bin\climaker.exe %_DEST%\bin\climaker.exe
-..\%__SRC%\bin\climaker.pdb %_DEST%\bin\climaker.pdb
-..\%__SRC%\bin\climaker.exe.config %_DEST%\bin\climaker.exe.config
-
-..\%__SRC%\bin\cli_*.dll %_DEST%\bin\cli_*.dll
-..\%__SRC%\bin\cli_*.pdb %_DEST%\bin\cli_*.pdb
-..\%__SRC%\bin\cli_*.config %_DEST%\bin\cli_*.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
-..\%__SRC%\bin\cli_uno.* %_DEST%\bin\cli_uno.*
-
-..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk
-
-..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk
\ No newline at end of file
diff --git a/cli_ure/prj/dmake b/cli_ure/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/cli_ure/prj/dmake
+++ /dev/null
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk
deleted file mode 100644
index df9654db21d6..000000000000
--- a/cli_ure/source/basetypes/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = basetypes
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-.INCLUDE : $(BIN)$/cliureversion.mk
-
-ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs
-POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASETYPES_POLICY_ASSEMBLY).dll
-
-ALLTAR : \
-    $(BIN)$/cli_basetypes.dll \
-    $(POLICY_ASSEMBLY_FILE)
-    
-.IF "$(CCNUMVER)" >= "001399999999"
-CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
-.ENDIF
-
-CSFILES = \
-    uno$/Any.cs			\
-    uno$/BoundAttribute.cs \
-    uno$/ExceptionAttribute.cs	\
-    uno$/ParameterizedTypeAttribute.cs	\
-    uno$/TypeParametersAttribute.cs \
-    uno$/TypeArgumentsAttribute.cs \
-    uno$/OnewayAttribute.cs	\
-    uno$/PolymorphicType.cs \
-    $(ASSEMBLY_ATTRIBUTES)
-
-.IF "$(CCNUMVER)" <= "001399999999"
-$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
-    $(GNUCOPY) -p assembly.cs $@
-    echo \
-    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
-    >> $@
-.ELSE
-$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
-    $(GNUCOPY) -p assembly.cs $@
-    echo \
-    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")]' \
-    >> $@
-.ENDIF
-
-$(BIN)$/cli_basetypes.dll : $(CSFILES) $(BIN)$/cliureversion.mk 
-    $(CSC) $(CSCFLAGS) \
-        -target:library \
-        -out:$@ \
-        -reference:System.dll \
-        $(CSFILES)
-    @echo "If code has changed then provide a policy assembly and change the version!"
-
-#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_BASETYPES_POLICY_VERSION) \
-            -keyfile:$(BIN)$/cliuno.snk \
-            -link:$(BIN)$/cli_basetypes.config
-
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_basetypes.config: cli_basetypes_config $(BIN)$/cliureversion.mk 
-    $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
-    $< $@
-
-
-.ENDIF
-    
-
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
deleted file mode 100644
index f151987dc0f0..000000000000
--- a/cli_ure/source/climaker/makefile.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-TARGET = climaker
-TARGETTYPE = CUI
-LIBTARGET = NO
-ENABLE_EXCEPTIONS = TRUE
-
-# disable caching to avoid stale objects
-# on version changes
-CCACHE_DISABLE=TRUE
-.EXPORT : CCACHE_DISABLE
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS =
-
-UNOTYPES = \
-    com.sun.star.uno.TypeClass					\
-    com.sun.star.uno.XAggregation					\
-    com.sun.star.uno.XWeak						\
-    com.sun.star.uno.XComponentContext				\
-    com.sun.star.lang.XTypeProvider					\
-    com.sun.star.lang.XInitialization				\
-    com.sun.star.lang.XComponent					\
-    com.sun.star.lang.XMultiComponentFactory			\
-    com.sun.star.lang.XMultiServiceFactory			\
-    com.sun.star.lang.XSingleComponentFactory			\
-    com.sun.star.container.XSet					\
-    com.sun.star.container.XHierarchicalNameAccess			\
-    com.sun.star.loader.XImplementationLoader			\
-    com.sun.star.registry.XSimpleRegistry				\
-    com.sun.star.registry.XRegistryKey				\
-    com.sun.star.reflection.XTypeDescriptionEnumerationAccess	\
-    com.sun.star.reflection.XConstantTypeDescription		\
-    com.sun.star.reflection.XConstantsTypeDescription		\
-    com.sun.star.reflection.XIndirectTypeDescription		\
-    com.sun.star.reflection.XEnumTypeDescription			\
-    com.sun.star.reflection.XInterfaceTypeDescription2		\
-    com.sun.star.reflection.XInterfaceMethodTypeDescription		\
-    com.sun.star.reflection.XInterfaceAttributeTypeDescription2	\
-    com.sun.star.reflection.XCompoundTypeDescription		\
-    com.sun.star.reflection.XServiceTypeDescription2		\
-    com.sun.star.reflection.XSingletonTypeDescription2		\
-    com.sun.star.reflection.XStructTypeDescription
-
-CFLAGSCXX +=-AI$(BIN)
-
-
-# When compiling for CLR, disable "warning C4339: use of undefined type detected
-# in CLR meta-data - use of this type may lead to a runtime exception":
-CFLAGSCXX += -clr -LN -wd4339 -wd4715
-
-OBJFILES = \
-    $(OBJ)$/climaker_app.obj	\
-    $(OBJ)$/climaker_emit.obj
-
-APP1TARGET = $(TARGET)
-APP1OBJS = $(OBJFILES)
-
-
-APP1STDLIBS = \
-    $(CPPUHELPERLIB)		\
-    $(CPPULIB)			\
-    $(SALLIB)			\
-    mscoree.lib
-
-.IF "$(USE_DEBUG_RUNTIME)" == ""
-APP1STDLIBS += \
-    msvcmrt.lib
-.ELSE
-APP1STDLIBS += \
-    msvcmrtd.lib
-.ENDIF
-
-.ENDIF
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE :  target.mk
-
-CLIMAKER_CONFIG = $(BIN)$/climaker.exe.config
-
-ALLTAR: \
-    $(CLIMAKER_CONFIG)
-
-#Create the config file that is used with the policy assembly
-$(CLIMAKER_CONFIG): climaker.exe.config
-    $(COPY) $< $@
-    chmod +x $@
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-$(OBJFILES): $(BIN)$/cli_basetypes.dll
-
-.ENDIF
diff --git a/cli_ure/source/makefile.mk b/cli_ure/source/makefile.mk
deleted file mode 100644
index f7001ae4b0bd..000000000000
--- a/cli_ure/source/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = sourcedir
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-ALLTAR : \
-    $(OUT)$/bin$/cliuno.snk
-
-$(OUT)$/bin$/cliuno.snk : 
-    $(GNUCOPY) -p cliuno.snk $@
-
-.ENDIF
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
deleted file mode 100644
index 68f534e2108b..000000000000
--- a/cli_ure/source/native/makefile.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-TARGET = cli_cppuhelper
-ENABLE_EXCEPTIONS = TRUE
-LIBTARGET = NO
-USE_DEFFILE = TRUE
-
-# disable caching to avoid stale objects
-# on version changes
-CCACHE_DISABLE=TRUE
-.EXPORT : CCACHE_DISABLE
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-use_shl_versions=
-
-.IF "$(BUILD_FOR_CLI)" == ""
-#do not even build the cxx files because they contain cli cpp
-all:
-.ELSE
-
-.INCLUDE : $(BIN)$/cliureversion.mk
-
-ASSEMBLY_KEY="$(BIN)$/cliuno.snk"
-
-ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_cppuhelper.cxx
-
-POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_CPPUHELPER_POLICY_ASSEMBLY).dll
-
-ASSEMBLY_KEY_X=$(subst,\,\\ $(ASSEMBLY_KEY))
-
-
-LINKFLAGS += /delayload:cppuhelper3MSC.dll \
-             /delayload:cppu3.dll \
-             /delayload:sal3.dll
-
-UWINAPILIB=
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS =
-UNOTYPES = \
-    com.sun.star.lang.XSingleComponentFactory			\
-    com.sun.star.loader.CannotActivateFactoryException 		\
-    com.sun.star.container.XHierarchicalNameAccess		\
-    com.sun.star.registry.CannotRegisterImplementationException	\
-    com.sun.star.registry.XRegistryKey \
-    com.sun.star.registry.XSimpleRegistry
-
-#loader lock was solved as of VS 2005 (CCNUMVER = 0014..)
-# When compiling for CLR, disable "warning C4339: use of undefined type detected
-# in CLR meta-data - use of this type may lead to a runtime exception":
-CFLAGSCXX += -clr:oldSyntax -AI $(BIN) -wd4339
-
-SLOFILES = \
-    $(SLO)$/native_bootstrap.obj \
-    $(SLO)$/path.obj \
-    $(SLO)$/assembly_cppuhelper.obj
-
-
-SHL1OBJS = $(SLOFILES)
-
-SHL1TARGET = $(TARGET)
-
-SHL1STDLIBS = \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB)		\
-    $(SALLIB)		\
-    delayimp.lib \
-    advapi32.lib \
-    mscoree.lib \
-    Advapi32.lib
-
-.IF "$(USE_DEBUG_RUNTIME)" == ""
-SHL1STDLIBS += \
-    msvcmrt.lib
-.ELSE
-SHL1STDLIBS += \
-    msvcmrtd.lib
-.ENDIF
-
-SHL1VERSIONMAP = msvc.map
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-SIGN= $(MISC)$/cppuhelper_is_signed_flag
-
-ALLTAR: \
-    $(POLICY_ASSEMBLY_FILE) \
-    $(SIGN)
-
-
-CFLAGSCXX += -clr:oldSyntax
-
-$(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
-    @echo $(ASSEMBLY_KEY_X)
-    $(GNUCOPY) -p assembly.cxx $@
-    echo \
-    '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' \
-    >> $(OUT)$/misc$/assembly_cppuhelper.cxx
-    echo \
-    '[assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))];' \
-    >> $(OUT)$/misc$/assembly_cppuhelper.cxx
-
-#make sure we build cli_cppuhelper after the version changed
-$(SHL1OBJS) : $(BIN)$/cli_cppuhelper.config
-
-$(SIGN): $(SHL1TARGETN)
-    $(WRAPCMD) sn.exe -R $(BIN)$/$(TARGET).dll	$(BIN)$/cliuno.snk	 && $(TOUCH) $@
-
-#do not forget to deliver cli_cppuhelper.config. It is NOT embedded in the policy file.
-# If the x86 switch is ommitted then the system assumes the assembly to be MSIL.
-# The policy file is still found when an application tries to load an older
-# cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
-# assembly is also 'MSIL'  like its policy file.
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
-            -keyfile:$(BIN)$/cliuno.snk \
-            -link:$(BIN)$/cli_cppuhelper.config \
-            -platform:x86
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_cppuhelper.config: cli_cppuhelper_config $(BIN)$/cliureversion.mk 
-    $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
-    $< $@
-
-.ENDIF			# "$(BUILD_FOR_CLI)" != ""
diff --git a/cli_ure/source/native/msvc.map b/cli_ure/source/native/msvc.map
deleted file mode 100644
index fd4444651e13..000000000000
--- a/cli_ure/source/native/msvc.map
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-    global:
-
-    local:
-    *;
-};
diff --git a/cli_ure/source/uno_bridge/bridge_exports.map b/cli_ure/source/uno_bridge/bridge_exports.map
deleted file mode 100644
index becb6d4a86e3..000000000000
--- a/cli_ure/source/uno_bridge/bridge_exports.map
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-    global:
-        component_canUnload;
-        uno_initEnvironment;
-        uno_ext_getMapping;
-    local:
-    *;
-};
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk
deleted file mode 100644
index 0c5e04959a8e..000000000000
--- a/cli_ure/source/uno_bridge/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-TARGET = cli_uno
-ENABLE_EXCEPTIONS = TRUE
-USE_DEFFILE = TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COM)" == "MSC"
-# When compiling for CLR, disable "warning C4339: use of undefined type detected
-# in CLR meta-data - use of this type may lead to a runtime exception":
-CFLAGSCXX += -clr:oldSyntax -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339
-
-.IF "$(debug)" != ""
-CFLAGS += -Ob0
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/cli_environment.obj	\
-    $(SLO)$/cli_bridge.obj		\
-    $(SLO)$/cli_data.obj		\
-    $(SLO)$/cli_proxy.obj		\
-    $(SLO)$/cli_uno.obj
-
-SHL1OBJS = $(SLOFILES)
-
-SHL1TARGET = $(TARGET)
-
-SHL1STDLIBS = \
-    $(CPPULIB)			\
-    $(SALLIB)			\
-    mscoree.lib
-
-.IF "$(USE_DEBUG_RUNTIME)" == ""
-SHL1STDLIBS += \
-    msvcmrt.lib
-.ELSE
-SHL1STDLIBS += \
-    msvcmrtd.lib
-.ENDIF
-
-SHL1VERSIONMAP = bridge_exports.map
-
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
deleted file mode 100644
index 0d745ce7a1cf..000000000000
--- a/cli_ure/source/ure/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = ure
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-.INCLUDE : $(BIN)$/cliureversion.mk
-
-ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs
-
-POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_URE_POLICY_ASSEMBLY).dll
-ALLTAR : \
-    $(BIN)$/cli_ure.dll \
-    $(POLICY_ASSEMBLY_FILE)
-
-.IF "$(CCNUMVER)" >= "001399999999"
-CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
-.ENDIF
-
-CSFILES = \
-    uno$/util$/DisposeGuard.cs					\
-    uno$/util$/WeakAdapter.cs					\
-    uno$/util$/WeakBase.cs						\
-    uno$/util$/WeakComponentBase.cs	\
-    $(ASSEMBLY_ATTRIBUTES)
-
-.IF "$(CCNUMVER)" <= "001399999999"
-$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
-    $(GNUCOPY) -p assembly.cs $@
-    echo \
-    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
-    >> $@
-.ELSE
-$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
-    $(GNUCOPY) -p assembly.cs $@
-    echo \
-    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]' \
-    >> $@
-.ENDIF
-
-$(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_uretypes.dll $(BIN)$/cliureversion.mk 
-    $(CSC) $(CSCFLAGS) \
-        -target:library \
-        -out:$@ \
-        -reference:$(OUT)$/bin$/cli_uretypes.dll \
-        -reference:System.dll \
-        $(CSFILES)
-    @echo "If code has changed then provide a policy assembly and change the version!"
-
-
-#do not forget to deliver cli_ure.config. It is NOT embedded in the policy file.
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_URE_POLICY_VERSION) \
-            -keyfile:$(BIN)$/cliuno.snk \
-            -link:$(BIN)$/cli_ure.config
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_ure.config: cli_ure_config $(BIN)$/cliureversion.mk 
-    $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
-    $< $@
-
-
-.ENDIF
-    
-
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
deleted file mode 100644
index 262509defbb2..000000000000
--- a/cli_ure/unotypes/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = unotypes
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-.INCLUDE : $(BIN)$/cliureversion.mk
-
-POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll
-
-ALLTAR : \
-    $(OUT)$/bin$/cli_uretypes.dll \
-    $(POLICY_ASSEMBLY_FILE)
-
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
-
-#When changing the assembly version then this must also be done in scp2
-$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-    $(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
-        --out $@ \
-        --keyfile $(BIN)$/cliuno.snk \
-        --assembly-version $(CLI_URETYPES_NEW_VERSION) \
-        --assembly-description "This assembly contains metadata for the LibreOffice API." \
-        --assembly-company "LibreOffice" \
-        $(SOLARBINDIR)$/udkapi.rdb
-
-#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
-#see i62886 for the dependency on cli_uretypes.dll
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_uretypes.config $(OUT)$/bin$/cli_uretypes.dll
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_URETYPES_POLICY_VERSION) \
-            -keyfile:$(BIN)$/cliuno.snk \
-            -link:$(BIN)$/cli_uretypes.config
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_uretypes.config: cli_uretypes_config $(BIN)$/cliureversion.mk 
-    $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
-    $< $@
-
-
-.ENDIF
diff --git a/cli_ure/util/makefile.pmk b/cli_ure/util/makefile.pmk
deleted file mode 100644
index f8b3b3588bfc..000000000000
--- a/cli_ure/util/makefile.pmk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# no translation here anyway
-.IF "$(L10N_framework)"==""
-.IF "$(COM)" == "MSC"
-BUILD_FOR_CLI = "true"
-CFLAGSENABLESYMBOLS:=-Z7
-.ENDIF
-.ENDIF			# "L10N_framework"==""
-
diff --git a/cli_ure/version/makefile.mk b/cli_ure/version/makefile.mk
deleted file mode 100644
index 9d88275dd009..000000000000
--- a/cli_ure/version/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..
-PRJNAME = cli_ure
-
-# for dummy
-TARGET = cliureversion.mk
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.INCLUDE : target.mk
-
-ALLTAR : \
-    $(BIN)$/cliureversion.mk 
-
-#always deliver a cliureversion.mk. It is needed for the packing process even for all other
-#platforms. Therefore BUILD_FOR_CLI is not used here 
-$(BIN)$/cliureversion.mk: version.txt 
-    $(GNUCOPY) $< $@