[Libreoffice-commits] .: remotebridges/InternalUnoApi_uuresolver.mk remotebridges/Library_uuresolver.mk remotebridges/Makefile remotebridges/Module_remotebridges.mk remotebridges/prj remotebridges/source Repository.mk ure/Rdb_ure.mk
David Tardon
dtardon at kemper.freedesktop.org
Sat May 26 09:01:35 PDT 2012
Repository.mk | 1
remotebridges/InternalUnoApi_uuresolver.mk | 32 ++++++++++
remotebridges/Library_uuresolver.mk | 47 +++++++++++++++
remotebridges/Makefile | 7 ++
remotebridges/Module_remotebridges.mk | 35 +++++++++++
remotebridges/prj/build.lst | 2
remotebridges/prj/d.lst | 4 -
remotebridges/source/unourl_resolver/makefile.mk | 72 -----------------------
ure/Rdb_ure.mk | 2
9 files changed, 124 insertions(+), 78 deletions(-)
New commits:
commit e726638eb8bd9e8fab3268259ddee9de88c56a39
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 26 16:06:33 2012 +0200
gbuildize remotebridges
Change-Id: I01e97df2f9f098719e3de578526cb1d13d2db6fa
diff --git a/Repository.mk b/Repository.mk
index ebefb94..a8cb169 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -561,6 +561,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
streams \
textinstream \
textoutstream \
+ uuresolver \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --git a/remotebridges/InternalUnoApi_uuresolver.mk b/remotebridges/InternalUnoApi_uuresolver.mk
new file mode 100644
index 0000000..2ac538e
--- /dev/null
+++ b/remotebridges/InternalUnoApi_uuresolver.mk
@@ -0,0 +1,32 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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_InternalUnoApi_InternalUnoApi,uuresolver))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver.xml))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk
new file mode 100644
index 0000000..15fa64e
--- /dev/null
+++ b/remotebridges/Library_uuresolver.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 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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,uuresolver))
+
+$(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
+
+$(eval $(call gb_Library_use_internal_api,uuresolver,\
+ uuresolver \
+))
+
+$(eval $(call gb_Library_use_libraries,uuresolver,\
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,uuresolver,\
+ remotebridges/source/unourl_resolver/unourl_resolver \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/remotebridges/Makefile b/remotebridges/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/remotebridges/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/remotebridges/Module_remotebridges.mk b/remotebridges/Module_remotebridges.mk
new file mode 100644
index 0000000..f439df7
--- /dev/null
+++ b/remotebridges/Module_remotebridges.mk
@@ -0,0 +1,35 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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,remotebridges))
+
+$(eval $(call gb_Module_add_targets,remotebridges,\
+ InternalUnoApi_uuresolver \
+ Library_uuresolver \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/remotebridges/prj/build.lst b/remotebridges/prj/build.lst
index ae454aa..55d192c 100644
--- a/remotebridges/prj/build.lst
+++ b/remotebridges/prj/build.lst
@@ -1,2 +1,2 @@
rb remotebridges : LIBXSLT:libxslt cppu cppuhelper offapi DESKTOP:rdbmaker sal NULL
-rb remotebridges\source\unourl_resolver nmake - all rb_urlresolv NULL
+rb remotebridges\prj nmake - all rb_prj NULL
diff --git a/remotebridges/prj/d.lst b/remotebridges/prj/d.lst
index 8f9c063..e69de29 100644
--- a/remotebridges/prj/d.lst
+++ b/remotebridges/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin\uuresolver.uno.dll
-..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib\uuresolver.uno.dylib
-..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib\uuresolver.uno.so
-..\%__SRC%\misc\uuresolver.component %_DEST%\xml\uuresolver.component
diff --git a/remotebridges/prj/dmake b/remotebridges/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
deleted file mode 100644
index 8e7e8f7..0000000
--- a/remotebridges/source/unourl_resolver/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=remotebridges
-TARGET = $(ENFORCEDSHLPREFIX)uuresolver.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = uuresolver
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/unourl_resolver.obj
-
-SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-
-SHL1STDLIBS= \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1RPATH= URELIB
-
-DEF1NAME= $(SHL1TARGET)
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/uuresolver.component
-
-$(MISC)/uuresolver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- uuresolver.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt uuresolver.component
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index 3b95231..6969fa5 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
io/source/stm/streams \
io/source/TextInputStream/textinstream \
io/source/TextOutputStream/textoutstream \
- uuresolver \
+ remotebridges/source/unourl_resolver/uuresolver \
))
ifneq ($(SOLAR_JAVA),)
More information about the Libreoffice-commits
mailing list