Module_ooo.mk | 3 ++ Repository.mk | 2 + RepositoryFixes.mk | 2 + rdbmaker/Executable_rdbmaker.mk | 58 ++++++++++++++++++++++++++++++++++++++++ rdbmaker/Makefile | 32 ++++++++++++++++++++++ rdbmaker/Module_rdbmaker.mk | 30 ++++++++++++++++++++ rdbmaker/prj/build.lst | 6 ---- rdbmaker/prj/d.lst | 4 -- rdbmaker/prj/makefile.mk | 44 ++++++++++++++++++++++++++++++ sane/Makefile | 32 ++++++++++++++++++++++ sane/Module_sane.mk | 30 ++++++++++++++++++++ sane/Package_inc.mk | 26 +++++++++++++++++ sane/prj/build.lst | 3 -- sane/prj/d.lst | 3 -- sane/prj/makefile.mk | 44 ++++++++++++++++++++++++++++++ 15 files changed, 305 insertions(+), 14 deletions(-)
New commits: commit aace36ef4f70f9275be9a8143f0c7a0cbebfe5c7 Author: Damjan Jovanovic <dam...@apache.org> Date: Wed Nov 29 04:38:04 2017 +0000 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 diff --git a/Module_ooo.mk b/Module_ooo.mk index dce43be0f3a1..a0b3b1b65de0 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -59,8 +59,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ oox \ padmin \ package \ + rdbmaker \ reportdesign \ remotebridges \ + sane \ sax \ sc \ sccomp \ @@ -84,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ vbahelper \ vcl \ udm \ + unixODBC \ wizards \ writerfilter \ x11_extensions \ diff --git a/Repository.mk b/Repository.mk index c3242729a65e..a485eb47ffca 100644 --- a/Repository.mk +++ b/Repository.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ bmpsum \ g2g \ mkunroll \ + rdbmaker \ rscdep \ so_checksum \ srvdepy \ @@ -100,6 +101,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ oox \ package2 \ qstart_gtk \ + reg \ rpt \ rptui \ rptxml \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 70195f30f003..3b2295e133cc 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -83,6 +83,7 @@ gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) 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:issl%,ssl:ssleay32%,$(gb_Library_FILENAME 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)) diff --git a/rdbmaker/Executable_rdbmaker.mk b/rdbmaker/Executable_rdbmaker.mk new file mode 100644 index 000000000000..c461ef0f4b14 --- /dev/null +++ b/rdbmaker/Executable_rdbmaker.mk @@ -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: diff --git a/rdbmaker/Makefile b/rdbmaker/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/rdbmaker/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/rdbmaker/Module_rdbmaker.mk b/rdbmaker/Module_rdbmaker.mk new file mode 100644 index 000000000000..e9becfcb10a3 --- /dev/null +++ b/rdbmaker/Module_rdbmaker.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,rdbmaker)) + +$(eval $(call gb_Module_add_targets,rdbmaker,\ + Executable_rdbmaker \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/rdbmaker/prj/build.lst b/rdbmaker/prj/build.lst index e10522229b01..96e454a6022d 100644 --- a/rdbmaker/prj/build.lst +++ b/rdbmaker/prj/build.lst @@ -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 diff --git a/rdbmaker/prj/d.lst b/rdbmaker/prj/d.lst index 4476addfa59e..e69de29bb2d1 100644 --- a/rdbmaker/prj/d.lst +++ b/rdbmaker/prj/d.lst @@ -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 diff --git a/rdbmaker/prj/makefile.mk b/rdbmaker/prj/makefile.mk new file mode 100644 index 000000000000..c62c6a657d16 --- /dev/null +++ b/rdbmaker/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 diff --git a/sane/Makefile b/sane/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/sane/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/sane/Module_sane.mk b/sane/Module_sane.mk new file mode 100644 index 000000000000..9f45301ea659 --- /dev/null +++ b/sane/Module_sane.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,sane)) + +$(eval $(call gb_Module_add_targets,sane,\ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sane/Package_inc.mk b/sane/Package_inc.mk new file mode 100644 index 000000000000..46f165e83325 --- /dev/null +++ b/sane/Package_inc.mk @@ -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)) diff --git a/sane/prj/build.lst b/sane/prj/build.lst index c1c6fb90bfdc..75b95db3f660 100644 --- a/sane/prj/build.lst +++ b/sane/prj/build.lst @@ -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 diff --git a/sane/prj/d.lst b/sane/prj/d.lst index ee8c0c67b682..e69de29bb2d1 100644 --- a/sane/prj/d.lst +++ b/sane/prj/d.lst @@ -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 diff --git a/sane/prj/makefile.mk b/sane/prj/makefile.mk new file mode 100644 index 000000000000..c62c6a657d16 --- /dev/null +++ b/sane/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