Author: damjan
Date: Mon Nov 27 05:09:40 2017
New Revision: 1816410
URL: http://svn.apache.org/viewvc?rev=1816410&view=rev
Log:
Port main/unixOBDC to gbuild.
Patch by: me
Added:
openoffice/trunk/main/unixODBC/Makefile (with props)
openoffice/trunk/main/unixODBC/Module_unixODBC.mk
openoffice/trunk/main/unixODBC/Package_inc.mk
openoffice/trunk/main/unixODBC/prj/makefile.mk
Modified:
openoffice/trunk/main/unixODBC/prj/build.lst
openoffice/trunk/main/unixODBC/prj/d.lst
Added: openoffice/trunk/main/unixODBC/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/Makefile?rev=1816410&view=auto
==============================================================================
--- openoffice/trunk/main/unixODBC/Makefile (added)
+++ openoffice/trunk/main/unixODBC/Makefile Mon Nov 27 05:09:40 2017
@@ -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:
Propchange: openoffice/trunk/main/unixODBC/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/unixODBC/Module_unixODBC.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/Module_unixODBC.mk?rev=1816410&view=auto
==============================================================================
--- openoffice/trunk/main/unixODBC/Module_unixODBC.mk (added)
+++ openoffice/trunk/main/unixODBC/Module_unixODBC.mk Mon Nov 27 05:09:40 2017
@@ -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:
Added: openoffice/trunk/main/unixODBC/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/Package_inc.mk?rev=1816410&view=auto
==============================================================================
--- openoffice/trunk/main/unixODBC/Package_inc.mk (added)
+++ openoffice/trunk/main/unixODBC/Package_inc.mk Mon Nov 27 05:09:40 2017
@@ -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))
Modified: openoffice/trunk/main/unixODBC/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/prj/build.lst?rev=1816410&r1=1816409&r2=1816410&view=diff
==============================================================================
--- openoffice/trunk/main/unixODBC/prj/build.lst (original)
+++ openoffice/trunk/main/unixODBC/prj/build.lst Mon Nov 27 05:09:40 2017
@@ -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
+
Modified: openoffice/trunk/main/unixODBC/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/prj/d.lst?rev=1816410&r1=1816409&r2=1816410&view=diff
==============================================================================
--- openoffice/trunk/main/unixODBC/prj/d.lst (original)
+++ openoffice/trunk/main/unixODBC/prj/d.lst Mon Nov 27 05:09:40 2017
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\odbc
-..\inc\*.h %_DEST%\inc%_EXT%\external\odbc\*.h
Added: openoffice/trunk/main/unixODBC/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unixODBC/prj/makefile.mk?rev=1816410&view=auto
==============================================================================
--- openoffice/trunk/main/unixODBC/prj/makefile.mk (added)
+++ openoffice/trunk/main/unixODBC/prj/makefile.mk Mon Nov 27 05:09:40 2017
@@ -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
