convert uui to gbuild

9 files changed, 262 insertions, 143 deletions

diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
new file mode 100644
index 000000000000..d3354988dd31
--- /dev/null
+++ b/uui/AllLangResTarget_uui.mk
@@ -0,0 +1,58 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_AllLangResTarget_AllLangResTarget,uui))
+
+$(eval $(call gb_AllLangResTarget_add_srs,uui,\
+	uui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,uui/res))
+
+$(eval $(call gb_SrsTarget_add_files,uui/res,\
+	uui/source/alreadyopen.src \
+	uui/source/cookiedg.src \
+	uui/source/filechanged.src \
+	uui/source/fltdlg.src \
+	uui/source/ids.src \
+	uui/source/lockfailed.src \
+	uui/source/logindlg.src \
+	uui/source/masterpasscrtdlg.src \
+	uui/source/masterpassworddlg.src \
+	uui/source/nameclashdlg.src \
+	uui/source/newerverwarn.src \
+	uui/source/openlocked.src \
+	uui/source/passworddlg.src \
+	uui/source/passworderrs.src \
+	uui/source/secmacrowarnings.src \
+	uui/source/sslwarndlg.src \
+	uui/source/trylater.src \
+	uui/source/unknownauthdlg.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
new file mode 100644
index 000000000000..95fde292b921
--- /dev/null
+++ b/uui/Library_uui.mk
@@ -0,0 +1,83 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,uui))
+
+$(eval $(call gb_Library_set_componentfile,uui,uui/util/uui))
+
+$(eval $(call gb_Library_add_api,uui,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,uui,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	svl \
+	svt \
+	tk \
+	tl \
+	utl \
+	vcl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,uui,\
+	uui/source/alreadyopen \
+	uui/source/cookiedg \
+	uui/source/filechanged \
+	uui/source/fltdlg \
+	uui/source/iahndl \
+	uui/source/iahndl-authentication \
+	uui/source/iahndl-cookies \
+	uui/source/iahndl-errorhandler \
+	uui/source/iahndl-filter \
+	uui/source/iahndl-ioexceptions \
+	uui/source/iahndl-locking \
+	uui/source/iahndl-ssl \
+	uui/source/interactionhandler \
+	uui/source/lockfailed \
+	uui/source/logindlg \
+	uui/source/masterpasscrtdlg \
+	uui/source/masterpassworddlg \
+	uui/source/nameclashdlg \
+	uui/source/newerverwarn \
+	uui/source/openlocked \
+	uui/source/passwordcontainer \
+	uui/source/passworddlg \
+	uui/source/requeststringresolver \
+	uui/source/secmacrowarnings \
+	uui/source/services \
+	uui/source/sslwarndlg \
+	uui/source/trylater \
+	uui/source/unknownauthdlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/Makefile b/uui/Makefile
new file mode 100644
index 000000000000..6c4d53b5f316
--- /dev/null
+++ b/uui/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
new file mode 100644
index 000000000000..6ebe9af44ad9
--- /dev/null
+++ b/uui/Module_uui.mk
@@ -0,0 +1,37 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_Module_Module,uui))
+
+$(eval $(call gb_Module_add_targets,uui,\
+	AllLangResTarget_uui \
+	Library_uui \
+	Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/Package_xml.mk b/uui/Package_xml.mk
new file mode 100644
index 000000000000..dfa268a6ecae
--- /dev/null
+++ b/uui/Package_xml.mk
@@ -0,0 +1,33 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_Package_Package,uui_xml,$(SRCDIR)/uui))
+
+$(eval $(call gb_Package_add_file,uui_xml,xml/uui.xml,util/uui.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/prj/build.lst b/uui/prj/build.lst
index b27bd3ee9e2c..b2c6640b2c47 100644
--- a/uui/prj/build.lst
+++ b/uui/prj/build.lst
@@ -1,4 +1,2 @@
 uu	uui :    TRANSLATIONS:translations vcl svtools LIBXSLT:libxslt NULL
-uu	uui				usr1	-	all	uu_mkout NULL
-uu	uui\source	    nmake	-	all	uu_source NULL
-uu	uui\util	    nmake	-	all	uu_util uu_source NULL
+uu	uui\prj	    nmake	-	all	uu_prj NULL
diff --git a/uui/prj/d.lst b/uui/prj/d.lst
index 4e01426a3f52..e69de29bb2d1 100644
--- a/uui/prj/d.lst
+++ b/uui/prj/d.lst
@@ -1,10 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\uui*.dll %_DEST%\bin\uui*.dll
-..\%__SRC%\bin\uui*.res %_DEST%\bin\uui*.res
-..\%__SRC%\lib\libuui*.* %_DEST%\lib\libuui*.*
-..\%__SRC%\lib\iuui.lib %_DEST%\lib\iuui.lib
-
-..\util\uui.xml %_DEST%\xml\uui.xml
-..\%__SRC%\misc\uui.component %_DEST%\xml\uui.component
diff --git a/uui/util/makefile.mk b/uui/prj/makefile.mk
index 8a77e71b5e8d..bcb4970389b5 100755..100644
--- a/uui/util/makefile.mk
+++ b/uui/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -25,48 +25,16 @@
 #
 #*************************************************************************
 
-PRJ = ..
-PRJNAME = uui
-TARGET = uui
-RESTARGET = $(TARGET)
-
-GEN_HID = true
-NO_BSYMBOLIC = true
-
-.INCLUDE: settings.mk
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB = i$(TARGET)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-SHL1LIBS = \
-    $(SLB)$/source.lib
-
-SHL1STDLIBS = \
-    $(SVTOOLLIB) \
-    $(SVLLIB) \
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-RESLIB1NAME = $(RESTARGET)
-RESLIB1SRSFILES = \
-    $(SRS)$/source.srs
+PRJ=..
+TARGET=prj
 
-.INCLUDE: target.mk
+.INCLUDE : settings.mk
 
-ALLTAR : $(MISC)/uui.component
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
-$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        uui.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt uui.component
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk
deleted file mode 100755
index e09f5c01e967..000000000000
--- a/uui/source/makefile.mk
+++ /dev/null
@@ -1,87 +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 = uui
-TARGET = source
-ENABLE_EXCEPTIONS = true
-
-.INCLUDE: settings.mk
-
-SLOFILES = \
-    $(SLO)$/cookiedg.obj \
-    $(SLO)$/iahndl.obj \
-    $(SLO)$/iahndl-authentication.obj \
-    $(SLO)$/iahndl-ssl.obj \
-    $(SLO)$/iahndl-cookies.obj \
-    $(SLO)$/iahndl-filter.obj \
-    $(SLO)$/iahndl-locking.obj \
-    $(SLO)$/iahndl-ioexceptions.obj \
-    $(SLO)$/iahndl-errorhandler.obj \
-    $(SLO)$/logindlg.obj \
-    $(SLO)$/services.obj \
-    $(SLO)$/masterpassworddlg.obj \
-    $(SLO)$/masterpasscrtdlg.obj \
-    $(SLO)$/openlocked.obj \
-    $(SLO)$/passworddlg.obj \
-    $(SLO)$/fltdlg.obj \
-    $(SLO)$/interactionhandler.obj \
-    $(SLO)$/requeststringresolver.obj \
-    $(SLO)$/unknownauthdlg.obj \
-    $(SLO)$/sslwarndlg.obj \
-    $(SLO)$/secmacrowarnings.obj \
-    $(SLO)$/filechanged.obj \
-    $(SLO)$/alreadyopen.obj \
-    $(SLO)$/lockfailed.obj \
-    $(SLO)$/trylater.obj \
-    $(SLO)$/newerverwarn.obj \
-    $(SLO)$/nameclashdlg.obj \
-    $(SLO)$/passwordcontainer.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-    cookiedg.src \
-    ids.src \
-    logindlg.src \
-    masterpassworddlg.src \
-    masterpasscrtdlg.src \
-    openlocked.src \
-    passworddlg.src \
-    passworderrs.src \
-    fltdlg.src \
-    unknownauthdlg.src\
-    sslwarndlg.src\
-    secmacrowarnings.src\
-    filechanged.src\
-    alreadyopen.src\
-    lockfailed.src\
-    trylater.src\
-    nameclashdlg.src\
-    newerverwarn.src
-
-.INCLUDE: target.mk
-