extensions: convert resource, xmlextract to gbuild

9 files changed, 117 insertions, 164 deletions

diff --git a/Repository.mk b/Repository.mk
index adc87e2dbcc2..e7169f919ef9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -208,6 +208,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	placeware \
 	protocolhandler \
     qstart_gtk \
+	res \
     resourcemodel \
     rpt \
     rptui \
@@ -268,6 +269,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     xcr \
 	xmlfa \
 	xmlfd \
+	xmx \
     xo \
     xof \
 	xsltdlg \
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
new file mode 100644
index 000000000000..322197cbdbbf
--- /dev/null
+++ b/extensions/Library_res.mk
@@ -0,0 +1,56 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,res))
+
+$(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res))
+
+$(eval $(call gb_Library_add_api,res,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,res,\
+	vcl \
+	tl \
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,res,\
+	extensions/source/resource/ResourceIndexAccess \
+	extensions/source/resource/oooresourceloader \
+	extensions/source/resource/resourceservices \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_xmx.mk b/extensions/Library_xmx.mk
new file mode 100644
index 000000000000..1d4ccd501362
--- /dev/null
+++ b/extensions/Library_xmx.mk
@@ -0,0 +1,54 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xmx))
+
+$(eval $(call gb_Library_set_componentfile,xmx,extensions/source/xmlextract/xmx))
+
+$(eval $(call gb_Library_add_api,xmx,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmx,\
+	extensions/source/xmlextract/xmxtrct \
+	extensions/source/xmlextract/xmxuno \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmx,\
+	sot \
+	utl \
+	tl \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4bd1aa12574a..6865f53cf555 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -40,10 +40,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_dbp \
 	Library_log \
 	Library_pcr \
+	Library_res \
 	Library_scn \
 	Library_updatecheckui \
 	Library_updatefeed \
 	Library_updchk \
+	Library_xmx \
 	Package_bib \
 	Package_pcr \
 ))
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index e6bf64aa3120..0e7e855aa6ef 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -5,8 +5,6 @@ ex  extensions\inc                              nmake   -   all ex_inc NULL
 ex  extensions\inc\ucbhelper                    get     -   all ex_incucbh ex_inc NULL
 ex  extensions\source\activex\msidl             nmake   -   w   ex_axmsidl ex_inc NULL
 ex  extensions\source\activex\main              nmake   -   w   ex_axmain ex_axmsidl.w ex_inc NULL
-ex  extensions\source\resource                  nmake   -   all ex_resrc ex_inc NULL
-ex  extensions\source\xmlextract                nmake   -   all ex_xmlextr ex_inc NULL
 ex  extensions\util                             nmake   -   all ex_util NULL
 ex  extensions\prj                              nmake   -   all ex_prj NULL
 
diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/resource/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
deleted file mode 100644
index 4839ec0b7ca2..000000000000
--- a/extensions/source/resource/makefile.mk
+++ /dev/null
@@ -1,86 +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=extensions
-TARGET=res
-LIBTARGET=NO
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/ResourceIndexAccess.obj \
-    $(SLO)$/oooresourceloader.obj \
-    $(SLO)$/resourceservices.obj
-
-LIB1TARGET= 	$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=	$(SLOFILES)
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) 	 \
-        $(CPPULIB) 	 \
-        $(CPPUHELPERLIB) 	 \
-        $(SALLIB) 	 \
-        $(VCLLIB)	\
-        $(TOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=		ires
-SHL1LIBS=		$(LIB1TARGET)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
-
-ALLTAR : $(MISC)/res.component
-
-$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        res.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt res.component
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
deleted file mode 100644
index fa54df738b58..000000000000
--- a/extensions/source/xmlextract/makefile.mk
+++ /dev/null
@@ -1,73 +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=extensions
-TARGET=xmx
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/xmxuno.obj									\
-            $(SLO)$/xmxtrct.obj
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=	i$(SHL1TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS=\
-        $(SOTLIB)                       \
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/xmx.component
-
-$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xmx.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xmx.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1dfc4c9c40df..4b8c290abd23 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -176,17 +176,18 @@ my_components += \
     component/extensions/source/dbpilots/dbp \
     component/extensions/source/logging/log \
     component/extensions/source/propctrlr/pcr \
+    component/extensions/source/resource/res \
     component/extensions/source/scanner/scn \
     component/extensions/source/update/check/updchk.uno \
     component/extensions/source/update/feed/updatefeed \
     component/extensions/source/update/ui/updchk \
+    component/extensions/source/xmlextract/xmx \
     fpicker \
     fps_office \
-    res \
     syssh \
     tvhlp1 \
     ucpchelp1 \
-    xmx
+
 .ENDIF
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"