[Libreoffice-commits] .: fileaccess/Library_fileacc.mk fileaccess/Makefile fileaccess/Module_fileaccess.mk fileaccess/prj fileaccess/source
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 2 07:53:50 PDT 2011
fileaccess/Library_fileacc.mk | 49 +++++++++++++++++++++++++
fileaccess/Makefile | 38 ++++++++++++++++++++
fileaccess/Module_fileaccess.mk | 32 ++++++++++++++++
fileaccess/prj/build.lst | 3 -
fileaccess/prj/d.lst | 6 ---
fileaccess/source/makefile.mk | 76 ----------------------------------------
6 files changed, 119 insertions(+), 85 deletions(-)
New commits:
commit c059712ee39d14c759c87551c8ac89c957de053b
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 2 14:57:37 2011 +0200
convert fileaccess to gbuild
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
new file mode 100644
index 0000000..272468c
--- /dev/null
+++ b/fileaccess/Library_fileacc.mk
@@ -0,0 +1,49 @@
+# 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
+# Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# David Tardon <dtardon at redhat.com>
+#
+# 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,fileacc))
+
+$(eval $(call gb_Library_set_include,fileacc,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fileacc,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ ucbhelper \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc))
+
+$(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess))
diff --git a/fileaccess/Makefile b/fileaccess/Makefile
new file mode 100644
index 0000000..a79aff8
--- /dev/null
+++ b/fileaccess/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk
new file mode 100644
index 0000000..fbab72e
--- /dev/null
+++ b/fileaccess/Module_fileaccess.mk
@@ -0,0 +1,32 @@
+# 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
+# Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# David Tardon <dtardon at redhat.com>
+#
+# 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,fileaccess))
+$(eval $(call gb_Module_add_targets,fileaccess,\
+ Library_fileacc \
+))
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst
deleted file mode 100644
index 0349810..0000000
--- a/fileaccess/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL
-fa fileaccess usr1 - all fa_mkout NULL
-fa fileaccess\source nmake - all fa_src NULL
diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst
deleted file mode 100644
index c9b2bdd..0000000
--- a/fileaccess/prj/d.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml
-..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
deleted file mode 100755
index 8c8a91b..0000000
--- a/fileaccess/source/makefile.mk
+++ /dev/null
@@ -1,76 +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=fileaccess
-TARGET=fileacc
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/FileAccess.obj
-# $(SLO)$/$(COMP1TYPELIST)_description.obj
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/fileacc.component
-
-$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fileacc.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fileacc.component
More information about the Libreoffice-commits
mailing list