diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
-rw-r--r-- | autodoc/Executable_autodoc.mk | 172 | ||||
-rw-r--r-- | autodoc/Makefile | 7 | ||||
-rw-r--r-- | autodoc/Module_autodoc.mk | 15 | ||||
-rw-r--r-- | autodoc/prj/build.lst | 18 | ||||
-rw-r--r-- | autodoc/prj/d.lst | 2 | ||||
-rw-r--r-- | autodoc/prj/dmake | 0 | ||||
-rw-r--r-- | solenv/inc/libs.mk | 4 |
9 files changed, 198 insertions, 22 deletions
diff --git a/Repository.mk b/Repository.mk index 4f41824fbee3..9b1c8e03ae3c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Helper_register_executables,SDK, \ ifneq ($(OS),IOS) $(eval $(call gb_Helper_register_executables,SDK, \ + autodoc \ javamaker \ cppumaker \ regcompare \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index f8ce7f5801b2..d46e387f1dc5 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ accessibility \ animations \ + autodoc \ apple_remote \ avmedia \ basctl \ diff --git a/autodoc/Executable_autodoc.mk b/autodoc/Executable_autodoc.mk new file mode 100644 index 000000000000..e35b4277f610 --- /dev/null +++ b/autodoc/Executable_autodoc.mk @@ -0,0 +1,172 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +$(eval $(call gb_Executable_Executable,autodoc)) + +$(eval $(call gb_Executable_set_include,autodoc,\ + -I$(SRCDIR)/autodoc/inc \ + -I$(SRCDIR)/autodoc/source/inc \ + -I$(SRCDIR)/autodoc/source/parser/inc \ + -I$(SRCDIR)/autodoc/source/display/inc \ + -I$(SRCDIR)/autodoc/source/parser_i/inc \ + -I$(SRCDIR)/autodoc/source/ary/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,autodoc,\ + cosv \ + udm \ +)) + +$(eval $(call gb_Executable_add_exception_objects,autodoc,\ + autodoc/source/exes/adc_uni/adc_cl \ + autodoc/source/exes/adc_uni/adc_cmds \ + autodoc/source/exes/adc_uni/cmd_sincedata \ + autodoc/source/exes/adc_uni/adc_cmd_parse \ + autodoc/source/exes/adc_uni/main \ + autodoc/source/exes/adc_uni/adc_msg \ + autodoc/source/exes/adc_uni/cmd_run \ + autodoc/source/parser/tokens/tkp \ + autodoc/source/parser/tokens/tokdeal \ + autodoc/source/parser/tokens/stmstate \ + autodoc/source/parser/tokens/tkpcontx \ + autodoc/source/parser/kernel/x_parse \ + autodoc/source/parser/kernel/parsefct \ + autodoc/source/parser/kernel/x_docu \ + autodoc/source/display/kernel/displfct \ + autodoc/source/display/idl/hi_main \ + autodoc/source/display/idl/hfi_property \ + autodoc/source/display/idl/hfi_xrefpage \ + autodoc/source/display/idl/hfi_struct \ + autodoc/source/display/idl/hfi_interface \ + autodoc/source/display/idl/hfi_method \ + autodoc/source/display/idl/hfi_typetext \ + autodoc/source/display/idl/hfi_module \ + autodoc/source/display/idl/hfi_enum \ + autodoc/source/display/idl/hfi_navibar \ + autodoc/source/display/idl/hi_display \ + autodoc/source/display/idl/hfi_service \ + autodoc/source/display/idl/hfi_globalindex \ + autodoc/source/display/idl/hfi_singleton \ + autodoc/source/display/idl/hi_factory \ + autodoc/source/display/idl/hi_ary \ + autodoc/source/display/idl/hi_env \ + autodoc/source/display/idl/hfi_siservice \ + autodoc/source/display/idl/hfi_typedef \ + autodoc/source/display/idl/hfi_constgroup \ + autodoc/source/display/idl/hi_linkhelper \ + autodoc/source/display/idl/hfi_tag \ + autodoc/source/display/idl/hfi_hierarchy \ + autodoc/source/display/idl/hfi_doc \ + autodoc/source/display/html/cfrstd \ + autodoc/source/display/toolkit/hf_linachain \ + autodoc/source/display/toolkit/outputstack \ + autodoc/source/display/toolkit/hf_navi_main \ + autodoc/source/display/toolkit/out_position \ + autodoc/source/display/toolkit/hf_funcdecl \ + autodoc/source/display/toolkit/out_tree \ + autodoc/source/display/toolkit/hf_docentry \ + autodoc/source/display/toolkit/out_node \ + autodoc/source/display/toolkit/hf_navi_sub \ + autodoc/source/display/toolkit/hf_title \ + autodoc/source/display/toolkit/htmlfile \ + autodoc/source/tools/tkpchars \ + autodoc/source/tools/filecoll \ + autodoc/source/parser_i/tokens/x_parse2 \ + autodoc/source/parser_i/tokens/stmstar2 \ + autodoc/source/parser_i/tokens/tkpstam2 \ + autodoc/source/parser_i/tokens/stmstfi2 \ + autodoc/source/parser_i/tokens/stmstat2 \ + autodoc/source/parser_i/tokens/tkp2 \ + autodoc/source/parser_i/tokens/tkpcont2 \ + autodoc/source/parser_i/idl/pestate \ + autodoc/source/parser_i/idl/pe_const \ + autodoc/source/parser_i/idl/pe_selem \ + autodoc/source/parser_i/idl/tk_const \ + autodoc/source/parser_i/idl/semnode \ + autodoc/source/parser_i/idl/pe_func2 \ + autodoc/source/parser_i/idl/tk_keyw \ + autodoc/source/parser_i/idl/pe_singl \ + autodoc/source/parser_i/idl/tk_ident \ + autodoc/source/parser_i/idl/pe_file2 \ + autodoc/source/parser_i/idl/pe_tydf2 \ + autodoc/source/parser_i/idl/cx_sub \ + autodoc/source/parser_i/idl/parsenv2 \ + autodoc/source/parser_i/idl/pe_enum2 \ + autodoc/source/parser_i/idl/pe_type2 \ + autodoc/source/parser_i/idl/pe_struc \ + autodoc/source/parser_i/idl/pe_attri \ + autodoc/source/parser_i/idl/pe_iface \ + autodoc/source/parser_i/idl/distrib \ + autodoc/source/parser_i/idl/pe_evalu \ + autodoc/source/parser_i/idl/pe_excp \ + autodoc/source/parser_i/idl/tkp_uidl \ + autodoc/source/parser_i/idl/pe_property \ + autodoc/source/parser_i/idl/tk_punct \ + autodoc/source/parser_i/idl/pe_servi \ + autodoc/source/parser_i/idl/cx_idlco \ + autodoc/source/parser_i/idl/unoidl \ + autodoc/source/parser_i/idl/pe_vari2 \ + autodoc/source/parser_i/idoc/tk_xml \ + autodoc/source/parser_i/idoc/cx_docu2 \ + autodoc/source/parser_i/idoc/tk_atag2 \ + autodoc/source/parser_i/idoc/cx_dsapi \ + autodoc/source/parser_i/idoc/tk_docw2 \ + autodoc/source/parser_i/idoc/docu_pe2 \ + autodoc/source/parser_i/idoc/tk_html \ + autodoc/source/ary_i/kernel/ci_atag2 \ + autodoc/source/ary_i/kernel/ci_text2 \ + autodoc/source/ary_i/kernel/d_token \ + autodoc/source/ary/info/all_tags \ + autodoc/source/ary/info/all_dts \ + autodoc/source/ary/info/ci_attag \ + autodoc/source/ary/info/ci_text \ + autodoc/source/ary/kernel/qualiname \ + autodoc/source/ary/kernel/reposy \ + autodoc/source/ary/kernel/namesort \ + autodoc/source/ary/idl/i_typedef \ + autodoc/source/ary/idl/i_enum \ + autodoc/source/ary/idl/i_constant \ + autodoc/source/ary/idl/is_type \ + autodoc/source/ary/idl/i_reposypart \ + autodoc/source/ary/idl/i_exception \ + autodoc/source/ary/idl/it_sequence \ + autodoc/source/ary/idl/i_siservice \ + autodoc/source/ary/idl/i_ce2s \ + autodoc/source/ary/idl/it_builtin \ + autodoc/source/ary/idl/ia_type \ + autodoc/source/ary/idl/i_property \ + autodoc/source/ary/idl/it_tplparam \ + autodoc/source/ary/idl/i_comrela \ + autodoc/source/ary/idl/it_ce \ + autodoc/source/ary/idl/i_structelem \ + autodoc/source/ary/idl/i_function \ + autodoc/source/ary/idl/is_ce \ + autodoc/source/ary/idl/i_constgroup \ + autodoc/source/ary/idl/i2s_calculator \ + autodoc/source/ary/idl/it_explicit \ + autodoc/source/ary/idl/i_module \ + autodoc/source/ary/idl/i_enumvalue \ + autodoc/source/ary/idl/i_sisingleton \ + autodoc/source/ary/idl/i_traits \ + autodoc/source/ary/idl/i_attribute \ + autodoc/source/ary/idl/i_singleton \ + autodoc/source/ary/idl/i_interface \ + autodoc/source/ary/idl/i_service \ + autodoc/source/ary/idl/i_struct \ + autodoc/source/ary/idl/i_ce \ + autodoc/source/ary/idl/it_xnameroom \ + autodoc/source/ary/idl/i_param \ + autodoc/source/ary/idl/i_namelookup \ + autodoc/source/ary/idl/ia_ce \ + autodoc/source/ary/doc/d_oldidldocu \ + autodoc/source/ary/doc/d_docu \ + autodoc/source/ary/doc/d_node \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/autodoc/Makefile b/autodoc/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/autodoc/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/autodoc/Module_autodoc.mk b/autodoc/Module_autodoc.mk new file mode 100644 index 000000000000..5994a448b135 --- /dev/null +++ b/autodoc/Module_autodoc.mk @@ -0,0 +1,15 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +$(eval $(call gb_Module_Module,autodoc)) + +$(eval $(call gb_Module_add_targets,autodoc,\ + Executable_autodoc \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/autodoc/prj/build.lst b/autodoc/prj/build.lst index d74fe9e0c9f1..a497f323ab55 100644 --- a/autodoc/prj/build.lst +++ b/autodoc/prj/build.lst @@ -1,17 +1,3 @@ ar autodoc : cosv udm sal NULL -ar autodoc\source\ary\doc nmake - all ar_sr_doc NULL -ar autodoc\source\ary\idl nmake - all ar_sr_idl NULL -ar autodoc\source\ary\info nmake - all ar_sr_info NULL -ar autodoc\source\ary\kernel nmake - all ar_sr_kernel NULL -ar autodoc\source\ary_i\kernel nmake - all ar_sr_cinfo NULL -ar autodoc\source\display\html nmake - all ar_sd_html NULL -ar autodoc\source\display\kernel nmake - all ar_sd_kernel NULL -ar autodoc\source\display\idl nmake - all ar_sd_idl NULL -ar autodoc\source\display\toolkit nmake - all ar_sd_tkit NULL -ar autodoc\source\parser\kernel nmake - all ar_sp_krnl NULL -ar autodoc\source\parser\tokens nmake - all ar_sp_tok NULL -ar autodoc\source\parser_i\idl nmake - all ar_sp2_idl NULL -ar autodoc\source\parser_i\idoc nmake - all ar_sp2_idoc NULL -ar autodoc\source\parser_i\tokens nmake - all ar_sp2_tok NULL -ar autodoc\source\tools nmake - all ar_st NULL -ar autodoc\source\exes\adc_uni nmake - all ar_se_uni ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_krnl ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL +ar autodoc usr1 - all ar_mkout NULL +ar autodoc\prj nmake - all ar_prj NULL diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst index 99ad21da987c..8b137891791f 100644 --- a/autodoc/prj/d.lst +++ b/autodoc/prj/d.lst @@ -1,3 +1 @@ -..\%__SRC%\bin\autodoc.exe %_DEST%\bin\autodoc.exe -..\%__SRC%\bin\autodoc %_DEST%\bin\autodoc diff --git a/autodoc/prj/dmake b/autodoc/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/autodoc/prj/dmake +++ /dev/null diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index d01be0aef487..9e0bcd22c7b0 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -304,8 +304,6 @@ APP3RDLIB=-lapp SAMPLE3RDLIB=-lsample HNJLIB*=-lhyphen MYSPELLLIB=-lmyspell -COSVLIB=-lcosv -UDMLIB=-ludm ULINGULIB=-lulingu .IF "$(SYSTEM_HUNSPELL)" == "YES" HUNSPELLLIB=$(HUNSPELL_LIBS) @@ -520,8 +518,6 @@ APP3RDLIB= $(LIBPRE) app.lib SAMPLE3RDLIB= $(LIBPRE) sample.lib HNJLIB*=libhnj.lib MYSPELLLIB= $(LIBPRE) myspell.lib -COSVLIB=cosv.lib -UDMLIB= $(LIBPRE) udm.lib ULINGULIB=$(LIBPRE) libulingu.lib .IF "$(SYSTEM_HUNSPELL)" == "YES" HUNSPELLLIB=$(HUNSPELL_LIBS) |