Author: damjan
Date: Wed Nov 29 04:38:04 2017
New Revision: 1816599
URL: http://svn.apache.org/viewvc?rev=1816599&view=rev
Log:
Port main/sane and main/rdbmaker to gbuild.
Add reg to our known libraries (Windows implementation guessed).
Update Module_ooo.mk with unixODBC too.
Patch by: me
Added:
openoffice/trunk/main/rdbmaker/Executable_rdbmaker.mk
openoffice/trunk/main/rdbmaker/Makefile (with props)
openoffice/trunk/main/rdbmaker/Module_rdbmaker.mk
openoffice/trunk/main/rdbmaker/prj/makefile.mk
openoffice/trunk/main/sane/Makefile (with props)
openoffice/trunk/main/sane/Module_sane.mk
openoffice/trunk/main/sane/Package_inc.mk
openoffice/trunk/main/sane/prj/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/rdbmaker/prj/build.lst
openoffice/trunk/main/rdbmaker/prj/d.lst
openoffice/trunk/main/sane/prj/build.lst
openoffice/trunk/main/sane/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Wed Nov 29 04:38:04 2017
@@ -59,8 +59,10 @@ $(eval $(call gb_Module_add_moduledirs,o
oox \
padmin \
package \
+ rdbmaker \
reportdesign \
remotebridges \
+ sane \
sax \
sc \
sccomp \
@@ -84,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,o
vbahelper \
vcl \
udm \
+ unixODBC \
wizards \
writerfilter \
x11_extensions \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Nov 29 04:38:04 2017
@@ -29,6 +29,7 @@ $(eval $(call gb_Helper_register_executa
bmpsum \
g2g \
mkunroll \
+ rdbmaker \
rscdep \
so_checksum \
srvdepy \
@@ -100,6 +101,7 @@ $(eval $(call gb_Helper_register_librari
oox \
package2 \
qstart_gtk \
+ reg \
rpt \
rptui \
rptxml \
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Wed Nov 29 04:38:04 2017
@@ -83,6 +83,7 @@ gb_Library_FILENAMES := $(patsubst ssl:i
gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
@@ -141,6 +142,7 @@ gb_Library_FILENAMES := $(patsubst ssl:i
gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst
graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
Added: openoffice/trunk/main/rdbmaker/Executable_rdbmaker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/Executable_rdbmaker.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/rdbmaker/Executable_rdbmaker.mk (added)
+++ openoffice/trunk/main/rdbmaker/Executable_rdbmaker.mk Wed Nov 29 04:38:04
2017
@@ -0,0 +1,58 @@
+###############################################################
+#
+# 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_Executable_Executable,rdbmaker))
+
+$(eval $(call gb_Executable_add_api,rdbmaker,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,rdbmaker,\
+ -I$(SRCDIR)/rdbmaker/inc/pch \
+ -I$(SRCDIR)/rdbmaker/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,rdbmaker,\
+ cppu \
+ cppuhelper \
+ reg \
+ sal \
+ salhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,rdbmaker,\
+ rdbmaker/source/codemaker/typemanager \
+ rdbmaker/source/codemaker/global \
+ rdbmaker/source/codemaker/dependency \
+ rdbmaker/source/codemaker/options \
+ rdbmaker/source/rdbmaker/rdbmaker \
+ rdbmaker/source/rdbmaker/specialtypemanager \
+ rdbmaker/source/rdbmaker/typeblop \
+ rdbmaker/source/rdbmaker/rdbtype \
+ rdbmaker/source/rdbmaker/rdboptions \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/rdbmaker/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/Makefile?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/rdbmaker/Makefile (added)
+++ openoffice/trunk/main/rdbmaker/Makefile Wed Nov 29 04:38:04 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/rdbmaker/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/rdbmaker/Module_rdbmaker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/Module_rdbmaker.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/rdbmaker/Module_rdbmaker.mk (added)
+++ openoffice/trunk/main/rdbmaker/Module_rdbmaker.mk Wed Nov 29 04:38:04 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,rdbmaker))
+
+$(eval $(call gb_Module_add_targets,rdbmaker,\
+ Executable_rdbmaker \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/rdbmaker/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/prj/build.lst?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/rdbmaker/prj/build.lst (original)
+++ openoffice/trunk/main/rdbmaker/prj/build.lst Wed Nov 29 04:38:04 2017
@@ -1,6 +1,2 @@
rm rdbmaker : cppuhelper NULL
-rm rdbmaker
usr1 - all rm_mkout NULL
-rm rdbmaker\inc get
- all rm_inc NULL
-rm rdbmaker\prj get
- all rm_prj NULL
-rm rdbmaker\source\codemaker nmake -
all rm_codemaker NULL
-rm rdbmaker\source\rdbmaker nmake -
all rm_rdbmaker rm_codemaker NULL
+rm rdbmaker\prj nmake
- all rm_prj NULL
Modified: openoffice/trunk/main/rdbmaker/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/prj/d.lst?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/rdbmaker/prj/d.lst (original)
+++ openoffice/trunk/main/rdbmaker/prj/d.lst Wed Nov 29 04:38:04 2017
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin%_EXT%\rdbmaker.exe
-..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin%_EXT%\rdbmaker.pdb
-
-..\%__SRC%\bin\rdbmaker %_DEST%\bin%_EXT%\rdbmaker
Added: openoffice/trunk/main/rdbmaker/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rdbmaker/prj/makefile.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/rdbmaker/prj/makefile.mk (added)
+++ openoffice/trunk/main/rdbmaker/prj/makefile.mk Wed Nov 29 04:38:04 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
Added: openoffice/trunk/main/sane/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/Makefile?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/sane/Makefile (added)
+++ openoffice/trunk/main/sane/Makefile Wed Nov 29 04:38:04 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/sane/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/sane/Module_sane.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/Module_sane.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/sane/Module_sane.mk (added)
+++ openoffice/trunk/main/sane/Module_sane.mk Wed Nov 29 04:38:04 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,sane))
+
+$(eval $(call gb_Module_add_targets,sane,\
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/sane/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/Package_inc.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/sane/Package_inc.mk (added)
+++ openoffice/trunk/main/sane/Package_inc.mk Wed Nov 29 04:38:04 2017
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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,sane_inc,$(SRCDIR)/sane))
+
+$(eval $(call
gb_Package_add_file,sane_inc,inc/external/sane/sane.h,inc/sane.h))
Modified: openoffice/trunk/main/sane/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/prj/build.lst?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/sane/prj/build.lst (original)
+++ openoffice/trunk/main/sane/prj/build.lst Wed Nov 29 04:38:04 2017
@@ -1,3 +1,2 @@
sa sane : solenv NULL
-sa sane usr1 -
all sa_mkout NULL
-sa sane\prj get
- all sa_prj NULL
+sa sane\prj nmake
- all sa_prj NULL
Modified: openoffice/trunk/main/sane/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/prj/d.lst?rev=1816599&r1=1816598&r2=1816599&view=diff
==============================================================================
--- openoffice/trunk/main/sane/prj/d.lst (original)
+++ openoffice/trunk/main/sane/prj/d.lst Wed Nov 29 04:38:04 2017
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\sane
-..\inc\sane.h %_DEST%\inc%_EXT%\external\sane\sane.h
Added: openoffice/trunk/main/sane/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sane/prj/makefile.mk?rev=1816599&view=auto
==============================================================================
--- openoffice/trunk/main/sane/prj/makefile.mk (added)
+++ openoffice/trunk/main/sane/prj/makefile.mk Wed Nov 29 04:38:04 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
