Makefile.in | 10 ++++++---- RepositoryModule_ooo.mk | 1 + unixODBC/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ unixODBC/Module_unixODBC.mk | 34 ++++++++++++++++++++++++++++++++++ unixODBC/Package_inc.mk | 35 +++++++++++++++++++++++++++++++++++ unixODBC/prj/build.lst | 3 +-- unixODBC/prj/d.lst | 3 --- unixODBC/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 9 deletions(-)
New commits: commit 144d22dd8f10cb58e503cca16efdfa009e58d402 Author: Peter Foley <pefol...@verizon.net> Date: Sun Sep 18 20:11:02 2011 -0400 convert unixODBC to gbuild diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 58e31c5..e0935ea 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ tools \ ucbhelper \ udkapi \ + unixODBC \ unotools \ unoxml \ vbahelper \ diff --git a/unixODBC/Makefile b/unixODBC/Makefile new file mode 100644 index 0000000..5bedaf0 --- /dev/null +++ b/unixODBC/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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/unixODBC/Module_unixODBC.mk b/unixODBC/Module_unixODBC.mk new file mode 100644 index 0000000..084094c --- /dev/null +++ b/unixODBC/Module_unixODBC.mk @@ -0,0 +1,34 @@ +# +# 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 <pefol...@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_Module_Module,unixODBC)) + +$(eval $(call gb_Module_add_targets,unixODBC,\ + Package_inc \ +)) diff --git a/unixODBC/Package_inc.mk b/unixODBC/Package_inc.mk new file mode 100644 index 0000000..1d6e956 --- /dev/null +++ b/unixODBC/Package_inc.mk @@ -0,0 +1,35 @@ +# +# 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 <pefol...@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_Package_Package,odbc_inc,$(SRCDIR)/unixODBC/inc)) + +$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sql.h,sql.h)) +$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqlext.h,sqlext.h)) +$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqltypes.h,sqltypes.h)) +$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqlucode.h,sqlucode.h)) diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst index 2adf385..509f043 100644 --- a/unixODBC/prj/build.lst +++ b/unixODBC/prj/build.lst @@ -1,3 +1,2 @@ uo unixODBC : solenv NULL -uo unixODBC usr1 - all uo_mkout NULL -uo unixODBC\prj get - all uo_prj NULL +uo unixODBC\prj nmake - all uo_prj NULL diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst index 6b3fa94..e69de29 100644 --- a/unixODBC/prj/d.lst +++ b/unixODBC/prj/d.lst @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc\external -mkdir: %_DEST%\inc\external\odbc -..\inc\*.h %_DEST%\inc\external\odbc\*.h diff --git a/unixODBC/prj/makefile.mk b/unixODBC/prj/makefile.mk new file mode 100644 index 0000000..85b2566 --- /dev/null +++ b/unixODBC/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$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog commit 3ecacffe7b0df17967508f62846c0709294d0ddf Author: Peter Foley <pefol...@verizon.net> Date: Sun Sep 18 18:45:19 2011 -0400 change distclean to delete configure generated files diff --git a/Makefile.in b/Makefile.in index fcd88b9..ecad732 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,12 +69,14 @@ distro-pack-install: install ./bin/distro-install-sdk ./bin/distro-install-file-lists -distclean: - -rm config.cache - -rm config.log +distclean: clean ifeq (@BUILD_DMAKE@,YES) - -$(GNUMAKE) -C dmake distclean + -test -f dmake/Makefile && $(MAKE) -C dmake distclean endif + rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \ + bin/repo-list bootstrap config.log config.status configure \ + desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ + set_soenv set_soenv.last set_soenv.stamp src.downloaded warn clean: . ./Env.Host.sh && \ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits