[Libreoffice-commits] .: postprocess/packcomponents Repository.mk uui/AllLangResTarget_uui.mk uui/Library_uui.mk uui/Makefile uui/Module_uui.mk uui/Package_xml.mk uui/prj uui/source uui/util
Matus Kukan
mkukan at kemper.freedesktop.org
Tue Aug 9 16:51:12 PDT 2011
Repository.mk | 1
postprocess/packcomponents/makefile.mk | 2
uui/AllLangResTarget_uui.mk | 58 ++++++++++++++++++++++
uui/Library_uui.mk | 83 +++++++++++++++++++++++++++++++
uui/Makefile | 39 ++++++++++++++
uui/Module_uui.mk | 37 ++++++++++++++
uui/Package_xml.mk | 33 ++++++++++++
uui/prj/build.lst | 4 -
uui/prj/d.lst | 10 ---
uui/prj/makefile.mk | 40 +++++++++++++++
uui/source/makefile.mk | 87 ---------------------------------
uui/util/makefile.mk | 72 ---------------------------
12 files changed, 293 insertions(+), 173 deletions(-)
New commits:
commit 38dcd6a3b3fdaf3efcdf33f464f282e1f0673ffd
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Aug 10 01:49:06 2011 +0200
convert uui to gbuild
diff --git a/Repository.mk b/Repository.mk
index 13f1528..6cbdc2f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
unordf \
unoxml \
utl \
+ uui \
vbahelper \
vcl \
vclplug_gen \
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 885c2dd..bdfecb4 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -111,6 +111,7 @@ my_components = \
component/unotools/util/utl \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
+ component/uui/util/uui \
component/vbahelper/util/msforms \
component/writerfilter/util/writerfilter \
component/writerperfect/util/msworksfilter \
@@ -179,7 +180,6 @@ my_components = \
updatefeed \
updchk \
updchk.uno \
- uui \
vbaevents \
xmlfa \
xmlfd \
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
new file mode 100644
index 0000000..d335498
--- /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 at 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 0000000..95fde29
--- /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 at 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 0000000..6c4d53b
--- /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 0000000..6ebe9af
--- /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 at 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 0000000..dfa268a
--- /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 at 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 b27bd3e..b2c6640 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 4e01426..e69de29 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/prj/makefile.mk b/uui/prj/makefile.mk
new file mode 100644
index 0000000..bcb4970
--- /dev/null
+++ b/uui/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+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 e09f5c0..0000000
--- 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
-
diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk
deleted file mode 100755
index 8a77e71..0000000
--- a/uui/util/makefile.mk
+++ /dev/null
@@ -1,72 +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 = 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
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/uui.component
-
-$(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
More information about the Libreoffice-commits
mailing list