diff options
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | odk/CustomTarget_check.mk | 2 | ||||
| -rw-r--r-- | odk/docs/idl/wikilinks.py | 2 | ||||
| -rw-r--r-- | odk/docs/tools.html | 55 | ||||
| -rw-r--r-- | odk/util/check.pl | 2 |
5 files changed, 59 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index a796e5617cab..2152f22b251c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ treex \ ulfex \ unoidl-check \ - unoidl-read \ xrmex \ $(if $(filter-out ANDROID iOS WNT,$(OS)), \ svdemo \ @@ -94,6 +93,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ $(call gb_CondExeSp2bv,sp2bv) \ $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \ $(if $(filter ODK,$(BUILD_TYPE)),unoapploader) \ + unoidl-read \ unoidl-write \ $(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \ )) diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index eca13824062e..0286cc6cdc6c 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -29,7 +29,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \ $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) cppumaker \ - idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-write,\ + idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-read unoidl-write,\ $(call gb_Executable_get_target,$(exe))) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ diff --git a/odk/docs/idl/wikilinks.py b/odk/docs/idl/wikilinks.py index 4f44710b2daa..732c0e672c3a 100644 --- a/odk/docs/idl/wikilinks.py +++ b/odk/docs/idl/wikilinks.py @@ -15,7 +15,7 @@ # Usage: # # In core, generate a file letting us know what kinds of entities to declare: -# cat <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb') <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb $(INSTDIR)/program/types/offapi.rdb') | LC_ALL=C sort | LC_ALL=C uniq > /tmp/kinds +# cat <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR)/program $(INSTDIR)/sdk/bin/unoidl-read --summary $(INSTDIR)/program/types.rdb') <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR)/program $(INSTDIR)/sdk/bin/unoidl-read --summary $(INSTDIR)/program/types.rdb $(INSTDIR)/program/types/offapi.rdb') | LC_ALL=C sort | LC_ALL=C uniq > /tmp/kinds # # Run the script while feeding it the chapter references and output the fake IDL: # python wikilinks.py < idl_chapter_refs.txt > generated_idl_chapter_refs.idl diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 49d1e911cfc1..adbe0f1ddbdd 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -84,6 +84,12 @@ </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"/></td> + <td><a href="#unoidl-read" title="link to the unoidl-read tool description">unoidl-read</a></td> + <td class="content87">Tool to view type library data + in a human readable manner.</td> + </tr> + <tr valign="top"> + <td class="content3"><img src="images/arrow-1.gif"/></td> <td><a href="#cppumaker" title="link to the cppumaker tool description">cppumaker</a></td> <td class="content87">Tool for generating C++ code for the UNOIDL types stored in a type library.</td> @@ -462,6 +468,55 @@ <td> <table class="table2"> <tr> + <td colspan="2" class="head1"><a name="unoidl-read"/>unoidl-read</td> + <td align="right"> + <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a> + <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a> + </td> + </tr> + <tr> + <td colspan="3"> + <p>'unoidl-read' is a tool to show the contents of a type library. The tool writes the + content in a human readable manner to stdout.</p> + <p class="head2">Usage:</p> + <blockquote> + <b><code>unoidl-read [--published] [--summary] <registries></code></b> + </blockquote> + <p class="head2">Options:</p> + <table class="table4"> + <tr> + <td class="cell15"><code>--published</code></td> + <td class="cell85">if specified, only published entities (plus any non-published + entities referenced from published via any unpublished optional bases) are written + out.</td> + </tr> + <tr> + <td class="cell15"><code>--summary</code></td> + <td class="cell85">if specified, only a short summary is written, with the type and + name of one entity per line.</td> + </tr> + <tr> + <td class="cell15"><code><registries></code></td> + <td class="cell85">one or more <code><registry></code> elements, where each + is either a new- or legacy-format .rdb file, a single .idl file, or a root + directory of an .idl file tree. The content of the last + <code><registry></code> is written out. The other + <code><registry></code> elements are only used to look up dependencies.</td> + </tr> + </table> + </td> + </tr> + </table> + <td class="content1"><img class="nothing8" src="images/nada.gif"/></td> + </tr> + <tr> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td> + </tr> + <tr> + <td class="content1"><img class="nothing8" src="images/nada.gif"/></td> + <td> + <table class="table2"> + <tr> <td colspan="2" class="head1"><a name="cppumaker"/>cppumaker</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a> diff --git a/odk/util/check.pl b/odk/util/check.pl index 84242f45829e..377c8be0dc58 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -46,7 +46,7 @@ if (-d "$SdkDir") { print "check binaries: "; if (check_dir("bin")) { my @binarylist = ( "idlc","cppumaker","javamaker", - "unoidl-write", + "unoidl-read", "unoidl-write", "unoapploader", "uno-skeletonmaker" ); if ($ENV{SYSTEM_UCPP} eq "") { push @binarylist,"ucpp"; |