unixODBC/Makefile | 32 ++++++++++++++++++++++++++++++++ unixODBC/Module_unixODBC.mk | 30 ++++++++++++++++++++++++++++++ unixODBC/Package_inc.mk | 30 ++++++++++++++++++++++++++++++ unixODBC/prj/build.lst | 6 +++--- unixODBC/prj/d.lst | 3 --- unixODBC/prj/makefile.mk | 44 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 139 insertions(+), 6 deletions(-)
New commits: commit 19c13a1a1cc3f275cd2b11bb82afe0a3b75392d6 Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Nov 27 05:09:40 2017 +0000 Port main/unixOBDC to gbuild. Patch by: me diff --git a/unixODBC/Makefile b/unixODBC/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/unixODBC/Makefile @@ -0,0 +1,32 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the 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 000000000000..64490d02d5ae --- /dev/null +++ b/unixODBC/Module_unixODBC.mk @@ -0,0 +1,30 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Module_Module,unixODBC)) + +$(eval $(call gb_Module_add_targets,unixODBC,\ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/unixODBC/Package_inc.mk b/unixODBC/Package_inc.mk new file mode 100644 index 000000000000..c7fdc99911c8 --- /dev/null +++ b/unixODBC/Package_inc.mk @@ -0,0 +1,30 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Package_Package,unixODBC_inc,$(SRCDIR)/unixODBC)) + +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/iodbcunix.h,inc/iodbcunix.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sql.h,inc/sql.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sqlext.h,inc/sqlext.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sqltypes.h,inc/sqltypes.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sqlucode.h,inc/sqlucode.h)) diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst index 2adf385130db..e5a321e54500 100644 --- a/unixODBC/prj/build.lst +++ b/unixODBC/prj/build.lst @@ -1,3 +1,3 @@ -uo unixODBC : solenv NULL -uo unixODBC usr1 - all uo_mkout NULL -uo unixODBC\prj get - all uo_prj NULL +uo unixODBC : solenv NULL +uo unixODBC\prj nmake - all uo_prj NULL + diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst index 2825e1cad557..e69de29bb2d1 100644 --- a/unixODBC/prj/d.lst +++ b/unixODBC/prj/d.lst @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\odbc -..\inc\*.h %_DEST%\inc%_EXT%\external\odbc\*.h diff --git a/unixODBC/prj/makefile.mk b/unixODBC/prj/makefile.mk new file mode 100644 index 000000000000..c62c6a657d16 --- /dev/null +++ b/unixODBC/prj/makefile.mk @@ -0,0 +1,44 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits