Merge ~j-rivero/ubuntu/+source/lcm:ubuntu/devel into ubuntu/+source/lcm:ubuntu/devel
- Git
- lp:~j-rivero/ubuntu/+source/lcm
- ubuntu/devel
- Merge into ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | fb4072af37579678c217cec2784cf8e8f5e92a55 | ||||
Proposed branch: | ~j-rivero/ubuntu/+source/lcm:ubuntu/devel | ||||
Merge into: | ubuntu/+source/lcm:ubuntu/devel | ||||
Diff against target: |
53524 lines (+21228/-11084) 240 files modified
.clang-format (+18/-0) .gitignore (+2/-129) AUTHORS (+2/-0) CMakeLists.txt (+110/-0) NEWS.md (+53/-2) README.md (+21/-5) cmake/3.7/UseJava.cmake (+1443/-0) cmake/3.7/UseJavaClassFilelist.cmake (+58/-0) cmake/3.7/UseJavaSymlinks.cmake (+38/-0) cmake/3.7/javaTargets.cmake.in (+39/-0) cmake/FindGLib2.cmake (+124/-0) cmake/FindGo.cmake (+35/-0) debian/changelog (+40/-0) debian/control (+79/-26) debian/copyright (+45/-29) debian/liblcm-bin.lintian-overrides (+2/-0) debian/liblcm-dev.install (+4/-3) debian/liblcm-doc.docs (+3/-4) debian/liblcm-doc.links (+4/-0) debian/liblcm-java.install (+1/-1) debian/liblcm-java.jlibs (+1/-0) debian/patches/0001-fix-manpages-name.patch (+47/-0) debian/patches/0002-encode-utf8-java-chars.patch (+33/-0) debian/patches/0003-use-gnuinstalldir.patch (+102/-0) debian/patches/0004-use-offline-javadoc-links.patch (+30/-0) debian/patches/0005-use-java-system-dependencies.patch (+56/-0) debian/patches/0006-use-getst-system-test.patch (+22/-0) debian/patches/move-quotes-patch.patch (+15/-0) debian/patches/series (+7/-6) debian/python3-lcm.install (+1/-0) debian/rules (+22/-14) debian/tests/build-cpp-example (+12/-0) debian/tests/control (+7/-0) debian/tests/install (+22/-0) debian/watch (+7/-3) dev/null (+0/-405) docker/Dockerfile.fedora (+18/-0) docs/CMakeLists.txt (+59/-0) docs/Doxyfile.in (+2611/-0) docs/Makefile (+20/-0) docs/conf.py (+40/-0) docs/content/build-instructions.md (+106/-107) docs/content/java-notes.md (+9/-16) docs/content/lcm-type-ref.md (+79/-60) docs/content/log-file-format.md (+2/-3) docs/content/lua-api.md (+71/-72) docs/content/multicast-setup.md (+27/-50) docs/content/tutorial-c.md (+30/-30) docs/content/tutorial-cmake.md (+323/-0) docs/content/tutorial-cpp.md (+41/-41) docs/content/tutorial-dotnet.md (+57/-70) docs/content/tutorial-go.md (+208/-0) docs/content/tutorial-java.md (+43/-43) docs/content/tutorial-lcmgen.md (+23/-20) docs/content/tutorial-lua.md (+35/-35) docs/content/tutorial-matlab.md (+58/-43) docs/content/tutorial-python.md (+33/-33) docs/content/tutorial.md (+26/-19) docs/content/udp-multicast-protocol.md (+4/-4) docs/doxygen_output/c_cpp/html/group__LcmC.rst (+5/-0) docs/doxygen_output/c_cpp/html/group__LcmCpp.rst (+5/-0) docs/doxygen_output/lcm-dotnet/html/namespaces.rst (+5/-0) docs/index.rst (+160/-0) docs/javadocs/index.rst (+5/-0) docs/make.bat (+35/-0) docs/python/index.rst (+5/-0) docs/redirect.html (+3/-0) docs/release_checklist (+21/-50) examples/.gitignore (+13/-0) examples/c/CMakeLists.txt (+43/-0) examples/c/listener-async.c (+18/-21) examples/c/listener-glib.c (+21/-26) examples/c/listener.c (+13/-16) examples/c/read_log.c (+14/-16) examples/c/send_message.c (+7/-8) examples/cpp/CMakeLists.txt (+30/-0) examples/cpp/lcm_log_writer/CMakeLists.txt (+19/-0) examples/cpp/lcm_log_writer/main.cpp (+123/-0) examples/cpp/lcm_log_writer/pronto_joint_state_t.lcm (+16/-0) examples/cpp/listener.cpp (+26/-27) examples/cpp/read_log.cpp (+12/-14) examples/cpp/send_message.cpp (+3/-3) examples/go/gen.go (+10/-0) examples/go/listener/main.go (+49/-0) examples/go/sender/main.go (+50/-0) examples/matlab/listener.m (+2/-2) format_code.sh (+156/-0) lcm-cmake/config.cmake (+69/-0) lcm-cmake/cpack.cmake (+69/-0) lcm-cmake/functions.cmake (+50/-0) lcm-cmake/install.cmake (+66/-0) lcm-cmake/lcmConfig.cmake.in (+7/-0) lcm-cmake/lcmUtilities.cmake (+504/-0) lcm-cmake/mkdist.cmake (+15/-0) lcm-cmake/version.cmake (+11/-0) lcm-dotnet/Doxyfile.in (+2/-2) lcm-dotnet/lcm/lcm/TCPProvider.cs (+1/-6) lcm-go/README.md (+27/-0) lcm-go/lcm/lcm.go (+224/-0) lcm-go/lcm/lcm_test.go (+102/-0) lcm-java/CMakeLists.txt (+114/-0) lcm-java/lcm-logplayer-gui.1 (+7/-1) lcm-java/lcm-logplayer-gui.sh (+23/-0) lcm-java/lcm-spy.1 (+7/-1) lcm-java/lcm-spy.sh.in (+30/-0) lcm-java/lcm/lcm/LCM.java (+14/-8) lcm-java/lcm/lcm/TCPProvider.java (+0/-5) lcm-java/lcm/lcm/UDPMulticastProvider.java (+5/-1) lcm-java/lcm/logging/JScrubber.java (+2/-2) lcm-java/lcm/logging/Log.java (+3/-6) lcm-java/lcm/logging/LogPlayer.java (+108/-30) lcm-java/lcm/spy/ObjectPanel.java (+4/-4) lcm-java/lcm/spy/Spy.java (+58/-17) lcm-java/lcm/util/ClassDiscoverer.java (+1/-1) lcm-java/lcm/util/ParameterGUI.java (+3/-3) lcm-java/lcm/util/TableSorter.java (+4/-2) lcm-lite/lcmlite.c (+51/-37) lcm-lite/lcmlite.h (+5/-7) lcm-lite/lcmlite_ios.c (+22/-22) lcm-lite/lcmlite_ios.h (+9/-10) lcm-lite/lcmlite_posix.c (+26/-25) lcm-logger/CMakeLists.txt (+17/-0) lcm-logger/glib_util.c (+74/-88) lcm-logger/glib_util.h (+8/-9) lcm-logger/lcm-logger.1 (+1/-1) lcm-logger/lcm-logplayer.1 (+1/-1) lcm-logger/lcm_logger.c (+213/-229) lcm-logger/lcm_logplayer.c (+55/-62) lcm-lua/CMakeLists.txt (+22/-0) lcm-lua/debug_support.h (+80/-78) lcm-lua/init.c (+33/-24) lcm-lua/lua_ref_helper.c (+38/-35) lcm-lua/lua_ref_helper.h (+1/-1) lcm-lua/lua_ver_helper.h (+4/-4) lcm-lua/lualcm_hash.c (+146/-141) lcm-lua/lualcm_hash.h (+1/-1) lcm-lua/lualcm_lcm.c (+431/-420) lcm-lua/lualcm_lcm.h (+1/-1) lcm-lua/lualcm_pack.c (+775/-773) lcm-lua/lualcm_pack.h (+1/-1) lcm-lua/rock/LUAROCKS_INSTALL.md (+7/-4) lcm-lua/rock/lcm-1.5.0-0.rockspec (+4/-6) lcm-lua/utf8_check.c (+43/-37) lcm-pkgconfig/CMakeLists.txt (+11/-0) lcm-pkgconfig/lcm-java.pc.in (+12/-0) lcm-pkgconfig/lcm.pc.in (+12/-0) lcm-python/.gitignore (+1/-1) lcm-python/CMakeLists.txt (+59/-0) lcm-python/lcm/__init__.py (+2/-1) lcm-python/module.c (+45/-38) lcm-python/pyeventlog.c (+131/-152) lcm-python/pylcm.c (+178/-178) lcm-python/pylcm.h (+1/-1) lcm-python/pylcm_subscription.c (+68/-66) lcm-python/pylcm_subscription.h (+1/-1) lcm-python/setup.py (+26/-13) lcm/CMakeLists.txt (+91/-0) lcm/dbg.h (+18/-8) lcm/eventlog.c (+58/-58) lcm/eventlog.h (+17/-21) lcm/ioutils.h (+9/-5) lcm/lcm-cpp-impl.hpp (+189/-175) lcm/lcm-cpp.hpp (+543/-457) lcm/lcm.c (+194/-216) lcm/lcm.h (+39/-43) lcm/lcm_coretypes.h (+173/-118) lcm/lcm_file.c (+140/-146) lcm/lcm_internal.h (+16/-20) lcm/lcm_memq.c (+68/-70) lcm/lcm_mpudpm.c (+593/-665) lcm/lcm_tcpq.c (+130/-148) lcm/lcm_udpm.c (+455/-476) lcm/lcm_version.h (+16/-0) lcm/lcmtypes/channel_port_map_update_t.c (+84/-51) lcm/lcmtypes/channel_port_map_update_t.h (+19/-15) lcm/lcmtypes/channel_to_port_t.c (+45/-31) lcm/lcmtypes/channel_to_port_t.h (+15/-14) lcm/ringbuffer.c (+62/-66) lcm/ringbuffer.h (+8/-9) lcm/udpm_util.c (+141/-155) lcm/udpm_util.h (+46/-92) lcm/windows/WinLCM.cpp (+1/-6) lcm/windows/WinPorting.cpp (+172/-186) lcm/windows/WinPorting.h (+30/-40) lcmgen/CMakeLists.txt (+53/-0) lcmgen/emit_c.c (+433/-380) lcmgen/emit_cpp.c (+257/-205) lcmgen/emit_csharp.c (+368/-346) lcmgen/emit_go.c (+1635/-0) lcmgen/emit_java.c (+322/-300) lcmgen/emit_lua.c (+661/-651) lcmgen/emit_python.c (+480/-456) lcmgen/getopt.c (+56/-63) lcmgen/getopt.h (+18/-17) lcmgen/lcmgen.c (+127/-151) lcmgen/lcmgen.h (+62/-66) lcmgen/main.c (+54/-35) lcmgen/tokenize.c (+37/-42) lcmgen/tokenize.h (+11/-12) liblcm-test/CMakeLists.txt (+43/-0) liblcm-test/buftest-receiver.c (+11/-13) liblcm-test/buftest-sender.c (+12/-13) liblcm-test/lcm-example.c (+28/-30) liblcm-test/lcm-logfilter.c (+73/-88) liblcm-test/lcm-sink.c (+4/-3) liblcm-test/lcm-source.c (+62/-64) liblcm-test/lcm-tester.c (+98/-115) m4macros/CMakeLists.txt (+1/-0) test/CMakeLists.txt (+22/-0) test/README (+9/-10) test/c/CMakeLists.txt (+27/-0) test/c/client.cpp (+57/-58) test/c/common.c (+99/-131) test/c/common.h (+24/-27) test/c/eventlog_test.cpp (+41/-36) test/c/memq_test.cpp (+40/-37) test/c/server.c (+38/-57) test/c/udpm_test.cpp (+52/-8) test/cpp/CMakeLists.txt (+20/-0) test/cpp/client.cpp (+189/-119) test/cpp/common.cpp (+209/-193) test/cpp/common.hpp (+22/-21) test/cpp/memq_test.cpp (+18/-15) test/go/CMakeLists.txt (+15/-0) test/go/client_test.go (+338/-0) test/java/CMakeLists.txt (+34/-0) test/java/lcmtest/LcmTestClient.java (+11/-11) test/lua/CMakeLists.txt (+16/-0) test/lua/client.lua (+2/-2) test/python/.gitignore (+1/-0) test/python/CMakeLists.txt (+28/-0) test/python/bool_test.py (+4/-4) test/python/client.py (+5/-1) test/python/lcm_eventlog.py (+17/-0) test/python/lcm_file_test.py (+2/-0) test/python/lcm_udpm_queue_issue_test.py (+71/-0) test/run_client_server_test.py (+29/-0) test/types/CMakeLists.txt (+56/-0) test/types/lcmtest/exampleconst_t.lcm (+5/-0) test/types/lcmtest3/arrays_t.lcm (+6/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vladimir Petko (community) | Approve | ||
Dave Jones (community) | Needs Fixing | ||
Review via email: mp+463155@code.launchpad.net |
Commit message
New upstream 1.5.0 version.
Summary of the relevant changes in packaging:
* New upstream version 1.5.0+repack
* Formatter changes
* Bump standards to 4.6.2
* Use default-jdk package for java support
* Bump version to 1.5.0+repack1
* Rediff patches:
* PATCH: use gnuinstalldirs in CMake
* PATCH: use gtest from system
* PATCH: use java system dependencies instead of embedded files
* PATCH: Encode utf8 characters to fix the java build
* PATCH: fix manpages name to make lintian happy
* Add CMake to d/control
* Use --no-parallel for testing
* Cleanup d/rules
* Update liblcm-doc.docs for new paths
* Generalize d/liblcm-
* Convert package to use pybuild. Change d/rules heavily.
* Update java dependencies in d/control
* Update d/copyright file
* Keep lcm-java.pc only in the java package
* Remove .doctrees from the -docs package
* Add bindnow to DEB_BUILD_
* Replace embedded fonts and jquery with system dependencies
* Remove .gitignore from liblcm-doc installation
* Update existing patch for javadoc generation
* Rework java patch to use offline generation
* Reorder java dependencies: in -bin and -java
* Adding Section: to packages
* Added autotest: install and build-cpp
Description of the change
Requesting after conversation in https:/
Test PPA: https:/
Dave Jones (waveform) wrote : | # |
Sorry it's taken me a while to get around to reviewing this; I'm a bit confused as to what's being built though. The package in the PPA (https:/
I'll defer to Vladimir's much better judgment on the Java policy questions. In a test build I simply note that the lintian bad-jar-name warning is still present in the current build.
On documentation, I can offer some considerable simplification to the current configuration. All the manual linking of js and font-files currently undertaken for the sphinx output can be done away with. Simply change the dh line in d/rules to the following:
dh $@ --with=sphinxdoc --buildsystem=
And change the Depends of liblcm-doc like so:
Depends:
${misc:Depends},
${shlibs:
${sphinxdoc:
The dh_sphinxdoc system should take care of the dependencies and *most* of those symlinks. The only ones that are still needed are the ones for the javadoc output.
Other than the above, this is looking good!
Jose Luis Rivero (j-rivero) wrote : | # |
Thanks for taking the time to carefully review it!
Excuse my lack of experience with java related packages and this merge-requests ubuntu platform. New commits are answering the issues here containing changes relevant only to the description.
> Please rebase against the latest pkg/ubuntu/devel. The MP has conflicts in d/control and d/changelog.
Merge on top of my branch since rebase was quite painful.
> nit: consider using ~repack1 or ~us1 as the suffix so that if Debian publishes 1.5.0 we can use sync instead of fakesync.
Good idea, done.
> d/control:
> liblcm-java:
> java package must Architecture: all[1]. It would be nice to mention that the package also provides a GUI > interface (spy) as opposed to just Java Interface.
> We are not building Java tests, so we can drop junit4/hamcrest dependency for source/binary. Also the test code seems to depend on junit only.
Good catch the non any architecture for Java, I changed ot (required several file/patch changes) and removed the junit/hamcrest dependencies. There is now a warning in lintian after moving out the .pc file
W: liblcm-java: pkg-config-
We probably don't want to cross-compile the java jar in anyway that I know of and I'm not sure about the use of the pkg-config files by the Java community. Probably can add it to the overrides.
About the GUI interface in lcm-spy, all the binaries and tools are contained in the liblcm-bin package, not in liblcm-java.
> d/test/*: I wonder if it would be possible to use AUTOPKGTEST_TMP instead of WORKDIR? This way we can avoid managing a temporary directory.
Sure, changed.
> d/liblcm-
Thanks for the pointer, I was fighting with that for some time and did not realize that the type of files was reverse. Changed.
> d/rules: it would be nice to pass target release level to javac. This way we will future proof default java transitions.
> To do it add include /usr/share/
> Note: I wonder if using cmake build system will allow to do it easier?
> We also need to add -g to CMAKE_JAVA_
I've added to the pybuild cmake extension the -DLCM_JAVA_
> Some lintian warnings:
> W: liblcm-bin: no-manual-page [usr/bin/
> P: liblcm-doc: repeated-
Added both to overrides.
Jose Luis Rivero (j-rivero) wrote : | # |
Thanks Dave for the feedback, replies inline:
> Sorry it's taken me a while to get around to reviewing this; I'm a bit confused as to what's being built though. The package in the PPA (https:/
The PPA is configured to use a recipe that creates the new versions automatically so I don't have to push the source packages through the PPA. That was done before setting up this MR so it can be ignored. It was useful to determine that the code builds on all architectures.
> I'll defer to Vladimir's much better judgment on the Java policy questions. In a test build I simply note that the lintian bad-jar-name warning is still present in the current build.
I can reproduce the error. Should have been fixed by https:/
> On documentation, I can offer some considerable simplification to the current configuration. All the manual linking of js and font-files currently undertaken for the sphinx output can be done away with. Simply change the dh line in d/rules to the following:
> dh $@ --with=sphinxdoc --buildsystem=
Oh, that is wonderful. I applied it in https:/
Thanks again!
Vladimir Petko (vpa1977) wrote : | # |
Hi,
I've tried to build latest version of the package and it fails due to the following error:
---
make[5]: Entering directory '/<<PKGBUILDDIR
cd "/<<PKGBUILDDIR
/bin/sh: 1: PYTHONPATH=
make[5]: *** [docs/CMakeFile
---
It could be caused by the current state of the archive.
Note: The ppa build also fails due to the recipe version number.
Would it be possible to ping once the package builds?
Best Regards,
Vladimir.
Jose Luis Rivero (j-rivero) wrote : | # |
Friendly ping Vladimir:
> It could be caused by the current state of the archive.
The noble archive has been quite broken since your last test and it is still unstable but lcm should be able to be built on amd64.
> I've tried to build latest version of the package and it fails due to the following error:
That was probably because of the inconsistency of the archive, I never saw that error before on my local builds or the PPA.
> Note: The ppa build also fails due to the recipe version number.
Arg. The daily build versioning that I have in there is quite a mess but the code compilations all belongs to this merge request branch.
The package can build on amd64 today one hour ago:
https:/
Vladimir Petko (vpa1977) wrote : | # |
Thank you!!!
I will do some tests later today and upload.
Vladimir Petko (vpa1977) wrote (last edit ): | # |
Hi,
I have merged the branch, uploaded to ppa[1] and still getting the build error.
Apologies for missing this bit. We can use javahelper[2] to install jars without resorting to manually linking things. It should be sufficient to call `dh $@ --with=sphinxdoc --with=javahelper --buildsystem=
[1] https:/
[2] https:/
Vladimir Petko (vpa1977) wrote (last edit ): | # |
Hi, I think we need this patch to get the build passing:
----
--- a/docs/
+++ b/docs/
@@ -52,7 +52,7 @@
endif()
add_custom_
- COMMAND "PYTHONPATH=
+ COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=
WORKING_
DEPENDS doc-setup lcm-python lcm-python-init)
----
This is due to shell interpreting quoted PYTHONPATH as a command.
Vladimir Petko (vpa1977) wrote : | # |
I have pushed the branch with suggested fixes here[1]
I think lintian still complains about a couple of things:
W: liblcm-doc: embedded-
W: liblcm-doc: embedded-
W: liblcm-doc: embedded-
W: liblcm-bin: mismatched-override no-manual-page usr/bin/
W: liblcm-doc: mismatched-override repeated-
W: liblcm-bin: no-manual-page [usr/bin/
W: liblcm-java: pkg-config-
[1] https:/
Jose Luis Rivero (j-rivero) wrote : | # |
> I have pushed the branch with suggested fixes here[1]
Thanks so much for the patches! I pull them to my branch and added the DEP3 info.
> I think lintian still complains about a couple of things:
Umm, I thouhgt I had already fixed them, sorry for the noise. Last 4 commits in this branch address these problems.
Thanks again for the review!
Vladimir Petko (vpa1977) wrote : | # |
Thank you!!!!
I've uploaded it to ppa to run autopkgtests.
Meanwhile, would it be possible to bump a date on the changelog entry - at the moment it says 1 Feb which is before last changelog of 21 Mar =)
Jose Luis Rivero (j-rivero) wrote : | # |
> Meanwhile, would it be possible to bump a date on the changelog entry - at the moment it says 1 Feb which is before last changelog of 21 Mar =)
Sure, did it this morning.
Vladimir Petko (vpa1977) wrote : | # |
Autopkgtests pass:
- lcm/1.5.
+ ✅ lcm on noble for amd64 @ 10.04.24 03:27:29 Log️ 🗒️
+ ✅ lcm on noble for arm64 @ 10.04.24 03:18:06 Log️ 🗒️
+ ✅ lcm on noble for armhf @ 10.04.24 03:21:42 Log️ 🗒️
+ ❌ lcm on noble for i386 @ 10.04.24 03:14:55 Log️ 🗒️
• install FAIL 🟥
• build-cpp-example FAIL 🟥
+ ✅ lcm on noble for ppc64el @ 10.04.24 03:28:03 Log️ 🗒️
+ ✅ lcm on noble for s390x @ 10.04.24 03:42:41 Log️ 🗒️
I will upload after the beta freeze is over.
Thank you for your hard work!!!!!
Vladimir Petko (vpa1977) wrote : | # |
Uploaded, thank you!!!
Jose Luis Rivero (j-rivero) wrote : | # |
> Uploaded, thank you!!!
Yuhuuu! Thanks Vladimir for all the hints and your review time on this. I learnt quite a few tricks for java/sphinx.
Preview Diff
1 | diff --git a/.clang-format b/.clang-format |
2 | new file mode 100644 |
3 | index 0000000..7879065 |
4 | --- /dev/null |
5 | +++ b/.clang-format |
6 | @@ -0,0 +1,18 @@ |
7 | +# Clang-Format configuration file for automatically formatting source code |
8 | +--- |
9 | +BasedOnStyle: Google |
10 | +IndentWidth: 4 |
11 | +AccessModifierOffset: -2 |
12 | +TabWidth: 4 |
13 | +ColumnLimit: 100 |
14 | +DerivePointerAlignment: false |
15 | +PointerAlignment: Right |
16 | +SpaceAfterCStyleCast: true |
17 | +BreakBeforeBraces: Custom |
18 | +BraceWrapping: |
19 | + AfterFunction: true |
20 | +AllowShortFunctionsOnASingleLine: Inline |
21 | +AllowShortIfStatementsOnASingleLine: false |
22 | +AllowShortLoopsOnASingleLine: false |
23 | +IndentCaseLabels: false |
24 | +... |
25 | diff --git a/.gitignore b/.gitignore |
26 | index 9be5887..bd11e11 100644 |
27 | --- a/.gitignore |
28 | +++ b/.gitignore |
29 | @@ -1,129 +1,2 @@ |
30 | -.deps |
31 | -.libs |
32 | -*.o |
33 | -*.lo |
34 | -*.la |
35 | - |
36 | -ABOUT-NLS |
37 | -Makefile |
38 | -Makefile.in |
39 | -aclocal.m4 |
40 | -autom4te.cache/ |
41 | -compile |
42 | -config.guess |
43 | -config.log |
44 | -config.rpath |
45 | -config.status |
46 | -config.sub |
47 | -configure |
48 | -depcomp |
49 | -docs/html |
50 | -examples/Makefile |
51 | -examples/Makefile.in |
52 | -install-sh |
53 | -lcm-java/Makefile |
54 | -lcm-java/Makefile.in |
55 | -lcm-java/build/ |
56 | -lcm-java/classnoinst.stamp |
57 | -lcm-java/javadocs |
58 | -lcm-java/lcm-java.pc |
59 | -lcm-java/lcm-logplayer-gui |
60 | -lcm-java/lcm-spy |
61 | -lcm-java/lcm.jar |
62 | -lcm-java/.classpath |
63 | -lcm-java/.project |
64 | -lcm-java/jchart2d-code/jchart2d-3.2.2.jar |
65 | - |
66 | -lcm-logger/Makefile |
67 | -lcm-logger/Makefile.in |
68 | -lcm-logger/lcm-logger |
69 | -lcm-logger/lcm-logplayer |
70 | - |
71 | -lcm-python/html |
72 | -lcm-python/Makefile |
73 | -lcm-python/Makefile.in |
74 | - |
75 | -lcm/Makefile |
76 | -lcm/Makefile.in |
77 | -lcm/lcm.pc |
78 | -lcm/lcmtypes/.dirstamp |
79 | - |
80 | -lcmgen/Makefile |
81 | -lcmgen/Makefile.in |
82 | -lcmgen/lcm-gen |
83 | - |
84 | -liblcm-test/Makefile |
85 | -liblcm-test/Makefile.in |
86 | -liblcm-test/lcm-buftest-receiver |
87 | -liblcm-test/lcm-buftest-sender |
88 | -liblcm-test/lcm-example |
89 | -liblcm-test/lcm-logfilter |
90 | -liblcm-test/lcm-sink |
91 | -liblcm-test/lcm-source |
92 | -liblcm-test/lcm-tester |
93 | -libtool |
94 | -ltmain.sh |
95 | -m4/Makefile |
96 | -m4/Makefile.in |
97 | -m4/codeset.m4 |
98 | -m4/glibc2.m4 |
99 | -m4/glibc21.m4 |
100 | -m4/iconv.m4 |
101 | -m4/intdiv0.m4 |
102 | -m4/intmax.m4 |
103 | -m4/inttypes-pri.m4 |
104 | -m4/inttypes.m4 |
105 | -m4/inttypes_h.m4 |
106 | -m4/isc-posix.m4 |
107 | -m4/lcmessage.m4 |
108 | -m4/lib-ld.m4 |
109 | -m4/lib-link.m4 |
110 | -m4/lib-prefix.m4 |
111 | -m4/libtool.m4 |
112 | -m4/longdouble.m4 |
113 | -m4/longlong.m4 |
114 | -m4/ltoptions.m4 |
115 | -m4/ltsugar.m4 |
116 | -m4/ltversion.m4 |
117 | -m4/lt~obsolete.m4 |
118 | -m4/nls.m4 |
119 | -m4/po.m4 |
120 | -m4/printf-posix.m4 |
121 | -m4/progtest.m4 |
122 | -m4/signed.m4 |
123 | -m4/size_max.m4 |
124 | -m4/stdint_h.m4 |
125 | -m4/uintmax_t.m4 |
126 | -m4/ulonglong.m4 |
127 | -m4/wchar_t.m4 |
128 | -m4/wint_t.m4 |
129 | -m4/xsize.m4 |
130 | -m4macros/Makefile |
131 | -m4macros/Makefile.in |
132 | -missing |
133 | -mkinstalldirs |
134 | -py-compile |
135 | -test/.buildstamp |
136 | -test/c/client |
137 | -test/c/eventlog_test |
138 | -test/c/lcmtest*.c |
139 | -test/c/lcmtest*.h |
140 | -test/c/memq_test |
141 | -test/c/server |
142 | -test/c/udpm_test |
143 | -test/cpp/client |
144 | -test/cpp/lcmtest/ |
145 | -test/cpp/lcmtest2/ |
146 | -test/cpp/memq_test |
147 | -test/gtest/libgtest.a |
148 | -test/gtest/libgtest_main.a |
149 | -test/java/lcmtest/lcmtest |
150 | -test/java/lcmtest/lcmtest2 |
151 | -test/java/lcmtest.jar |
152 | -test/java/build |
153 | -test/lua/lcmtest |
154 | -test/lcm_unittest |
155 | -test/xmlrunner.pyc |
156 | -test/python/*.pyc |
157 | -test/python/lcmtest/ |
158 | -test/python/lcmtest2/ |
159 | +build*/ |
160 | +__pycache__ |
161 | diff --git a/AUTHORS b/AUTHORS |
162 | index a9ea2d1..7dd12c7 100644 |
163 | --- a/AUTHORS |
164 | +++ b/AUTHORS |
165 | @@ -13,3 +13,5 @@ |
166 | * Tim Perkins |
167 | * Randy Sybel |
168 | * Matt Walter |
169 | +* Jonas Kahler |
170 | +* Gustaf Johansson |
171 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
172 | new file mode 100644 |
173 | index 0000000..926ffac |
174 | --- /dev/null |
175 | +++ b/CMakeLists.txt |
176 | @@ -0,0 +1,110 @@ |
177 | +cmake_minimum_required(VERSION 3.1) |
178 | + |
179 | +if(POLICY CMP0111) |
180 | + cmake_policy(SET CMP0111 NEW) |
181 | +endif() |
182 | + |
183 | +project(lcm) |
184 | + |
185 | +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") |
186 | +if(CMAKE_VERSION VERSION_LESS 3.7) |
187 | + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3.7") |
188 | +endif() |
189 | + |
190 | +find_package(GLib2 REQUIRED) |
191 | + |
192 | +# Configuration and utility functions |
193 | +include(lcm-cmake/config.cmake NO_POLICY_SCOPE) |
194 | +include(lcm-cmake/functions.cmake) |
195 | +include(lcm-cmake/version.cmake) |
196 | + |
197 | +set(CMAKE_INCLUDE_CURRENT_DIR ON) |
198 | + |
199 | +# Set CMAKE_MACOSX_RPATH on macOS to satisfy policy CMP0042. |
200 | +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
201 | + set(CMAKE_MACOSX_RPATH FALSE) |
202 | +endif() |
203 | + |
204 | +# Core modules |
205 | +add_subdirectory(lcm) |
206 | +add_subdirectory(lcmgen) |
207 | +add_subdirectory(lcm-logger) |
208 | + |
209 | +option(LCM_ENABLE_EXAMPLES "Build test and example programs" ON) |
210 | +if(LCM_ENABLE_EXAMPLES) |
211 | + add_subdirectory(liblcm-test) |
212 | +endif() |
213 | + |
214 | +# Python |
215 | +lcm_option( |
216 | + LCM_ENABLE_PYTHON |
217 | + "Build Python bindings and utilities" |
218 | + PYTHON_FOUND Python) |
219 | +if(LCM_ENABLE_PYTHON) |
220 | + add_subdirectory(lcm-python) |
221 | +endif() |
222 | + |
223 | +# Documentation (Main, C/C++, .NET) |
224 | +add_subdirectory(docs) |
225 | + |
226 | +# Java |
227 | +lcm_option( |
228 | + LCM_ENABLE_JAVA |
229 | + "Build Java bindings and utilities" |
230 | + JAVA_FOUND Java 1.8) |
231 | +if(LCM_ENABLE_JAVA) |
232 | + add_subdirectory(lcm-java) |
233 | + add_custom_target(lcm-spy DEPENDS lcm-spy-alias) |
234 | + add_custom_target(lcm-logplayer-gui DEPENDS lcm-logplayer-gui-alias) |
235 | +endif() |
236 | + |
237 | +# Lua |
238 | +lcm_option( |
239 | + LCM_ENABLE_LUA |
240 | + "Build Lua bindings and utilities" |
241 | + LUA_FOUND Lua) |
242 | +if(LCM_ENABLE_LUA) |
243 | + add_subdirectory(lcm-lua) |
244 | +endif() |
245 | + |
246 | +# .NET |
247 | +# TODO |
248 | + |
249 | +# Go |
250 | +lcm_option( |
251 | + LCM_ENABLE_GO |
252 | + "Build Go utilities, bindings is source distributed" |
253 | + |
254 | + # Disable until #294 is resolved |
255 | + FALSE Go) |
256 | + # GO_FOUND Go) |
257 | + |
258 | +option(LCM_ENABLE_TESTS "Build unit tests" ON) |
259 | +if(LCM_ENABLE_TESTS) |
260 | + enable_testing() |
261 | + add_subdirectory(test) |
262 | +endif() |
263 | + |
264 | +# Install rules |
265 | +include(lcm-cmake/install.cmake) |
266 | + |
267 | +option(LCM_INSTALL_M4MACROS "Install autotools support M4 macros" ON) |
268 | +if(LCM_INSTALL_M4MACROS) |
269 | + add_subdirectory(m4macros) |
270 | +endif() |
271 | + |
272 | +option(LCM_INSTALL_PKGCONFIG "Install pkg-config files" ON) |
273 | +if(LCM_INSTALL_PKGCONFIG) |
274 | + add_subdirectory(lcm-pkgconfig) |
275 | +endif() |
276 | + |
277 | +# Distribution rules |
278 | +add_custom_target(dist |
279 | + COMMAND ${CMAKE_COMMAND} |
280 | + -DSOURCE_DIR=${lcm_SOURCE_DIR} |
281 | + -DOUTPUT_DIR=${lcm_BINARY_DIR} |
282 | + -DVERSION=${LCM_VERSION} |
283 | + -P ${lcm_SOURCE_DIR}/lcm-cmake/mkdist.cmake) |
284 | + |
285 | +# CPack packaging rules |
286 | +include(lcm-cmake/cpack.cmake) |
287 | diff --git a/INSTALL b/INSTALL |
288 | deleted file mode 100644 |
289 | index 5458714..0000000 |
290 | --- a/INSTALL |
291 | +++ /dev/null |
292 | @@ -1,234 +0,0 @@ |
293 | -Installation Instructions |
294 | -************************* |
295 | - |
296 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
297 | -2006 Free Software Foundation, Inc. |
298 | - |
299 | -This file is free documentation; the Free Software Foundation gives |
300 | -unlimited permission to copy, distribute and modify it. |
301 | - |
302 | -Basic Installation |
303 | -================== |
304 | - |
305 | -Briefly, the shell commands `./configure; make; make install' should |
306 | -configure, build, and install this package. The following |
307 | -more-detailed instructions are generic; see the `README' file for |
308 | -instructions specific to this package. |
309 | - |
310 | - The `configure' shell script attempts to guess correct values for |
311 | -various system-dependent variables used during compilation. It uses |
312 | -those values to create a `Makefile' in each directory of the package. |
313 | -It may also create one or more `.h' files containing system-dependent |
314 | -definitions. Finally, it creates a shell script `config.status' that |
315 | -you can run in the future to recreate the current configuration, and a |
316 | -file `config.log' containing compiler output (useful mainly for |
317 | -debugging `configure'). |
318 | - |
319 | - It can also use an optional file (typically called `config.cache' |
320 | -and enabled with `--cache-file=config.cache' or simply `-C') that saves |
321 | -the results of its tests to speed up reconfiguring. Caching is |
322 | -disabled by default to prevent problems with accidental use of stale |
323 | -cache files. |
324 | - |
325 | - If you need to do unusual things to compile the package, please try |
326 | -to figure out how `configure' could check whether to do them, and mail |
327 | -diffs or instructions to the address given in the `README' so they can |
328 | -be considered for the next release. If you are using the cache, and at |
329 | -some point `config.cache' contains results you don't want to keep, you |
330 | -may remove or edit it. |
331 | - |
332 | - The file `configure.ac' (or `configure.in') is used to create |
333 | -`configure' by a program called `autoconf'. You need `configure.ac' if |
334 | -you want to change it or regenerate `configure' using a newer version |
335 | -of `autoconf'. |
336 | - |
337 | -The simplest way to compile this package is: |
338 | - |
339 | - 1. `cd' to the directory containing the package's source code and type |
340 | - `./configure' to configure the package for your system. |
341 | - |
342 | - Running `configure' might take a while. While running, it prints |
343 | - some messages telling which features it is checking for. |
344 | - |
345 | - 2. Type `make' to compile the package. |
346 | - |
347 | - 3. Optionally, type `make check' to run any self-tests that come with |
348 | - the package. |
349 | - |
350 | - 4. Type `make install' to install the programs and any data files and |
351 | - documentation. |
352 | - |
353 | - 5. You can remove the program binaries and object files from the |
354 | - source code directory by typing `make clean'. To also remove the |
355 | - files that `configure' created (so you can compile the package for |
356 | - a different kind of computer), type `make distclean'. There is |
357 | - also a `make maintainer-clean' target, but that is intended mainly |
358 | - for the package's developers. If you use it, you may have to get |
359 | - all sorts of other programs in order to regenerate files that came |
360 | - with the distribution. |
361 | - |
362 | -Compilers and Options |
363 | -===================== |
364 | - |
365 | -Some systems require unusual options for compilation or linking that the |
366 | -`configure' script does not know about. Run `./configure --help' for |
367 | -details on some of the pertinent environment variables. |
368 | - |
369 | - You can give `configure' initial values for configuration parameters |
370 | -by setting variables in the command line or in the environment. Here |
371 | -is an example: |
372 | - |
373 | - ./configure CC=c99 CFLAGS=-g LIBS=-lposix |
374 | - |
375 | - *Note Defining Variables::, for more details. |
376 | - |
377 | -Compiling For Multiple Architectures |
378 | -==================================== |
379 | - |
380 | -You can compile the package for more than one kind of computer at the |
381 | -same time, by placing the object files for each architecture in their |
382 | -own directory. To do this, you can use GNU `make'. `cd' to the |
383 | -directory where you want the object files and executables to go and run |
384 | -the `configure' script. `configure' automatically checks for the |
385 | -source code in the directory that `configure' is in and in `..'. |
386 | - |
387 | - With a non-GNU `make', it is safer to compile the package for one |
388 | -architecture at a time in the source code directory. After you have |
389 | -installed the package for one architecture, use `make distclean' before |
390 | -reconfiguring for another architecture. |
391 | - |
392 | -Installation Names |
393 | -================== |
394 | - |
395 | -By default, `make install' installs the package's commands under |
396 | -`/usr/local/bin', include files under `/usr/local/include', etc. You |
397 | -can specify an installation prefix other than `/usr/local' by giving |
398 | -`configure' the option `--prefix=PREFIX'. |
399 | - |
400 | - You can specify separate installation prefixes for |
401 | -architecture-specific files and architecture-independent files. If you |
402 | -pass the option `--exec-prefix=PREFIX' to `configure', the package uses |
403 | -PREFIX as the prefix for installing programs and libraries. |
404 | -Documentation and other data files still use the regular prefix. |
405 | - |
406 | - In addition, if you use an unusual directory layout you can give |
407 | -options like `--bindir=DIR' to specify different values for particular |
408 | -kinds of files. Run `configure --help' for a list of the directories |
409 | -you can set and what kinds of files go in them. |
410 | - |
411 | - If the package supports it, you can cause programs to be installed |
412 | -with an extra prefix or suffix on their names by giving `configure' the |
413 | -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. |
414 | - |
415 | -Optional Features |
416 | -================= |
417 | - |
418 | -Some packages pay attention to `--enable-FEATURE' options to |
419 | -`configure', where FEATURE indicates an optional part of the package. |
420 | -They may also pay attention to `--with-PACKAGE' options, where PACKAGE |
421 | -is something like `gnu-as' or `x' (for the X Window System). The |
422 | -`README' should mention any `--enable-' and `--with-' options that the |
423 | -package recognizes. |
424 | - |
425 | - For packages that use the X Window System, `configure' can usually |
426 | -find the X include and library files automatically, but if it doesn't, |
427 | -you can use the `configure' options `--x-includes=DIR' and |
428 | -`--x-libraries=DIR' to specify their locations. |
429 | - |
430 | -Specifying the System Type |
431 | -========================== |
432 | - |
433 | -There may be some features `configure' cannot figure out automatically, |
434 | -but needs to determine by the type of machine the package will run on. |
435 | -Usually, assuming the package is built to be run on the _same_ |
436 | -architectures, `configure' can figure that out, but if it prints a |
437 | -message saying it cannot guess the machine type, give it the |
438 | -`--build=TYPE' option. TYPE can either be a short name for the system |
439 | -type, such as `sun4', or a canonical name which has the form: |
440 | - |
441 | - CPU-COMPANY-SYSTEM |
442 | - |
443 | -where SYSTEM can have one of these forms: |
444 | - |
445 | - OS KERNEL-OS |
446 | - |
447 | - See the file `config.sub' for the possible values of each field. If |
448 | -`config.sub' isn't included in this package, then this package doesn't |
449 | -need to know the machine type. |
450 | - |
451 | - If you are _building_ compiler tools for cross-compiling, you should |
452 | -use the option `--target=TYPE' to select the type of system they will |
453 | -produce code for. |
454 | - |
455 | - If you want to _use_ a cross compiler, that generates code for a |
456 | -platform different from the build platform, you should specify the |
457 | -"host" platform (i.e., that on which the generated programs will |
458 | -eventually be run) with `--host=TYPE'. |
459 | - |
460 | -Sharing Defaults |
461 | -================ |
462 | - |
463 | -If you want to set default values for `configure' scripts to share, you |
464 | -can create a site shell script called `config.site' that gives default |
465 | -values for variables like `CC', `cache_file', and `prefix'. |
466 | -`configure' looks for `PREFIX/share/config.site' if it exists, then |
467 | -`PREFIX/etc/config.site' if it exists. Or, you can set the |
468 | -`CONFIG_SITE' environment variable to the location of the site script. |
469 | -A warning: not all `configure' scripts look for a site script. |
470 | - |
471 | -Defining Variables |
472 | -================== |
473 | - |
474 | -Variables not defined in a site shell script can be set in the |
475 | -environment passed to `configure'. However, some packages may run |
476 | -configure again during the build, and the customized values of these |
477 | -variables may be lost. In order to avoid this problem, you should set |
478 | -them in the `configure' command line, using `VAR=value'. For example: |
479 | - |
480 | - ./configure CC=/usr/local2/bin/gcc |
481 | - |
482 | -causes the specified `gcc' to be used as the C compiler (unless it is |
483 | -overridden in the site shell script). |
484 | - |
485 | -Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
486 | -an Autoconf bug. Until the bug is fixed you can use this workaround: |
487 | - |
488 | - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash |
489 | - |
490 | -`configure' Invocation |
491 | -====================== |
492 | - |
493 | -`configure' recognizes the following options to control how it operates. |
494 | - |
495 | -`--help' |
496 | -`-h' |
497 | - Print a summary of the options to `configure', and exit. |
498 | - |
499 | -`--version' |
500 | -`-V' |
501 | - Print the version of Autoconf used to generate the `configure' |
502 | - script, and exit. |
503 | - |
504 | -`--cache-file=FILE' |
505 | - Enable the cache: use and save the results of the tests in FILE, |
506 | - traditionally `config.cache'. FILE defaults to `/dev/null' to |
507 | - disable caching. |
508 | - |
509 | -`--config-cache' |
510 | -`-C' |
511 | - Alias for `--cache-file=config.cache'. |
512 | - |
513 | -`--quiet' |
514 | -`--silent' |
515 | -`-q' |
516 | - Do not print messages saying which checks are being made. To |
517 | - suppress all normal output, redirect it to `/dev/null' (any error |
518 | - messages will still be shown). |
519 | - |
520 | -`--srcdir=DIR' |
521 | - Look for the package's source code in directory DIR. Usually |
522 | - `configure' can determine that directory automatically. |
523 | - |
524 | -`configure' also accepts some other, not widely useful, options. Run |
525 | -`configure --help' for more details. |
526 | - |
527 | diff --git a/Makefile.am b/Makefile.am |
528 | deleted file mode 100644 |
529 | index 925a98a..0000000 |
530 | --- a/Makefile.am |
531 | +++ /dev/null |
532 | @@ -1,16 +0,0 @@ |
533 | -SUBDIRS = m4 lcm liblcm-test lcmgen lcm-logger m4macros examples |
534 | - |
535 | -if HAVE_JAVA |
536 | -SUBDIRS += lcm-java |
537 | -endif |
538 | - |
539 | -if HAVE_PYTHON |
540 | -SUBDIRS += lcm-python |
541 | -endif |
542 | - |
543 | -if HAVE_LUA |
544 | -SUBDIRS += lcm-lua |
545 | -endif |
546 | - |
547 | -EXTRA_DIST = WinSpecific lcm-dotnet lcm-lite docs test |
548 | -ACLOCAL_AMFLAGS = -I m4 |
549 | diff --git a/NEWS b/NEWS.md |
550 | similarity index 84% |
551 | rename from NEWS |
552 | rename to NEWS.md |
553 | index 74a723b..a1c2deb 100644 |
554 | --- a/NEWS |
555 | +++ b/NEWS.md |
556 | @@ -1,3 +1,51 @@ |
557 | +April 19, 2023 |
558 | +============== |
559 | + |
560 | +Release 1.5.0 |
561 | + |
562 | +This is primarily a bugfix and maintenance release. |
563 | + |
564 | +- General |
565 | + - Several bug fixes |
566 | + - Fixed general and deprecation warnings on recent versions of Python and Java |
567 | +- Build system |
568 | + - Updated CMake to fix warnings |
569 | +- Docs |
570 | + - Now built through Sphinx with a ReadTheDocs theme |
571 | + - Automatically updated and deployed via CI/CD |
572 | + - Location has moved from https://lcm-proj.github.io/ to https://lcm-proj.github.io/lcm/ |
573 | +- Windows support |
574 | + - Moved from supporting Visual Studio to supporting a MSYS2 MGW64 environment |
575 | +- Java |
576 | + - Version 1.8 or later is now required |
577 | + |
578 | +August 30, 2018 |
579 | +============== |
580 | + |
581 | +Release 1.4.0 |
582 | + |
583 | +Significant changes: |
584 | + |
585 | +- Build system |
586 | + - Switch to CMake |
587 | + - Add CPack support |
588 | +- lcm-gen |
589 | + - Allow arrays to be sized with const values |
590 | +- C |
591 | + - Add lcm_subscription_get_queue_size() |
592 | + - Standardize C/C++ code formatting with clang-format |
593 | +- C++ |
594 | + - Add support for some C++11 features (lambda subscribe) |
595 | + - add lcm::Subscription::getQueueSize() |
596 | +- Go |
597 | + - Experimental support for golang |
598 | +- Python |
599 | + - Add __dimensions__ and __typenames__ fields for better introspection |
600 | +- lcm-logger |
601 | + - flush buffers before exiting |
602 | +- General |
603 | + - Lots of misc bugfixes |
604 | + |
605 | April 29, 2016 |
606 | ============== |
607 | |
608 | @@ -240,7 +288,10 @@ This is a bugfix and maintenance release. |
609 | - in WinPorting.h, #define strtoll _strtoi64 (re #46) |
610 | - add LCM C++ files to VS project file |
611 | - remove redundant WinSpecific/include/lcm dir. |
612 | - - move WinSpecific/Win*.{cpp,h} -> lcm/windows/ |
613 | + - move WinSpecific/Win*. |
614 | +{ |
615 | + cpp, h |
616 | +} -> lcm/windows/ |
617 | - adjust vcproj files accordingly |
618 | - update WinSpecific/README.txt and remove dead directory |
619 | lcm-logger: |
620 | @@ -364,7 +415,7 @@ This release includes a number of bugfixes and performance enhancements |
621 | For example, to set the queue size to 5 for a message type example_t: |
622 | |
623 | example_t_subscription_t* subs = example_t_subscribe(lcm, "EXAMPLE", message_handler); |
624 | - example_t_subscription_set_queue_capacity(subs, 5); |
625 | +example_t_subscription_set_queue_capacity(subs, 5); |
626 | |
627 | - Explicitly disallow recursive calls to lcm_handle. |
628 | - fix synchronization issues when allocating receive resources and |
629 | diff --git a/README.md b/README.md |
630 | index 73376a8..45af0af 100644 |
631 | --- a/README.md |
632 | +++ b/README.md |
633 | @@ -6,10 +6,18 @@ critical. It provides a publish/subscribe message passing model and automatic |
634 | marshalling/unmarshalling code generation with bindings for applications in a |
635 | variety of programming languages. |
636 | |
637 | +# Roadmap |
638 | + |
639 | +The LCM project is active again. The current near-term plan is to: |
640 | + |
641 | +* Clear deprecation warnings from build for all language targets |
642 | +* Flush backlog of PRs |
643 | +* Cut a new release |
644 | + |
645 | # Quick Links |
646 | |
647 | * [LCM downloads](https://github.com/lcm-proj/lcm/releases) |
648 | -* [Website and documentation](http://lcm-proj.github.io) |
649 | +* [Website and documentation](https://lcm-proj.github.io/lcm) |
650 | |
651 | # Features |
652 | |
653 | @@ -25,14 +33,22 @@ variety of programming languages. |
654 | |
655 | * Platforms: |
656 | * GNU/Linux |
657 | - * OS X |
658 | - * Windows |
659 | - * Any POSIX-1.2001 system (e.g., Cygwin, Solaris, BSD, etc.) |
660 | + * Ubuntu (20.04 and 22.04) |
661 | + * Fedora (37) |
662 | + * macOS (11 and 12) |
663 | + * Windows (2019 and 2022) via MSYS2 |
664 | * Languages |
665 | * C |
666 | * C++ |
667 | - * C# |
668 | * Java |
669 | * Lua |
670 | * MATLAB |
671 | * Python |
672 | + |
673 | +## Unmaintained languages |
674 | + |
675 | +The following languages are currently unmaintained. PRs for these languages are still welcome and if |
676 | +you are interested in maintaining them please let us know. |
677 | + |
678 | + * Go |
679 | + * C#/.NET |
680 | diff --git a/bootstrap.sh b/bootstrap.sh |
681 | deleted file mode 100755 |
682 | index 86befdb..0000000 |
683 | --- a/bootstrap.sh |
684 | +++ /dev/null |
685 | @@ -1,12 +0,0 @@ |
686 | -#!/bin/sh |
687 | - |
688 | -echo "running \"autoreconf -i\"..." |
689 | -autoreconf -i || exit 1 |
690 | - |
691 | -echo |
692 | -echo "Bootstrap done." |
693 | -echo |
694 | -echo "Any time configure.in or a Makefile.am changes, you must run " |
695 | -echo " \"autoreconf -i\"" |
696 | -echo "" |
697 | -echo "To build, run \"./configure ; make ; make install\"" |
698 | diff --git a/cmake/3.7/UseJava.cmake b/cmake/3.7/UseJava.cmake |
699 | new file mode 100644 |
700 | index 0000000..890dba3 |
701 | --- /dev/null |
702 | +++ b/cmake/3.7/UseJava.cmake |
703 | @@ -0,0 +1,1443 @@ |
704 | +#.rst: |
705 | +# UseJava |
706 | +# ------- |
707 | +# |
708 | +# Use Module for Java |
709 | +# |
710 | +# This file provides functions for Java. It is assumed that |
711 | +# FindJava.cmake has already been loaded. See FindJava.cmake for |
712 | +# information on how to load Java into your CMake project. |
713 | +# |
714 | +# :: |
715 | +# |
716 | +# add_jar(target_name |
717 | +# [SOURCES] source1 [source2 ...] [resource1 ...] |
718 | +# [INCLUDE_JARS jar1 [jar2 ...]] |
719 | +# [ENTRY_POINT entry] |
720 | +# [VERSION version] |
721 | +# [OUTPUT_NAME name] |
722 | +# [OUTPUT_DIR dir] |
723 | +# ) |
724 | +# |
725 | +# This command creates a <target_name>.jar. It compiles the given |
726 | +# source files (source) and adds the given resource files (resource) to |
727 | +# the jar file. Source files can be java files or listing files |
728 | +# (prefixed by '@'). If only resource files are given then just a jar file |
729 | +# is created. The list of include jars are added to the classpath when |
730 | +# compiling the java sources and also to the dependencies of the target. |
731 | +# INCLUDE_JARS also accepts other target names created by add_jar. For |
732 | +# backwards compatibility, jar files listed as sources are ignored (as |
733 | +# they have been since the first version of this module). |
734 | +# |
735 | +# The default OUTPUT_DIR can also be changed by setting the variable |
736 | +# CMAKE_JAVA_TARGET_OUTPUT_DIR. |
737 | +# |
738 | +# Additional instructions: |
739 | +# |
740 | +# :: |
741 | +# |
742 | +# To add compile flags to the target you can set these flags with |
743 | +# the following variable: |
744 | +# |
745 | +# |
746 | +# |
747 | +# :: |
748 | +# |
749 | +# set(CMAKE_JAVA_COMPILE_FLAGS -nowarn) |
750 | +# |
751 | +# |
752 | +# |
753 | +# :: |
754 | +# |
755 | +# To add a path or a jar file to the class path you can do this |
756 | +# with the CMAKE_JAVA_INCLUDE_PATH variable. |
757 | +# |
758 | +# |
759 | +# |
760 | +# :: |
761 | +# |
762 | +# set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/shibboleet.jar) |
763 | +# |
764 | +# |
765 | +# |
766 | +# :: |
767 | +# |
768 | +# To use a different output name for the target you can set it with: |
769 | +# |
770 | +# |
771 | +# |
772 | +# :: |
773 | +# |
774 | +# add_jar(foobar foobar.java OUTPUT_NAME shibboleet.jar) |
775 | +# |
776 | +# |
777 | +# |
778 | +# :: |
779 | +# |
780 | +# To use a different output directory than CMAKE_CURRENT_BINARY_DIR |
781 | +# you can set it with: |
782 | +# |
783 | +# |
784 | +# |
785 | +# :: |
786 | +# |
787 | +# add_jar(foobar foobar.java OUTPUT_DIR ${PROJECT_BINARY_DIR}/bin) |
788 | +# |
789 | +# |
790 | +# |
791 | +# :: |
792 | +# |
793 | +# To define an entry point in your jar you can set it with the ENTRY_POINT |
794 | +# named argument: |
795 | +# |
796 | +# |
797 | +# |
798 | +# :: |
799 | +# |
800 | +# add_jar(example ENTRY_POINT com/examples/MyProject/Main) |
801 | +# |
802 | +# |
803 | +# |
804 | +# :: |
805 | +# |
806 | +# To define a custom manifest for the jar, you can set it with the manifest |
807 | +# named argument: |
808 | +# |
809 | +# |
810 | +# |
811 | +# :: |
812 | +# |
813 | +# add_jar(example MANIFEST /path/to/manifest) |
814 | +# |
815 | +# |
816 | +# |
817 | +# :: |
818 | +# |
819 | +# To add a VERSION to the target output name you can set it using |
820 | +# the VERSION named argument to add_jar. This will create a jar file with the |
821 | +# name shibboleet-1.0.0.jar and will create a symlink shibboleet.jar |
822 | +# pointing to the jar with the version information. |
823 | +# |
824 | +# |
825 | +# |
826 | +# :: |
827 | +# |
828 | +# add_jar(shibboleet shibbotleet.java VERSION 1.2.0) |
829 | +# |
830 | +# |
831 | +# |
832 | +# :: |
833 | +# |
834 | +# If the target is a JNI library, utilize the following commands to |
835 | +# create a JNI symbolic link: |
836 | +# |
837 | +# |
838 | +# |
839 | +# :: |
840 | +# |
841 | +# set(CMAKE_JNI_TARGET TRUE) |
842 | +# add_jar(shibboleet shibbotleet.java VERSION 1.2.0) |
843 | +# install_jar(shibboleet ${LIB_INSTALL_DIR}/shibboleet) |
844 | +# install_jni_symlink(shibboleet ${JAVA_LIB_INSTALL_DIR}) |
845 | +# |
846 | +# |
847 | +# |
848 | +# :: |
849 | +# |
850 | +# If a single target needs to produce more than one jar from its |
851 | +# java source code, to prevent the accumulation of duplicate class |
852 | +# files in subsequent jars, set/reset CMAKE_JAR_CLASSES_PREFIX prior |
853 | +# to calling the add_jar() function: |
854 | +# |
855 | +# |
856 | +# |
857 | +# :: |
858 | +# |
859 | +# set(CMAKE_JAR_CLASSES_PREFIX com/redhat/foo) |
860 | +# add_jar(foo foo.java) |
861 | +# |
862 | +# |
863 | +# |
864 | +# :: |
865 | +# |
866 | +# set(CMAKE_JAR_CLASSES_PREFIX com/redhat/bar) |
867 | +# add_jar(bar bar.java) |
868 | +# |
869 | +# |
870 | +# |
871 | +# Target Properties: |
872 | +# |
873 | +# :: |
874 | +# |
875 | +# The add_jar() function sets some target properties. You can get these |
876 | +# properties with the |
877 | +# get_property(TARGET <target_name> PROPERTY <propery_name>) |
878 | +# command. |
879 | +# |
880 | +# |
881 | +# |
882 | +# :: |
883 | +# |
884 | +# INSTALL_FILES The files which should be installed. This is used by |
885 | +# install_jar(). |
886 | +# JNI_SYMLINK The JNI symlink which should be installed. |
887 | +# This is used by install_jni_symlink(). |
888 | +# JAR_FILE The location of the jar file so that you can include |
889 | +# it. |
890 | +# CLASSDIR The directory where the class files can be found. For |
891 | +# example to use them with javah. |
892 | +# |
893 | +# :: |
894 | +# |
895 | +# find_jar(<VAR> |
896 | +# name | NAMES name1 [name2 ...] |
897 | +# [PATHS path1 [path2 ... ENV var]] |
898 | +# [VERSIONS version1 [version2]] |
899 | +# [DOC "cache documentation string"] |
900 | +# ) |
901 | +# |
902 | +# This command is used to find a full path to the named jar. A cache |
903 | +# entry named by <VAR> is created to stor the result of this command. |
904 | +# If the full path to a jar is found the result is stored in the |
905 | +# variable and the search will not repeated unless the variable is |
906 | +# cleared. If nothing is found, the result will be <VAR>-NOTFOUND, and |
907 | +# the search will be attempted again next time find_jar is invoked with |
908 | +# the same variable. The name of the full path to a file that is |
909 | +# searched for is specified by the names listed after NAMES argument. |
910 | +# Additional search locations can be specified after the PATHS argument. |
911 | +# If you require special a version of a jar file you can specify it with |
912 | +# the VERSIONS argument. The argument after DOC will be used for the |
913 | +# documentation string in the cache. |
914 | +# |
915 | +# :: |
916 | +# |
917 | +# install_jar(target_name destination) |
918 | +# install_jar(target_name DESTINATION destination [COMPONENT component]) |
919 | +# |
920 | +# This command installs the TARGET_NAME files to the given DESTINATION. |
921 | +# It should be called in the same scope as add_jar() or it will fail. |
922 | +# |
923 | +# Target Properties: |
924 | +# |
925 | +# :: |
926 | +# |
927 | +# The install_jar() function sets the INSTALL_DESTINATION target property |
928 | +# on jars so installed. This property holds the DESTINATION as described |
929 | +# above, and is used by install_jar_exports(). You can get this property |
930 | +# with the |
931 | +# get_property(TARGET <target_name> PROPERTY INSTALL_DESTINATION) |
932 | +# command. |
933 | +# |
934 | +# |
935 | +# |
936 | +# :: |
937 | +# |
938 | +# install_jni_symlink(target_name destination) |
939 | +# install_jni_symlink(target_name DESTINATION destination [COMPONENT component]) |
940 | +# |
941 | +# This command installs the TARGET_NAME JNI symlinks to the given |
942 | +# DESTINATION. It should be called in the same scope as add_jar() or it |
943 | +# will fail. |
944 | +# |
945 | +# :: |
946 | +# |
947 | +# install_jar_exports(TARGETS jar1 [jar2 ...] |
948 | +# FILE export_filename |
949 | +# DESTINATION destination [COMPONENT component]) |
950 | +# |
951 | +# This command installs a target export file export_filename for the named jar |
952 | +# targets to the given DESTINATION. Its function is similar to that of |
953 | +# install(EXPORTS). |
954 | +# |
955 | +# :: |
956 | +# |
957 | +# export_jars(TARGETS jar1 [jar2 ...] |
958 | +# FILE export_filename) |
959 | +# |
960 | +# This command writes a target export file export_filename for the named jar |
961 | +# targets. Its function is similar to that of export(). |
962 | +# |
963 | +# :: |
964 | +# |
965 | +# create_javadoc(<VAR> |
966 | +# PACKAGES pkg1 [pkg2 ...] |
967 | +# [SOURCEPATH <sourcepath>] |
968 | +# [CLASSPATH <classpath>] |
969 | +# [INSTALLPATH <install path>] |
970 | +# [DOCTITLE "the documentation title"] |
971 | +# [WINDOWTITLE "the title of the document"] |
972 | +# [AUTHOR TRUE|FALSE] |
973 | +# [USE TRUE|FALSE] |
974 | +# [VERSION TRUE|FALSE] |
975 | +# ) |
976 | +# |
977 | +# Create java documentation based on files or packages. For more |
978 | +# details please read the javadoc manpage. |
979 | +# |
980 | +# There are two main signatures for create_javadoc. The first signature |
981 | +# works with package names on a path with source files: |
982 | +# |
983 | +# :: |
984 | +# |
985 | +# Example: |
986 | +# create_javadoc(my_example_doc |
987 | +# PACKAGES com.exmaple.foo com.example.bar |
988 | +# SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}" |
989 | +# CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} |
990 | +# WINDOWTITLE "My example" |
991 | +# DOCTITLE "<h1>My example</h1>" |
992 | +# AUTHOR TRUE |
993 | +# USE TRUE |
994 | +# VERSION TRUE |
995 | +# ) |
996 | +# |
997 | +# |
998 | +# |
999 | +# The second signature for create_javadoc works on a given list of |
1000 | +# files. |
1001 | +# |
1002 | +# :: |
1003 | +# |
1004 | +# create_javadoc(<VAR> |
1005 | +# FILES file1 [file2 ...] |
1006 | +# [CLASSPATH <classpath>] |
1007 | +# [INSTALLPATH <install path>] |
1008 | +# [DOCTITLE "the documentation title"] |
1009 | +# [WINDOWTITLE "the title of the document"] |
1010 | +# [AUTHOR TRUE|FALSE] |
1011 | +# [USE TRUE|FALSE] |
1012 | +# [VERSION TRUE|FALSE] |
1013 | +# ) |
1014 | +# |
1015 | +# |
1016 | +# |
1017 | +# Example: |
1018 | +# |
1019 | +# :: |
1020 | +# |
1021 | +# create_javadoc(my_example_doc |
1022 | +# FILES ${example_SRCS} |
1023 | +# CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} |
1024 | +# WINDOWTITLE "My example" |
1025 | +# DOCTITLE "<h1>My example</h1>" |
1026 | +# AUTHOR TRUE |
1027 | +# USE TRUE |
1028 | +# VERSION TRUE |
1029 | +# ) |
1030 | +# |
1031 | +# |
1032 | +# |
1033 | +# Both signatures share most of the options. These options are the same |
1034 | +# as what you can find in the javadoc manpage. Please look at the |
1035 | +# manpage for CLASSPATH, DOCTITLE, WINDOWTITLE, AUTHOR, USE and VERSION. |
1036 | +# |
1037 | +# The documentation will be by default installed to |
1038 | +# |
1039 | +# :: |
1040 | +# |
1041 | +# ${CMAKE_INSTALL_PREFIX}/share/javadoc/<VAR> |
1042 | +# |
1043 | +# |
1044 | +# |
1045 | +# if you don't set the INSTALLPATH. |
1046 | +# |
1047 | +# :: |
1048 | +# |
1049 | +# create_javah(TARGET <target> |
1050 | +# GENERATED_FILES <VAR> |
1051 | +# CLASSES <class>... |
1052 | +# [CLASSPATH <classpath>...] |
1053 | +# [DEPENDS <depend>...] |
1054 | +# [OUTPUT_NAME <path>|OUTPUT_DIR <path>] |
1055 | +# ) |
1056 | +# |
1057 | +# Create C header files from java classes. These files provide the connective glue |
1058 | +# that allow your Java and C code to interact. |
1059 | +# |
1060 | +# There are two main signatures for create_javah. The first signature |
1061 | +# returns generated files through variable specified by GENERATED_FILES option: |
1062 | +# |
1063 | +# :: |
1064 | +# |
1065 | +# Example: |
1066 | +# Create_javah(GENERATED_FILES files_headers |
1067 | +# CLASSES org.cmake.HelloWorld |
1068 | +# CLASSPATH hello.jar |
1069 | +# ) |
1070 | +# |
1071 | +# |
1072 | +# |
1073 | +# The second signature for create_javah creates a target which encapsulates |
1074 | +# header files generation. |
1075 | +# |
1076 | +# :: |
1077 | +# |
1078 | +# Example: |
1079 | +# Create_javah(TARGET target_headers |
1080 | +# CLASSES org.cmake.HelloWorld |
1081 | +# CLASSPATH hello.jar |
1082 | +# ) |
1083 | +# |
1084 | +# |
1085 | +# |
1086 | +# Both signatures share same options. |
1087 | +# |
1088 | +# ``CLASSES <class>...`` |
1089 | +# Specifies Java classes used to generate headers. |
1090 | +# |
1091 | +# ``CLASSPATH <classpath>...`` |
1092 | +# Specifies various paths to look up classes. Here .class files, jar files or targets |
1093 | +# created by command add_jar can be used. |
1094 | +# |
1095 | +# ``DEPENDS <depend>...`` |
1096 | +# Targets on which the javah target depends |
1097 | +# |
1098 | +# ``OUTPUT_NAME <path>`` |
1099 | +# Concatenates the resulting header files for all the classes listed by option CLASSES |
1100 | +# into <path>. Same behavior as option '-o' of javah tool. |
1101 | +# |
1102 | +# ``OUTPUT_DIR <path>`` |
1103 | +# Sets the directory where the header files will be generated. Same behavior as option |
1104 | +# '-d' of javah tool. If not specified, ${CMAKE_CURRENT_BINARY_DIR} is used as output directory. |
1105 | + |
1106 | +#============================================================================= |
1107 | +# Copyright 2013 OpenGamma Ltd. <graham@opengamma.com> |
1108 | +# Copyright 2010-2011 Andreas schneider <asn@redhat.com> |
1109 | +# Copyright 2010-2013 Kitware, Inc. |
1110 | +# |
1111 | +# Distributed under the OSI-approved BSD License (the "License"); |
1112 | +# see accompanying file Copyright.txt for details. |
1113 | +# |
1114 | +# This software is distributed WITHOUT ANY WARRANTY; without even the |
1115 | +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
1116 | +# See the License for more information. |
1117 | +#============================================================================= |
1118 | +# (To distribute this file outside of CMake, substitute the full |
1119 | +# License text for the above reference.) |
1120 | + |
1121 | +include(CMakeParseArguments) |
1122 | + |
1123 | +function (__java_copy_file src dest comment) |
1124 | + add_custom_command( |
1125 | + OUTPUT ${dest} |
1126 | + COMMAND ${CMAKE_COMMAND} -E copy_if_different |
1127 | + ARGS ${src} |
1128 | + ${dest} |
1129 | + DEPENDS ${src} |
1130 | + COMMENT ${comment}) |
1131 | +endfunction () |
1132 | + |
1133 | +function(__java_lcat VAR) |
1134 | + foreach(_line ${ARGN}) |
1135 | + set(${VAR} "${${VAR}}${_line}\n") |
1136 | + endforeach() |
1137 | + |
1138 | + set(${VAR} "${${VAR}}" PARENT_SCOPE) |
1139 | +endfunction() |
1140 | + |
1141 | +function(__java_export_jar VAR TARGET PATH) |
1142 | + get_target_property(_jarpath ${TARGET} JAR_FILE) |
1143 | + get_filename_component(_jarname ${_jarpath} NAME) |
1144 | + __java_lcat(${VAR} |
1145 | + "# Create imported target ${TARGET}" |
1146 | + "add_custom_target(${TARGET})" |
1147 | + "set_target_properties(${TARGET} PROPERTIES" |
1148 | + " JAR_FILE \"${PATH}/${_jarname}\")" |
1149 | + "" |
1150 | + ) |
1151 | + set(${VAR} "${${VAR}}" PARENT_SCOPE) |
1152 | +endfunction() |
1153 | + |
1154 | +# define helper scripts |
1155 | +set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/javaTargets.cmake.in) |
1156 | +set(_JAVA_CLASS_FILELIST_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaClassFilelist.cmake) |
1157 | +set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake) |
1158 | + |
1159 | +function(add_jar _TARGET_NAME) |
1160 | + |
1161 | + cmake_parse_arguments(_add_jar |
1162 | + "" |
1163 | + "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST" |
1164 | + "SOURCES;INCLUDE_JARS" |
1165 | + ${ARGN} |
1166 | + ) |
1167 | + |
1168 | + # In CMake < 2.8.12, add_jar used variables which were set prior to calling |
1169 | + # add_jar for customizing the behavior of add_jar. In order to be backwards |
1170 | + # compatible, check if any of those variables are set, and use them to |
1171 | + # initialize values of the named arguments. (Giving the corresponding named |
1172 | + # argument will override the value set here.) |
1173 | + # |
1174 | + # New features should use named arguments only. |
1175 | + if(NOT DEFINED _add_jar_VERSION AND DEFINED CMAKE_JAVA_TARGET_VERSION) |
1176 | + set(_add_jar_VERSION "${CMAKE_JAVA_TARGET_VERSION}") |
1177 | + endif() |
1178 | + if(NOT DEFINED _add_jar_OUTPUT_DIR AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR) |
1179 | + set(_add_jar_OUTPUT_DIR "${CMAKE_JAVA_TARGET_OUTPUT_DIR}") |
1180 | + endif() |
1181 | + if(NOT DEFINED _add_jar_OUTPUT_NAME AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_NAME) |
1182 | + set(_add_jar_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}") |
1183 | + # reset |
1184 | + set(CMAKE_JAVA_TARGET_OUTPUT_NAME) |
1185 | + endif() |
1186 | + if(NOT DEFINED _add_jar_ENTRY_POINT AND DEFINED CMAKE_JAVA_JAR_ENTRY_POINT) |
1187 | + set(_add_jar_ENTRY_POINT "${CMAKE_JAVA_JAR_ENTRY_POINT}") |
1188 | + endif() |
1189 | + |
1190 | + set(_JAVA_SOURCE_FILES ${_add_jar_SOURCES} ${_add_jar_UNPARSED_ARGUMENTS}) |
1191 | + |
1192 | + if (NOT DEFINED _add_jar_OUTPUT_DIR) |
1193 | + set(_add_jar_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) |
1194 | + else() |
1195 | + get_filename_component(_add_jar_OUTPUT_DIR ${_add_jar_OUTPUT_DIR} ABSOLUTE) |
1196 | + endif() |
1197 | + |
1198 | + if (_add_jar_ENTRY_POINT) |
1199 | + set(_ENTRY_POINT_OPTION e) |
1200 | + set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT}) |
1201 | + endif () |
1202 | + |
1203 | + if (_add_jar_MANIFEST) |
1204 | + set(_MANIFEST_OPTION m) |
1205 | + get_filename_component (_MANIFEST_VALUE "${_add_jar_MANIFEST}" ABSOLUTE) |
1206 | + endif () |
1207 | + |
1208 | + if (LIBRARY_OUTPUT_PATH) |
1209 | + set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}) |
1210 | + else () |
1211 | + set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${_add_jar_OUTPUT_DIR}) |
1212 | + endif () |
1213 | + |
1214 | + set(CMAKE_JAVA_INCLUDE_PATH |
1215 | + ${CMAKE_JAVA_INCLUDE_PATH} |
1216 | + ${CMAKE_CURRENT_SOURCE_DIR} |
1217 | + ${CMAKE_JAVA_OBJECT_OUTPUT_PATH} |
1218 | + ${CMAKE_JAVA_LIBRARY_OUTPUT_PATH} |
1219 | + ) |
1220 | + |
1221 | + if (CMAKE_HOST_WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") |
1222 | + set(CMAKE_JAVA_INCLUDE_FLAG_SEP ";") |
1223 | + else () |
1224 | + set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":") |
1225 | + endif() |
1226 | + |
1227 | + foreach (JAVA_INCLUDE_DIR ${CMAKE_JAVA_INCLUDE_PATH}) |
1228 | + set(CMAKE_JAVA_INCLUDE_PATH_FINAL "${CMAKE_JAVA_INCLUDE_PATH_FINAL}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${JAVA_INCLUDE_DIR}") |
1229 | + endforeach() |
1230 | + |
1231 | + set(CMAKE_JAVA_CLASS_OUTPUT_PATH "${_add_jar_OUTPUT_DIR}${CMAKE_FILES_DIRECTORY}/${_TARGET_NAME}.dir") |
1232 | + |
1233 | + set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}.jar") |
1234 | + if (_add_jar_OUTPUT_NAME AND _add_jar_VERSION) |
1235 | + set(_JAVA_TARGET_OUTPUT_NAME "${_add_jar_OUTPUT_NAME}-${_add_jar_VERSION}.jar") |
1236 | + set(_JAVA_TARGET_OUTPUT_LINK "${_add_jar_OUTPUT_NAME}.jar") |
1237 | + elseif (_add_jar_VERSION) |
1238 | + set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}-${_add_jar_VERSION}.jar") |
1239 | + set(_JAVA_TARGET_OUTPUT_LINK "${_TARGET_NAME}.jar") |
1240 | + elseif (_add_jar_OUTPUT_NAME) |
1241 | + set(_JAVA_TARGET_OUTPUT_NAME "${_add_jar_OUTPUT_NAME}.jar") |
1242 | + endif () |
1243 | + |
1244 | + set(_JAVA_CLASS_FILES) |
1245 | + set(_JAVA_COMPILE_FILES) |
1246 | + set(_JAVA_COMPILE_FILELISTS) |
1247 | + set(_JAVA_DEPENDS) |
1248 | + set(_JAVA_COMPILE_DEPENDS) |
1249 | + set(_JAVA_RESOURCE_FILES) |
1250 | + set(_JAVA_RESOURCE_FILES_RELATIVE) |
1251 | + foreach(_JAVA_SOURCE_FILE ${_JAVA_SOURCE_FILES}) |
1252 | + get_filename_component(_JAVA_EXT ${_JAVA_SOURCE_FILE} EXT) |
1253 | + get_filename_component(_JAVA_FILE ${_JAVA_SOURCE_FILE} NAME_WE) |
1254 | + get_filename_component(_JAVA_PATH ${_JAVA_SOURCE_FILE} PATH) |
1255 | + get_filename_component(_JAVA_FULL ${_JAVA_SOURCE_FILE} ABSOLUTE) |
1256 | + |
1257 | + if (_JAVA_SOURCE_FILE MATCHES "^@(.+)$") |
1258 | + get_filename_component(_JAVA_FULL ${CMAKE_MATCH_1} ABSOLUTE) |
1259 | + list(APPEND _JAVA_COMPILE_FILELISTS ${_JAVA_FULL}) |
1260 | + |
1261 | + elseif (_JAVA_EXT MATCHES ".java") |
1262 | + file(RELATIVE_PATH _JAVA_REL_BINARY_PATH ${_add_jar_OUTPUT_DIR} ${_JAVA_FULL}) |
1263 | + file(RELATIVE_PATH _JAVA_REL_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${_JAVA_FULL}) |
1264 | + string(LENGTH ${_JAVA_REL_BINARY_PATH} _BIN_LEN) |
1265 | + string(LENGTH ${_JAVA_REL_SOURCE_PATH} _SRC_LEN) |
1266 | + if (${_BIN_LEN} LESS ${_SRC_LEN}) |
1267 | + set(_JAVA_REL_PATH ${_JAVA_REL_BINARY_PATH}) |
1268 | + else () |
1269 | + set(_JAVA_REL_PATH ${_JAVA_REL_SOURCE_PATH}) |
1270 | + endif () |
1271 | + get_filename_component(_JAVA_REL_PATH ${_JAVA_REL_PATH} PATH) |
1272 | + |
1273 | + list(APPEND _JAVA_COMPILE_FILES ${_JAVA_SOURCE_FILE}) |
1274 | + set(_JAVA_CLASS_FILE "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_REL_PATH}/${_JAVA_FILE}.class") |
1275 | + set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES} ${_JAVA_CLASS_FILE}) |
1276 | + |
1277 | + elseif (_JAVA_EXT MATCHES ".jar" |
1278 | + OR _JAVA_EXT MATCHES ".war" |
1279 | + OR _JAVA_EXT MATCHES ".ear" |
1280 | + OR _JAVA_EXT MATCHES ".sar") |
1281 | + # Ignored for backward compatibility |
1282 | + |
1283 | + elseif (_JAVA_EXT STREQUAL "") |
1284 | + list(APPEND CMAKE_JAVA_INCLUDE_PATH ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}} ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}_CLASSPATH}) |
1285 | + list(APPEND _JAVA_DEPENDS ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}}) |
1286 | + |
1287 | + else () |
1288 | + __java_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/${_JAVA_SOURCE_FILE} |
1289 | + ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE} |
1290 | + "Copying ${_JAVA_SOURCE_FILE} to the build directory") |
1291 | + list(APPEND _JAVA_RESOURCE_FILES ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE}) |
1292 | + list(APPEND _JAVA_RESOURCE_FILES_RELATIVE ${_JAVA_SOURCE_FILE}) |
1293 | + endif () |
1294 | + endforeach() |
1295 | + |
1296 | + foreach(_JAVA_INCLUDE_JAR ${_add_jar_INCLUDE_JARS}) |
1297 | + if (TARGET ${_JAVA_INCLUDE_JAR}) |
1298 | + get_target_property(_JAVA_JAR_PATH ${_JAVA_INCLUDE_JAR} JAR_FILE) |
1299 | + if (_JAVA_JAR_PATH) |
1300 | + set(CMAKE_JAVA_INCLUDE_PATH_FINAL "${CMAKE_JAVA_INCLUDE_PATH_FINAL}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${_JAVA_JAR_PATH}") |
1301 | + list(APPEND CMAKE_JAVA_INCLUDE_PATH ${_JAVA_JAR_PATH}) |
1302 | + list(APPEND _JAVA_DEPENDS ${_JAVA_INCLUDE_JAR}) |
1303 | + list(APPEND _JAVA_COMPILE_DEPENDS ${_JAVA_INCLUDE_JAR}) |
1304 | + else () |
1305 | + message(SEND_ERROR "add_jar: INCLUDE_JARS target ${_JAVA_INCLUDE_JAR} is not a jar") |
1306 | + endif () |
1307 | + else () |
1308 | + set(CMAKE_JAVA_INCLUDE_PATH_FINAL "${CMAKE_JAVA_INCLUDE_PATH_FINAL}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${_JAVA_INCLUDE_JAR}") |
1309 | + list(APPEND CMAKE_JAVA_INCLUDE_PATH "${_JAVA_INCLUDE_JAR}") |
1310 | + list(APPEND _JAVA_DEPENDS "${_JAVA_INCLUDE_JAR}") |
1311 | + list(APPEND _JAVA_COMPILE_DEPENDS "${_JAVA_INCLUDE_JAR}") |
1312 | + endif () |
1313 | + endforeach() |
1314 | + |
1315 | + if (_JAVA_COMPILE_FILES OR _JAVA_COMPILE_FILELISTS) |
1316 | + set (_JAVA_SOURCES_FILELISTS) |
1317 | + |
1318 | + if (_JAVA_COMPILE_FILES) |
1319 | + # Create the list of files to compile. |
1320 | + set(_JAVA_SOURCES_FILE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_sources) |
1321 | + string(REPLACE ";" "\"\n\"" _JAVA_COMPILE_STRING "\"${_JAVA_COMPILE_FILES}\"") |
1322 | + file(WRITE ${_JAVA_SOURCES_FILE} ${_JAVA_COMPILE_STRING}) |
1323 | + list (APPEND _JAVA_SOURCES_FILELISTS "@${_JAVA_SOURCES_FILE}") |
1324 | + endif() |
1325 | + if (_JAVA_COMPILE_FILELISTS) |
1326 | + foreach (_JAVA_FILELIST IN LISTS _JAVA_COMPILE_FILELISTS) |
1327 | + list (APPEND _JAVA_SOURCES_FILELISTS "@${_JAVA_FILELIST}") |
1328 | + endforeach() |
1329 | + endif() |
1330 | + |
1331 | + # Compile the java files and create a list of class files |
1332 | + add_custom_command( |
1333 | + # NOTE: this command generates an artificial dependency file |
1334 | + OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME} |
1335 | + COMMAND ${Java_JAVAC_EXECUTABLE} |
1336 | + ${CMAKE_JAVA_COMPILE_FLAGS} |
1337 | + -classpath "${CMAKE_JAVA_INCLUDE_PATH_FINAL}" |
1338 | + -d ${CMAKE_JAVA_CLASS_OUTPUT_PATH} |
1339 | + ${_JAVA_SOURCES_FILELISTS} |
1340 | + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME} |
1341 | + DEPENDS ${_JAVA_COMPILE_FILES} ${_JAVA_COMPILE_FILELISTS} ${_JAVA_COMPILE_DEPENDS} |
1342 | + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
1343 | + COMMENT "Building Java objects for ${_TARGET_NAME}.jar" |
1344 | + ) |
1345 | + add_custom_command( |
1346 | + OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist |
1347 | + COMMAND ${CMAKE_COMMAND} |
1348 | + -DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH} |
1349 | + -DCMAKE_JAR_CLASSES_PREFIX="${CMAKE_JAR_CLASSES_PREFIX}" |
1350 | + -P ${_JAVA_CLASS_FILELIST_SCRIPT} |
1351 | + DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME} |
1352 | + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
1353 | + ) |
1354 | + else () |
1355 | + # create an empty java_class_filelist |
1356 | + if (NOT EXISTS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist) |
1357 | + file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "") |
1358 | + endif() |
1359 | + endif () |
1360 | + |
1361 | + # create the jar file |
1362 | + set(_JAVA_JAR_OUTPUT_PATH |
1363 | + ${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_NAME}) |
1364 | + if (CMAKE_JNI_TARGET) |
1365 | + add_custom_command( |
1366 | + OUTPUT ${_JAVA_JAR_OUTPUT_PATH} |
1367 | + COMMAND ${Java_JAR_EXECUTABLE} |
1368 | + -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE} |
1369 | + ${_JAVA_RESOURCE_FILES_RELATIVE} @java_class_filelist |
1370 | + COMMAND ${CMAKE_COMMAND} |
1371 | + -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR} |
1372 | + -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME} |
1373 | + -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK} |
1374 | + -P ${_JAVA_SYMLINK_SCRIPT} |
1375 | + COMMAND ${CMAKE_COMMAND} |
1376 | + -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR} |
1377 | + -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_JAR_OUTPUT_PATH} |
1378 | + -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK} |
1379 | + -P ${_JAVA_SYMLINK_SCRIPT} |
1380 | + DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist |
1381 | + WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH} |
1382 | + COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}" |
1383 | + ) |
1384 | + else () |
1385 | + add_custom_command( |
1386 | + OUTPUT ${_JAVA_JAR_OUTPUT_PATH} |
1387 | + COMMAND ${Java_JAR_EXECUTABLE} |
1388 | + -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE} |
1389 | + ${_JAVA_RESOURCE_FILES_RELATIVE} @java_class_filelist |
1390 | + COMMAND ${CMAKE_COMMAND} |
1391 | + -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR} |
1392 | + -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME} |
1393 | + -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK} |
1394 | + -P ${_JAVA_SYMLINK_SCRIPT} |
1395 | + WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH} |
1396 | + DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist |
1397 | + COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}" |
1398 | + ) |
1399 | + endif () |
1400 | + |
1401 | + # Add the target and make sure we have the latest resource files. |
1402 | + add_custom_target(${_TARGET_NAME} ALL DEPENDS ${_JAVA_JAR_OUTPUT_PATH}) |
1403 | + |
1404 | + set_property( |
1405 | + TARGET |
1406 | + ${_TARGET_NAME} |
1407 | + PROPERTY |
1408 | + INSTALL_FILES |
1409 | + ${_JAVA_JAR_OUTPUT_PATH} |
1410 | + ) |
1411 | + |
1412 | + if (_JAVA_TARGET_OUTPUT_LINK) |
1413 | + set_property( |
1414 | + TARGET |
1415 | + ${_TARGET_NAME} |
1416 | + PROPERTY |
1417 | + INSTALL_FILES |
1418 | + ${_JAVA_JAR_OUTPUT_PATH} |
1419 | + ${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK} |
1420 | + ) |
1421 | + |
1422 | + if (CMAKE_JNI_TARGET) |
1423 | + set_property( |
1424 | + TARGET |
1425 | + ${_TARGET_NAME} |
1426 | + PROPERTY |
1427 | + JNI_SYMLINK |
1428 | + ${_add_jar_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK} |
1429 | + ) |
1430 | + endif () |
1431 | + endif () |
1432 | + |
1433 | + set_property( |
1434 | + TARGET |
1435 | + ${_TARGET_NAME} |
1436 | + PROPERTY |
1437 | + JAR_FILE |
1438 | + ${_JAVA_JAR_OUTPUT_PATH} |
1439 | + ) |
1440 | + |
1441 | + set_property( |
1442 | + TARGET |
1443 | + ${_TARGET_NAME} |
1444 | + PROPERTY |
1445 | + CLASSDIR |
1446 | + ${CMAKE_JAVA_CLASS_OUTPUT_PATH} |
1447 | + ) |
1448 | + |
1449 | +endfunction() |
1450 | + |
1451 | +function(INSTALL_JAR _TARGET_NAME) |
1452 | + if (ARGC EQUAL 2) |
1453 | + set (_DESTINATION ${ARGV1}) |
1454 | + else() |
1455 | + cmake_parse_arguments(_install_jar |
1456 | + "" |
1457 | + "DESTINATION;COMPONENT" |
1458 | + "" |
1459 | + ${ARGN}) |
1460 | + if (_install_jar_DESTINATION) |
1461 | + set (_DESTINATION ${_install_jar_DESTINATION}) |
1462 | + else() |
1463 | + message(SEND_ERROR "install_jar: ${_TARGET_NAME}: DESTINATION must be specified.") |
1464 | + endif() |
1465 | + |
1466 | + if (_install_jar_COMPONENT) |
1467 | + set (_COMPONENT COMPONENT ${_install_jar_COMPONENT}) |
1468 | + endif() |
1469 | + endif() |
1470 | + |
1471 | + get_property(__FILES |
1472 | + TARGET |
1473 | + ${_TARGET_NAME} |
1474 | + PROPERTY |
1475 | + INSTALL_FILES |
1476 | + ) |
1477 | + set_property( |
1478 | + TARGET |
1479 | + ${_TARGET_NAME} |
1480 | + PROPERTY |
1481 | + INSTALL_DESTINATION |
1482 | + ${_DESTINATION} |
1483 | + ) |
1484 | + |
1485 | + if (__FILES) |
1486 | + install( |
1487 | + FILES |
1488 | + ${__FILES} |
1489 | + DESTINATION |
1490 | + ${_DESTINATION} |
1491 | + ${_COMPONENT} |
1492 | + ) |
1493 | + else () |
1494 | + message(SEND_ERROR "install_jar: The target ${_TARGET_NAME} is not known in this scope.") |
1495 | + endif () |
1496 | +endfunction() |
1497 | + |
1498 | +function(INSTALL_JNI_SYMLINK _TARGET_NAME) |
1499 | + if (ARGC EQUAL 2) |
1500 | + set (_DESTINATION ${ARGV1}) |
1501 | + else() |
1502 | + cmake_parse_arguments(_install_jni_symlink |
1503 | + "" |
1504 | + "DESTINATION;COMPONENT" |
1505 | + "" |
1506 | + ${ARGN}) |
1507 | + if (_install_jni_symlink_DESTINATION) |
1508 | + set (_DESTINATION ${_install_jni_symlink_DESTINATION}) |
1509 | + else() |
1510 | + message(SEND_ERROR "install_jni_symlink: ${_TARGET_NAME}: DESTINATION must be specified.") |
1511 | + endif() |
1512 | + |
1513 | + if (_install_jni_symlink_COMPONENT) |
1514 | + set (_COMPONENT COMPONENT ${_install_jni_symlink_COMPONENT}) |
1515 | + endif() |
1516 | + endif() |
1517 | + |
1518 | + get_property(__SYMLINK |
1519 | + TARGET |
1520 | + ${_TARGET_NAME} |
1521 | + PROPERTY |
1522 | + JNI_SYMLINK |
1523 | + ) |
1524 | + |
1525 | + if (__SYMLINK) |
1526 | + install( |
1527 | + FILES |
1528 | + ${__SYMLINK} |
1529 | + DESTINATION |
1530 | + ${_DESTINATION} |
1531 | + ${_COMPONENT} |
1532 | + ) |
1533 | + else () |
1534 | + message(SEND_ERROR "install_jni_symlink: The target ${_TARGET_NAME} is not known in this scope.") |
1535 | + endif () |
1536 | +endfunction() |
1537 | + |
1538 | +function (find_jar VARIABLE) |
1539 | + set(_jar_names) |
1540 | + set(_jar_files) |
1541 | + set(_jar_versions) |
1542 | + set(_jar_paths |
1543 | + /usr/share/java/ |
1544 | + /usr/local/share/java/ |
1545 | + ${Java_JAR_PATHS}) |
1546 | + set(_jar_doc "NOTSET") |
1547 | + |
1548 | + set(_state "name") |
1549 | + |
1550 | + foreach (arg ${ARGN}) |
1551 | + if (${_state} STREQUAL "name") |
1552 | + if (${arg} STREQUAL "VERSIONS") |
1553 | + set(_state "versions") |
1554 | + elseif (${arg} STREQUAL "NAMES") |
1555 | + set(_state "names") |
1556 | + elseif (${arg} STREQUAL "PATHS") |
1557 | + set(_state "paths") |
1558 | + elseif (${arg} STREQUAL "DOC") |
1559 | + set(_state "doc") |
1560 | + else () |
1561 | + set(_jar_names ${arg}) |
1562 | + if (_jar_doc STREQUAL "NOTSET") |
1563 | + set(_jar_doc "Finding ${arg} jar") |
1564 | + endif () |
1565 | + endif () |
1566 | + elseif (${_state} STREQUAL "versions") |
1567 | + if (${arg} STREQUAL "NAMES") |
1568 | + set(_state "names") |
1569 | + elseif (${arg} STREQUAL "PATHS") |
1570 | + set(_state "paths") |
1571 | + elseif (${arg} STREQUAL "DOC") |
1572 | + set(_state "doc") |
1573 | + else () |
1574 | + set(_jar_versions ${_jar_versions} ${arg}) |
1575 | + endif () |
1576 | + elseif (${_state} STREQUAL "names") |
1577 | + if (${arg} STREQUAL "VERSIONS") |
1578 | + set(_state "versions") |
1579 | + elseif (${arg} STREQUAL "PATHS") |
1580 | + set(_state "paths") |
1581 | + elseif (${arg} STREQUAL "DOC") |
1582 | + set(_state "doc") |
1583 | + else () |
1584 | + set(_jar_names ${_jar_names} ${arg}) |
1585 | + if (_jar_doc STREQUAL "NOTSET") |
1586 | + set(_jar_doc "Finding ${arg} jar") |
1587 | + endif () |
1588 | + endif () |
1589 | + elseif (${_state} STREQUAL "paths") |
1590 | + if (${arg} STREQUAL "VERSIONS") |
1591 | + set(_state "versions") |
1592 | + elseif (${arg} STREQUAL "NAMES") |
1593 | + set(_state "names") |
1594 | + elseif (${arg} STREQUAL "DOC") |
1595 | + set(_state "doc") |
1596 | + else () |
1597 | + set(_jar_paths ${_jar_paths} ${arg}) |
1598 | + endif () |
1599 | + elseif (${_state} STREQUAL "doc") |
1600 | + if (${arg} STREQUAL "VERSIONS") |
1601 | + set(_state "versions") |
1602 | + elseif (${arg} STREQUAL "NAMES") |
1603 | + set(_state "names") |
1604 | + elseif (${arg} STREQUAL "PATHS") |
1605 | + set(_state "paths") |
1606 | + else () |
1607 | + set(_jar_doc ${arg}) |
1608 | + endif () |
1609 | + endif () |
1610 | + endforeach () |
1611 | + |
1612 | + if (NOT _jar_names) |
1613 | + message(FATAL_ERROR "find_jar: No name to search for given") |
1614 | + endif () |
1615 | + |
1616 | + foreach (jar_name ${_jar_names}) |
1617 | + foreach (version ${_jar_versions}) |
1618 | + set(_jar_files ${_jar_files} ${jar_name}-${version}.jar) |
1619 | + endforeach () |
1620 | + set(_jar_files ${_jar_files} ${jar_name}.jar) |
1621 | + endforeach () |
1622 | + |
1623 | + find_file(${VARIABLE} |
1624 | + NAMES ${_jar_files} |
1625 | + PATHS ${_jar_paths} |
1626 | + DOC ${_jar_doc} |
1627 | + NO_DEFAULT_PATH) |
1628 | +endfunction () |
1629 | + |
1630 | +function(create_javadoc _target) |
1631 | + set(_javadoc_packages) |
1632 | + set(_javadoc_files) |
1633 | + set(_javadoc_sourcepath) |
1634 | + set(_javadoc_classpath) |
1635 | + set(_javadoc_installpath "${CMAKE_INSTALL_PREFIX}/share/javadoc") |
1636 | + set(_javadoc_doctitle) |
1637 | + set(_javadoc_windowtitle) |
1638 | + set(_javadoc_author FALSE) |
1639 | + set(_javadoc_version FALSE) |
1640 | + set(_javadoc_use FALSE) |
1641 | + |
1642 | + set(_state "package") |
1643 | + |
1644 | + foreach (arg ${ARGN}) |
1645 | + if (${_state} STREQUAL "package") |
1646 | + if (${arg} STREQUAL "PACKAGES") |
1647 | + set(_state "packages") |
1648 | + elseif (${arg} STREQUAL "FILES") |
1649 | + set(_state "files") |
1650 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1651 | + set(_state "sourcepath") |
1652 | + elseif (${arg} STREQUAL "CLASSPATH") |
1653 | + set(_state "classpath") |
1654 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1655 | + set(_state "installpath") |
1656 | + elseif (${arg} STREQUAL "DOCTITLE") |
1657 | + set(_state "doctitle") |
1658 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1659 | + set(_state "windowtitle") |
1660 | + elseif (${arg} STREQUAL "AUTHOR") |
1661 | + set(_state "author") |
1662 | + elseif (${arg} STREQUAL "USE") |
1663 | + set(_state "use") |
1664 | + elseif (${arg} STREQUAL "VERSION") |
1665 | + set(_state "version") |
1666 | + else () |
1667 | + set(_javadoc_packages ${arg}) |
1668 | + set(_state "packages") |
1669 | + endif () |
1670 | + elseif (${_state} STREQUAL "packages") |
1671 | + if (${arg} STREQUAL "FILES") |
1672 | + set(_state "files") |
1673 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1674 | + set(_state "sourcepath") |
1675 | + elseif (${arg} STREQUAL "CLASSPATH") |
1676 | + set(_state "classpath") |
1677 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1678 | + set(_state "installpath") |
1679 | + elseif (${arg} STREQUAL "DOCTITLE") |
1680 | + set(_state "doctitle") |
1681 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1682 | + set(_state "windowtitle") |
1683 | + elseif (${arg} STREQUAL "AUTHOR") |
1684 | + set(_state "author") |
1685 | + elseif (${arg} STREQUAL "USE") |
1686 | + set(_state "use") |
1687 | + elseif (${arg} STREQUAL "VERSION") |
1688 | + set(_state "version") |
1689 | + else () |
1690 | + list(APPEND _javadoc_packages ${arg}) |
1691 | + endif () |
1692 | + elseif (${_state} STREQUAL "files") |
1693 | + if (${arg} STREQUAL "PACKAGES") |
1694 | + set(_state "packages") |
1695 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1696 | + set(_state "sourcepath") |
1697 | + elseif (${arg} STREQUAL "CLASSPATH") |
1698 | + set(_state "classpath") |
1699 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1700 | + set(_state "installpath") |
1701 | + elseif (${arg} STREQUAL "DOCTITLE") |
1702 | + set(_state "doctitle") |
1703 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1704 | + set(_state "windowtitle") |
1705 | + elseif (${arg} STREQUAL "AUTHOR") |
1706 | + set(_state "author") |
1707 | + elseif (${arg} STREQUAL "USE") |
1708 | + set(_state "use") |
1709 | + elseif (${arg} STREQUAL "VERSION") |
1710 | + set(_state "version") |
1711 | + else () |
1712 | + list(APPEND _javadoc_files ${arg}) |
1713 | + endif () |
1714 | + elseif (${_state} STREQUAL "sourcepath") |
1715 | + if (${arg} STREQUAL "PACKAGES") |
1716 | + set(_state "packages") |
1717 | + elseif (${arg} STREQUAL "FILES") |
1718 | + set(_state "files") |
1719 | + elseif (${arg} STREQUAL "CLASSPATH") |
1720 | + set(_state "classpath") |
1721 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1722 | + set(_state "installpath") |
1723 | + elseif (${arg} STREQUAL "DOCTITLE") |
1724 | + set(_state "doctitle") |
1725 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1726 | + set(_state "windowtitle") |
1727 | + elseif (${arg} STREQUAL "AUTHOR") |
1728 | + set(_state "author") |
1729 | + elseif (${arg} STREQUAL "USE") |
1730 | + set(_state "use") |
1731 | + elseif (${arg} STREQUAL "VERSION") |
1732 | + set(_state "version") |
1733 | + else () |
1734 | + list(APPEND _javadoc_sourcepath ${arg}) |
1735 | + endif () |
1736 | + elseif (${_state} STREQUAL "classpath") |
1737 | + if (${arg} STREQUAL "PACKAGES") |
1738 | + set(_state "packages") |
1739 | + elseif (${arg} STREQUAL "FILES") |
1740 | + set(_state "files") |
1741 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1742 | + set(_state "sourcepath") |
1743 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1744 | + set(_state "installpath") |
1745 | + elseif (${arg} STREQUAL "DOCTITLE") |
1746 | + set(_state "doctitle") |
1747 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1748 | + set(_state "windowtitle") |
1749 | + elseif (${arg} STREQUAL "AUTHOR") |
1750 | + set(_state "author") |
1751 | + elseif (${arg} STREQUAL "USE") |
1752 | + set(_state "use") |
1753 | + elseif (${arg} STREQUAL "VERSION") |
1754 | + set(_state "version") |
1755 | + else () |
1756 | + list(APPEND _javadoc_classpath ${arg}) |
1757 | + endif () |
1758 | + elseif (${_state} STREQUAL "installpath") |
1759 | + if (${arg} STREQUAL "PACKAGES") |
1760 | + set(_state "packages") |
1761 | + elseif (${arg} STREQUAL "FILES") |
1762 | + set(_state "files") |
1763 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1764 | + set(_state "sourcepath") |
1765 | + elseif (${arg} STREQUAL "DOCTITLE") |
1766 | + set(_state "doctitle") |
1767 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1768 | + set(_state "windowtitle") |
1769 | + elseif (${arg} STREQUAL "AUTHOR") |
1770 | + set(_state "author") |
1771 | + elseif (${arg} STREQUAL "USE") |
1772 | + set(_state "use") |
1773 | + elseif (${arg} STREQUAL "VERSION") |
1774 | + set(_state "version") |
1775 | + else () |
1776 | + set(_javadoc_installpath ${arg}) |
1777 | + endif () |
1778 | + elseif (${_state} STREQUAL "doctitle") |
1779 | + if (${arg} STREQUAL "PACKAGES") |
1780 | + set(_state "packages") |
1781 | + elseif (${arg} STREQUAL "FILES") |
1782 | + set(_state "files") |
1783 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1784 | + set(_state "sourcepath") |
1785 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1786 | + set(_state "installpath") |
1787 | + elseif (${arg} STREQUAL "CLASSPATH") |
1788 | + set(_state "classpath") |
1789 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1790 | + set(_state "windowtitle") |
1791 | + elseif (${arg} STREQUAL "AUTHOR") |
1792 | + set(_state "author") |
1793 | + elseif (${arg} STREQUAL "USE") |
1794 | + set(_state "use") |
1795 | + elseif (${arg} STREQUAL "VERSION") |
1796 | + set(_state "version") |
1797 | + else () |
1798 | + set(_javadoc_doctitle ${arg}) |
1799 | + endif () |
1800 | + elseif (${_state} STREQUAL "windowtitle") |
1801 | + if (${arg} STREQUAL "PACKAGES") |
1802 | + set(_state "packages") |
1803 | + elseif (${arg} STREQUAL "FILES") |
1804 | + set(_state "files") |
1805 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1806 | + set(_state "sourcepath") |
1807 | + elseif (${arg} STREQUAL "CLASSPATH") |
1808 | + set(_state "classpath") |
1809 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1810 | + set(_state "installpath") |
1811 | + elseif (${arg} STREQUAL "DOCTITLE") |
1812 | + set(_state "doctitle") |
1813 | + elseif (${arg} STREQUAL "AUTHOR") |
1814 | + set(_state "author") |
1815 | + elseif (${arg} STREQUAL "USE") |
1816 | + set(_state "use") |
1817 | + elseif (${arg} STREQUAL "VERSION") |
1818 | + set(_state "version") |
1819 | + else () |
1820 | + set(_javadoc_windowtitle ${arg}) |
1821 | + endif () |
1822 | + elseif (${_state} STREQUAL "author") |
1823 | + if (${arg} STREQUAL "PACKAGES") |
1824 | + set(_state "packages") |
1825 | + elseif (${arg} STREQUAL "FILES") |
1826 | + set(_state "files") |
1827 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1828 | + set(_state "sourcepath") |
1829 | + elseif (${arg} STREQUAL "CLASSPATH") |
1830 | + set(_state "classpath") |
1831 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1832 | + set(_state "installpath") |
1833 | + elseif (${arg} STREQUAL "DOCTITLE") |
1834 | + set(_state "doctitle") |
1835 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1836 | + set(_state "windowtitle") |
1837 | + elseif (${arg} STREQUAL "AUTHOR") |
1838 | + set(_state "author") |
1839 | + elseif (${arg} STREQUAL "USE") |
1840 | + set(_state "use") |
1841 | + elseif (${arg} STREQUAL "VERSION") |
1842 | + set(_state "version") |
1843 | + else () |
1844 | + set(_javadoc_author ${arg}) |
1845 | + endif () |
1846 | + elseif (${_state} STREQUAL "use") |
1847 | + if (${arg} STREQUAL "PACKAGES") |
1848 | + set(_state "packages") |
1849 | + elseif (${arg} STREQUAL "FILES") |
1850 | + set(_state "files") |
1851 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1852 | + set(_state "sourcepath") |
1853 | + elseif (${arg} STREQUAL "CLASSPATH") |
1854 | + set(_state "classpath") |
1855 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1856 | + set(_state "installpath") |
1857 | + elseif (${arg} STREQUAL "DOCTITLE") |
1858 | + set(_state "doctitle") |
1859 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1860 | + set(_state "windowtitle") |
1861 | + elseif (${arg} STREQUAL "AUTHOR") |
1862 | + set(_state "author") |
1863 | + elseif (${arg} STREQUAL "USE") |
1864 | + set(_state "use") |
1865 | + elseif (${arg} STREQUAL "VERSION") |
1866 | + set(_state "version") |
1867 | + else () |
1868 | + set(_javadoc_use ${arg}) |
1869 | + endif () |
1870 | + elseif (${_state} STREQUAL "version") |
1871 | + if (${arg} STREQUAL "PACKAGES") |
1872 | + set(_state "packages") |
1873 | + elseif (${arg} STREQUAL "FILES") |
1874 | + set(_state "files") |
1875 | + elseif (${arg} STREQUAL "SOURCEPATH") |
1876 | + set(_state "sourcepath") |
1877 | + elseif (${arg} STREQUAL "CLASSPATH") |
1878 | + set(_state "classpath") |
1879 | + elseif (${arg} STREQUAL "INSTALLPATH") |
1880 | + set(_state "installpath") |
1881 | + elseif (${arg} STREQUAL "DOCTITLE") |
1882 | + set(_state "doctitle") |
1883 | + elseif (${arg} STREQUAL "WINDOWTITLE") |
1884 | + set(_state "windowtitle") |
1885 | + elseif (${arg} STREQUAL "AUTHOR") |
1886 | + set(_state "author") |
1887 | + elseif (${arg} STREQUAL "USE") |
1888 | + set(_state "use") |
1889 | + elseif (${arg} STREQUAL "VERSION") |
1890 | + set(_state "version") |
1891 | + else () |
1892 | + set(_javadoc_version ${arg}) |
1893 | + endif () |
1894 | + endif () |
1895 | + endforeach () |
1896 | + |
1897 | + set(_javadoc_builddir ${CMAKE_CURRENT_BINARY_DIR}/javadoc/${_target}) |
1898 | + set(_javadoc_options -d ${_javadoc_builddir}) |
1899 | + |
1900 | + if (_javadoc_sourcepath) |
1901 | + set(_start TRUE) |
1902 | + foreach(_path ${_javadoc_sourcepath}) |
1903 | + if (_start) |
1904 | + set(_sourcepath ${_path}) |
1905 | + set(_start FALSE) |
1906 | + else () |
1907 | + set(_sourcepath ${_sourcepath}:${_path}) |
1908 | + endif () |
1909 | + endforeach() |
1910 | + set(_javadoc_options ${_javadoc_options} -sourcepath ${_sourcepath}) |
1911 | + endif () |
1912 | + |
1913 | + if (_javadoc_classpath) |
1914 | + set(_start TRUE) |
1915 | + foreach(_path ${_javadoc_classpath}) |
1916 | + if (_start) |
1917 | + set(_classpath ${_path}) |
1918 | + set(_start FALSE) |
1919 | + else () |
1920 | + set(_classpath ${_classpath}:${_path}) |
1921 | + endif () |
1922 | + endforeach() |
1923 | + set(_javadoc_options ${_javadoc_options} -classpath "${_classpath}") |
1924 | + endif () |
1925 | + |
1926 | + if (_javadoc_doctitle) |
1927 | + set(_javadoc_options ${_javadoc_options} -doctitle '${_javadoc_doctitle}') |
1928 | + endif () |
1929 | + |
1930 | + if (_javadoc_windowtitle) |
1931 | + set(_javadoc_options ${_javadoc_options} -windowtitle '${_javadoc_windowtitle}') |
1932 | + endif () |
1933 | + |
1934 | + if (_javadoc_author) |
1935 | + set(_javadoc_options ${_javadoc_options} -author) |
1936 | + endif () |
1937 | + |
1938 | + if (_javadoc_use) |
1939 | + set(_javadoc_options ${_javadoc_options} -use) |
1940 | + endif () |
1941 | + |
1942 | + if (_javadoc_version) |
1943 | + set(_javadoc_options ${_javadoc_options} -version) |
1944 | + endif () |
1945 | + |
1946 | + add_custom_target(${_target}_javadoc ALL |
1947 | + COMMAND ${Java_JAVADOC_EXECUTABLE} ${_javadoc_options} |
1948 | + ${_javadoc_files} |
1949 | + ${_javadoc_packages} |
1950 | + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
1951 | + ) |
1952 | + |
1953 | + install( |
1954 | + DIRECTORY ${_javadoc_builddir} |
1955 | + DESTINATION ${_javadoc_installpath} |
1956 | + ) |
1957 | +endfunction() |
1958 | + |
1959 | +function (create_javah) |
1960 | + cmake_parse_arguments(_create_javah |
1961 | + "" |
1962 | + "TARGET;GENERATED_FILES;OUTPUT_NAME;OUTPUT_DIR" |
1963 | + "CLASSES;CLASSPATH;DEPENDS" |
1964 | + ${ARGN}) |
1965 | + |
1966 | + # ckeck parameters |
1967 | + if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES) |
1968 | + message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.") |
1969 | + endif() |
1970 | + if (_create_javah_OUTPUT_NAME AND _create_javah_OUTPUT_DIR) |
1971 | + message (FATAL_ERROR "create_javah: OUTPUT_NAME and OUTPUT_DIR are mutually exclusive.") |
1972 | + endif() |
1973 | + |
1974 | + if (NOT _create_javah_CLASSES) |
1975 | + message (FATAL_ERROR "create_javah: CLASSES is a required parameter.") |
1976 | + endif() |
1977 | + |
1978 | + set (_output_files) |
1979 | + if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") |
1980 | + set(_classpath_sep "$<SEMICOLON>") |
1981 | + else () |
1982 | + set(_classpath_sep ":") |
1983 | + endif() |
1984 | + |
1985 | + # handle javah options |
1986 | + set (_javah_options) |
1987 | + |
1988 | + if (_create_javah_CLASSPATH) |
1989 | + # CLASSPATH can specify directories, jar files or targets created with add_jar command |
1990 | + set (_classpath) |
1991 | + foreach (_path IN LISTS _create_javah_CLASSPATH) |
1992 | + if (TARGET ${_path}) |
1993 | + get_target_property (_jar_path ${_path} JAR_FILE) |
1994 | + if (_jar_path) |
1995 | + list (APPEND _classpath "${_jar_path}") |
1996 | + list (APPEND _create_javah_DEPENDS "${_path}") |
1997 | + else() |
1998 | + message(SEND_ERROR "create_javah: CLASSPATH target ${_path} is not a jar.") |
1999 | + endif() |
2000 | + elseif (EXISTS "${_path}") |
2001 | + list (APPEND _classpath "${_path}") |
2002 | + if (NOT IS_DIRECTORY "${_path}") |
2003 | + list (APPEND _create_javah_DEPENDS "${_path}") |
2004 | + endif() |
2005 | + else() |
2006 | + message(SEND_ERROR "create_javah: CLASSPATH entry ${_path} does not exist.") |
2007 | + endif() |
2008 | + endforeach() |
2009 | + string (REPLACE ";" "${_classpath_sep}" _classpath "${_classpath}") |
2010 | + list (APPEND _javah_options -classpath "${_classpath}") |
2011 | + endif() |
2012 | + |
2013 | + if (_create_javah_OUTPUT_DIR) |
2014 | + list (APPEND _javah_options -d "${_create_javah_OUTPUT_DIR}") |
2015 | + endif() |
2016 | + |
2017 | + if (_create_javah_OUTPUT_NAME) |
2018 | + list (APPEND _javah_options -o "${_create_javah_OUTPUT_NAME}") |
2019 | + set (_output_files "${_create_javah_OUTPUT_NAME}") |
2020 | + |
2021 | + get_filename_component (_create_javah_OUTPUT_DIR "${_create_javah_OUTPUT_NAME}" DIRECTORY) |
2022 | + get_filename_component (_create_javah_OUTPUT_DIR "${_create_javah_OUTPUT_DIR}" ABSOLUTE) |
2023 | + endif() |
2024 | + |
2025 | + if (NOT _create_javah_OUTPUT_DIR) |
2026 | + set (_create_javah_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") |
2027 | + endif() |
2028 | + |
2029 | + if (NOT _create_javah_OUTPUT_NAME) |
2030 | + # compute output names |
2031 | + foreach (_class IN LISTS _create_javah_CLASSES) |
2032 | + string (REPLACE "." "_" _c_header "${_class}") |
2033 | + set (_c_header "${_create_javah_OUTPUT_DIR}/${_c_header}.h") |
2034 | + list (APPEND _output_files "${_c_header}") |
2035 | + endforeach() |
2036 | + endif() |
2037 | + |
2038 | + # finalize custom command arguments |
2039 | + if (_create_javah_DEPENDS) |
2040 | + list (INSERT _create_javah_DEPENDS 0 DEPENDS) |
2041 | + endif() |
2042 | + |
2043 | + add_custom_command (OUTPUT ${_output_files} |
2044 | + COMMAND "${Java_JAVAH_EXECUTABLE}" ${_javah_options} -jni ${_create_javah_CLASSES} |
2045 | + ${_create_javah_DEPENDS} |
2046 | + WORKING_DIRECTORY ${_create_javah_OUTPUT_DIR} |
2047 | + COMMENT "Building C header files from classes...") |
2048 | + |
2049 | + if (_create_javah_TARGET) |
2050 | + add_custom_target (${_create_javah_TARGET} ALL DEPENDS ${_output_files}) |
2051 | + endif() |
2052 | + if (_create_javah_GENERATED_FILES) |
2053 | + set (${_create_javah_GENERATED_FILES} ${_output_files} PARENT_SCOPE) |
2054 | + endif() |
2055 | +endfunction() |
2056 | + |
2057 | +function(export_jars) |
2058 | + # Parse and validate arguments |
2059 | + cmake_parse_arguments(_export_jars |
2060 | + "" |
2061 | + "FILE" |
2062 | + "TARGETS" |
2063 | + ${ARGN} |
2064 | + ) |
2065 | + if (NOT _export_jars_FILE) |
2066 | + message(SEND_ERROR "export_jars: FILE must be specified.") |
2067 | + endif() |
2068 | + if (NOT _export_jars_TARGETS) |
2069 | + message(SEND_ERROR "export_jars: TARGETS must be specified.") |
2070 | + endif() |
2071 | + |
2072 | + # Set content of generated exports file |
2073 | + string(REPLACE ";" " " __targets__ "${_export_jars_TARGETS}") |
2074 | + set(__targetdefs__ "") |
2075 | + foreach(_target ${_export_jars_TARGETS}) |
2076 | + get_target_property(_jarpath ${_target} JAR_FILE) |
2077 | + get_filename_component(_jarpath ${_jarpath} PATH) |
2078 | + __java_export_jar(__targetdefs__ ${_target} "${_jarpath}") |
2079 | + endforeach() |
2080 | + |
2081 | + # Generate exports file |
2082 | + configure_file( |
2083 | + ${_JAVA_EXPORT_TARGETS_SCRIPT} |
2084 | + ${_export_jars_FILE} |
2085 | + @ONLY |
2086 | + ) |
2087 | +endfunction() |
2088 | + |
2089 | +function(install_jar_exports) |
2090 | + # Parse and validate arguments |
2091 | + cmake_parse_arguments(_install_jar_exports |
2092 | + "" |
2093 | + "FILE;DESTINATION;COMPONENT" |
2094 | + "TARGETS" |
2095 | + ${ARGN} |
2096 | + ) |
2097 | + if (NOT _install_jar_exports_FILE) |
2098 | + message(SEND_ERROR "install_jar_exports: FILE must be specified.") |
2099 | + endif() |
2100 | + if (NOT _install_jar_exports_DESTINATION) |
2101 | + message(SEND_ERROR "install_jar_exports: DESTINATION must be specified.") |
2102 | + endif() |
2103 | + if (NOT _install_jar_exports_TARGETS) |
2104 | + message(SEND_ERROR "install_jar_exports: TARGETS must be specified.") |
2105 | + endif() |
2106 | + |
2107 | + if (_install_jar_exports_COMPONENT) |
2108 | + set (_COMPONENT COMPONENT ${_install_jar_exports_COMPONENT}) |
2109 | + endif() |
2110 | + |
2111 | + # Determine relative path from installed export file to install prefix |
2112 | + if(IS_ABSOLUTE ${_install_jar_exports_DESTINATION}) |
2113 | + file(RELATIVE_PATH _relpath |
2114 | + ${_install_jar_exports_DESTINATION} |
2115 | + ${CMAKE_INSTALL_PREFIX} |
2116 | + ) |
2117 | + else() |
2118 | + file(RELATIVE_PATH _relpath |
2119 | + ${CMAKE_INSTALL_PREFIX}/${_install_jar_exports_DESTINATION} |
2120 | + ${CMAKE_INSTALL_PREFIX} |
2121 | + ) |
2122 | + endif() |
2123 | + |
2124 | + # Set up unique location for generated exports file |
2125 | + string(SHA256 _hash "${_install_jar_exports_DESTINATION}") |
2126 | + set(_tmpdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/JavaExports/${_hash}) |
2127 | + |
2128 | + # Set content of generated exports file |
2129 | + string(REPLACE ";" " " __targets__ "${_install_jar_exports_TARGETS}") |
2130 | + set(__targetdefs__ "set(_prefix \${CMAKE_CURRENT_LIST_DIR}/${_relpath})\n\n") |
2131 | + foreach(_target ${_install_jar_exports_TARGETS}) |
2132 | + get_target_property(_dir ${_target} INSTALL_DESTINATION) |
2133 | + __java_export_jar(__targetdefs__ ${_target} "\${_prefix}/${_dir}") |
2134 | + endforeach() |
2135 | + __java_lcat(__targetdefs__ "\nunset(_prefix)") |
2136 | + |
2137 | + # Generate and install exports file |
2138 | + configure_file( |
2139 | + ${_JAVA_EXPORT_TARGETS_SCRIPT} |
2140 | + ${_tmpdir}/${_install_jar_exports_FILE} |
2141 | + @ONLY |
2142 | + ) |
2143 | + install(FILES ${_tmpdir}/${_install_jar_exports_FILE} |
2144 | + DESTINATION ${_install_jar_exports_DESTINATION} |
2145 | + ${_COMPONENT}) |
2146 | +endfunction() |
2147 | diff --git a/cmake/3.7/UseJavaClassFilelist.cmake b/cmake/3.7/UseJavaClassFilelist.cmake |
2148 | new file mode 100644 |
2149 | index 0000000..e8e6f01 |
2150 | --- /dev/null |
2151 | +++ b/cmake/3.7/UseJavaClassFilelist.cmake |
2152 | @@ -0,0 +1,58 @@ |
2153 | +#.rst: |
2154 | +# UseJavaClassFilelist |
2155 | +# -------------------- |
2156 | +# |
2157 | +# |
2158 | +# |
2159 | +# |
2160 | +# |
2161 | +# This script create a list of compiled Java class files to be added to |
2162 | +# a jar file. This avoids including cmake files which get created in |
2163 | +# the binary directory. |
2164 | + |
2165 | +#============================================================================= |
2166 | +# Copyright 2010-2011 Andreas schneider <asn@redhat.com> |
2167 | +# |
2168 | +# Distributed under the OSI-approved BSD License (the "License"); |
2169 | +# see accompanying file Copyright.txt for details. |
2170 | +# |
2171 | +# This software is distributed WITHOUT ANY WARRANTY; without even the |
2172 | +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2173 | +# See the License for more information. |
2174 | +#============================================================================= |
2175 | +# (To distribute this file outside of CMake, substitute the full |
2176 | +# License text for the above reference.) |
2177 | + |
2178 | +if (CMAKE_JAVA_CLASS_OUTPUT_PATH) |
2179 | + if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}") |
2180 | + |
2181 | + set(_JAVA_GLOBBED_FILES) |
2182 | + if (CMAKE_JAR_CLASSES_PREFIX) |
2183 | + foreach(JAR_CLASS_PREFIX ${CMAKE_JAR_CLASSES_PREFIX}) |
2184 | + message(STATUS "JAR_CLASS_PREFIX: ${JAR_CLASS_PREFIX}") |
2185 | + |
2186 | + file(GLOB_RECURSE _JAVA_GLOBBED_TMP_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${JAR_CLASS_PREFIX}/*.class") |
2187 | + if (_JAVA_GLOBBED_TMP_FILES) |
2188 | + list(APPEND _JAVA_GLOBBED_FILES ${_JAVA_GLOBBED_TMP_FILES}) |
2189 | + endif () |
2190 | + endforeach() |
2191 | + else() |
2192 | + file(GLOB_RECURSE _JAVA_GLOBBED_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/*.class") |
2193 | + endif () |
2194 | + |
2195 | + set(_JAVA_CLASS_FILES) |
2196 | + # file(GLOB_RECURSE foo RELATIVE) is broken so we need this. |
2197 | + foreach(_JAVA_GLOBBED_FILE ${_JAVA_GLOBBED_FILES}) |
2198 | + file(RELATIVE_PATH _JAVA_CLASS_FILE ${CMAKE_JAVA_CLASS_OUTPUT_PATH} ${_JAVA_GLOBBED_FILE}) |
2199 | + set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES}${_JAVA_CLASS_FILE}\n) |
2200 | + endforeach() |
2201 | + |
2202 | + # write to file |
2203 | + file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist ${_JAVA_CLASS_FILES}) |
2204 | + |
2205 | + else () |
2206 | + message(SEND_ERROR "FATAL: Java class output path doesn't exist") |
2207 | + endif () |
2208 | +else () |
2209 | + message(SEND_ERROR "FATAL: Can't find CMAKE_JAVA_CLASS_OUTPUT_PATH") |
2210 | +endif () |
2211 | diff --git a/cmake/3.7/UseJavaSymlinks.cmake b/cmake/3.7/UseJavaSymlinks.cmake |
2212 | new file mode 100644 |
2213 | index 0000000..90ffdd5 |
2214 | --- /dev/null |
2215 | +++ b/cmake/3.7/UseJavaSymlinks.cmake |
2216 | @@ -0,0 +1,38 @@ |
2217 | +#.rst: |
2218 | +# UseJavaSymlinks |
2219 | +# --------------- |
2220 | +# |
2221 | +# |
2222 | +# |
2223 | +# |
2224 | +# |
2225 | +# Helper script for UseJava.cmake |
2226 | + |
2227 | +#============================================================================= |
2228 | +# Copyright 2010-2011 Andreas schneider <asn@redhat.com> |
2229 | +# |
2230 | +# Distributed under the OSI-approved BSD License (the "License"); |
2231 | +# see accompanying file Copyright.txt for details. |
2232 | +# |
2233 | +# This software is distributed WITHOUT ANY WARRANTY; without even the |
2234 | +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2235 | +# See the License for more information. |
2236 | +#============================================================================= |
2237 | +# (To distribute this file outside of CMake, substitute the full |
2238 | +# License text for the above reference.) |
2239 | + |
2240 | +if (UNIX AND _JAVA_TARGET_OUTPUT_LINK) |
2241 | + if (_JAVA_TARGET_OUTPUT_NAME) |
2242 | + find_program(LN_EXECUTABLE |
2243 | + NAMES |
2244 | + ln |
2245 | + ) |
2246 | + |
2247 | + execute_process( |
2248 | + COMMAND ${LN_EXECUTABLE} -sf "${_JAVA_TARGET_OUTPUT_NAME}" "${_JAVA_TARGET_OUTPUT_LINK}" |
2249 | + WORKING_DIRECTORY ${_JAVA_TARGET_DIR} |
2250 | + ) |
2251 | + else () |
2252 | + message(SEND_ERROR "FATAL: Can't find _JAVA_TARGET_OUTPUT_NAME") |
2253 | + endif () |
2254 | +endif () |
2255 | diff --git a/cmake/3.7/javaTargets.cmake.in b/cmake/3.7/javaTargets.cmake.in |
2256 | new file mode 100644 |
2257 | index 0000000..c5f9c78 |
2258 | --- /dev/null |
2259 | +++ b/cmake/3.7/javaTargets.cmake.in |
2260 | @@ -0,0 +1,39 @@ |
2261 | +cmake_minimum_required(VERSION 2.8) |
2262 | +cmake_policy(PUSH) |
2263 | +cmake_policy(VERSION 2.8) |
2264 | + |
2265 | +#---------------------------------------------------------------- |
2266 | +# Generated CMake Java target import file. |
2267 | +#---------------------------------------------------------------- |
2268 | + |
2269 | +# Protect against multiple inclusion, which would fail when already imported targets are added once more. |
2270 | +set(_targetsDefined) |
2271 | +set(_targetsNotDefined) |
2272 | +set(_expectedTargets) |
2273 | +foreach(_expectedTarget @__targets__@) |
2274 | + list(APPEND _expectedTargets ${_expectedTarget}) |
2275 | + if(TARGET ${_expectedTarget}) |
2276 | + list(APPEND _targetsDefined ${_expectedTarget}) |
2277 | + else() |
2278 | + list(APPEND _targetsNotDefined ${_expectedTarget}) |
2279 | + endif() |
2280 | +endforeach() |
2281 | +if("%${_targetsDefined}" STREQUAL "%${_expectedTargets}") |
2282 | + unset(_targetsDefined) |
2283 | + unset(_targetsNotDefined) |
2284 | + unset(_expectedTargets) |
2285 | + cmake_policy(POP) |
2286 | + return() |
2287 | +endif() |
2288 | +if(NOT "${_targetsDefined}" STREQUAL "") |
2289 | + message(FATAL_ERROR |
2290 | + "Some (but not all) targets in this export set were already defined.\n" |
2291 | + "Targets Defined: ${_targetsDefined}\n" |
2292 | + "Targets not yet defined: ${_targetsNotDefined}\n") |
2293 | +endif() |
2294 | +unset(_targetsDefined) |
2295 | +unset(_targetsNotDefined) |
2296 | +unset(_expectedTargets) |
2297 | + |
2298 | +@__targetdefs__@ |
2299 | +cmake_policy(POP) |
2300 | diff --git a/cmake/FindGLib2.cmake b/cmake/FindGLib2.cmake |
2301 | new file mode 100644 |
2302 | index 0000000..1b4c5ae |
2303 | --- /dev/null |
2304 | +++ b/cmake/FindGLib2.cmake |
2305 | @@ -0,0 +1,124 @@ |
2306 | +# Find glib-2.0 and optional related components |
2307 | + |
2308 | +include(FindPackageHandleStandardArgs) |
2309 | + |
2310 | +# This is set because `find_package_handle_standard_args` is also used for each |
2311 | +# component of GLib2, e.g., `GLib2_glid`, `GLib2_gio`, etc. |
2312 | +set(FPHSA_NAME_MISMATCHED TRUE) |
2313 | + |
2314 | +#------------------------------------------------------------------------------ |
2315 | +function(_glib2_find_include VAR HEADER) |
2316 | + list(APPEND CMAKE_PREFIX_PATH $ENV{GLIB_PATH}) |
2317 | + |
2318 | + set(_paths) |
2319 | + foreach(_lib ${ARGN}) |
2320 | + get_filename_component(_libpath ${GLIB2_${_lib}_LIBRARY} DIRECTORY) |
2321 | + list(APPEND _paths ${_libpath}) |
2322 | + endforeach() |
2323 | + |
2324 | + find_path(GLIB2_${VAR}_INCLUDE_DIR ${HEADER} |
2325 | + PATHS ${_paths} |
2326 | + PATH_SUFFIXES glib-2.0 glib-2.0/include |
2327 | + ) |
2328 | + mark_as_advanced(GLIB2_${VAR}_INCLUDE_DIR) |
2329 | +endfunction() |
2330 | + |
2331 | +#------------------------------------------------------------------------------ |
2332 | +function(_glib2_find_library VAR LIB) |
2333 | + list(APPEND CMAKE_PREFIX_PATH $ENV{GLIB_PATH}) |
2334 | + |
2335 | + if(WIN32) |
2336 | + set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a") |
2337 | + set(CMAKE_FIND_LIBRARY_PREFIXES "lib") |
2338 | + endif() |
2339 | + find_library(GLIB2_${VAR}_LIBRARY NAMES ${LIB}-2.0 ${LIB}) |
2340 | + mark_as_advanced(GLIB2_${VAR}_LIBRARY) |
2341 | + |
2342 | + if(WIN32) |
2343 | + find_program(GLIB2_${VAR}_RUNTIME NAMES lib${LIB}-2.0-0.dll) |
2344 | + mark_as_advanced(GLIB2_${VAR}_RUNTIME) |
2345 | + endif() |
2346 | +endfunction() |
2347 | + |
2348 | +#------------------------------------------------------------------------------ |
2349 | +function(_glib2_add_target TARGET LIBRARY) |
2350 | + set(GLIB2_${TARGET}_FIND_QUIETLY TRUE) |
2351 | + set(_deps GLIB2_${LIBRARY}_LIBRARY) |
2352 | + foreach(_include ${ARGN}) |
2353 | + list(APPEND _deps GLIB2_${_include}_INCLUDE_DIR) |
2354 | + endforeach() |
2355 | + |
2356 | + find_package_handle_standard_args(GLib2_${TARGET} |
2357 | + REQUIRED_VARS ${_deps} |
2358 | + ) |
2359 | + |
2360 | + if(GLib2_${TARGET}_FOUND) |
2361 | + set(GLib2_${TARGET}_FOUND TRUE PARENT_SCOPE) |
2362 | + |
2363 | + set(_target GLib2::${TARGET}) |
2364 | + add_library(${_target} UNKNOWN IMPORTED) |
2365 | + set_property(TARGET ${_target} APPEND PROPERTY |
2366 | + IMPORTED_LOCATION ${GLIB2_${LIBRARY}_LIBRARY} |
2367 | + ) |
2368 | + foreach(_include ${ARGN}) |
2369 | + set_property(TARGET ${_target} APPEND PROPERTY |
2370 | + INTERFACE_INCLUDE_DIRECTORIES ${GLIB2_${_include}_INCLUDE_DIR} |
2371 | + ) |
2372 | + endforeach() |
2373 | + endif() |
2374 | +endfunction() |
2375 | + |
2376 | +############################################################################### |
2377 | + |
2378 | +_glib2_find_library(GLIB glib) |
2379 | +_glib2_find_include(GLIB glib.h) |
2380 | +_glib2_find_include(GLIBCONFIG glibconfig.h GLIB) |
2381 | + |
2382 | +_glib2_add_target(glib GLIB GLIB GLIBCONFIG) |
2383 | + |
2384 | +if(WIN32 AND TARGET GLib2::glib) |
2385 | + set_property(TARGET GLib2::glib APPEND PROPERTY |
2386 | + INTERFACE_LINK_LIBRARIES ws2_32 winmm |
2387 | + ) |
2388 | +endif() |
2389 | + |
2390 | +foreach(_glib2_component ${GLib2_FIND_COMPONENTS}) |
2391 | + |
2392 | + if(_glib2_component STREQUAL "gio") |
2393 | + |
2394 | + _glib2_find_include(GIO gio/gio.h) |
2395 | + _glib2_find_library(GIO gio) |
2396 | + |
2397 | + _glib2_add_target(gio GIO GIO GMODULE GOBJECT GLIB GLIBCONFIG) |
2398 | + |
2399 | + elseif(_glib2_component STREQUAL "gmodule") |
2400 | + |
2401 | + _glib2_find_include(GMODULE gmodule.h) |
2402 | + _glib2_find_library(GMODULE gmodule) |
2403 | + |
2404 | + _glib2_add_target(gmodule GMODULE GMODULE GLIB GLIBCONFIG) |
2405 | + |
2406 | + elseif(_glib2_component STREQUAL "gobject") |
2407 | + |
2408 | + _glib2_find_include(GOBJECT glib-object.h) |
2409 | + _glib2_find_library(GOBJECT gobject) |
2410 | + |
2411 | + _glib2_add_target(gobject GOBJECT GOBJECT GLIB GLIBCONFIG) |
2412 | + |
2413 | + elseif(_glib2_component STREQUAL "gthread") |
2414 | + |
2415 | + _glib2_find_library(GTHREAD gthread) |
2416 | + |
2417 | + _glib2_add_target(gthread GTHREAD GLIB GLIBCONFIG) |
2418 | + |
2419 | + endif() |
2420 | + |
2421 | +endforeach() |
2422 | + |
2423 | +list(APPEND GLib2_FIND_COMPONENTS glib) |
2424 | +set(GLib2_FIND_REQUIRED_glib TRUE) |
2425 | + |
2426 | +find_package_handle_standard_args(GLib2 |
2427 | + REQUIRED_VARS GLIB2_GLIB_LIBRARY |
2428 | + HANDLE_COMPONENTS |
2429 | +) |
2430 | diff --git a/cmake/FindGo.cmake b/cmake/FindGo.cmake |
2431 | new file mode 100644 |
2432 | index 0000000..b7ce186 |
2433 | --- /dev/null |
2434 | +++ b/cmake/FindGo.cmake |
2435 | @@ -0,0 +1,35 @@ |
2436 | +include(FindPackageHandleStandardArgs) |
2437 | + |
2438 | +find_program( |
2439 | + GO_EXECUTABLE go PATHS ENV GOROOT GOPATH GOBIN PATH_SUFFIXES bin |
2440 | +) |
2441 | + |
2442 | +if (NOT GO_EXECUTABLE) |
2443 | + set(GO_EXECUTABLE "go") |
2444 | +endif() |
2445 | + |
2446 | +execute_process( |
2447 | + COMMAND ${GO_EXECUTABLE} version |
2448 | + OUTPUT_VARIABLE GO_VERSION_OUTPUT |
2449 | + OUTPUT_STRIP_TRAILING_WHITESPACE |
2450 | +) |
2451 | + |
2452 | +if(GO_VERSION_OUTPUT MATCHES "go([0-9]+[.0-9]*)[^ ]* ([^/]+)/(.*)") |
2453 | + set(GO_VERSION ${CMAKE_MATCH_1}) |
2454 | + set(GO_PLATFORM ${CMAKE_MATCH_2}) |
2455 | + set(GO_ARCH ${CMAKE_MATCH_3}) |
2456 | +elseif(GO_VERSION_OUTPUT MATCHES "go version devel .* ([^/]+)/(.*)") |
2457 | + set(GO_VERSION "99-devel") |
2458 | + set(GO_PLATFORM ${CMAKE_MATCH_1}) |
2459 | + set(GO_ARCH ${CMAKE_MATCH_2}) |
2460 | + message("WARNING: Development version of Go being used, can't determine compatibility.") |
2461 | +else() |
2462 | + message("Unable to parse the Go version string: ${GO_VERSION_OUTPUT}") |
2463 | +endif() |
2464 | + |
2465 | +mark_as_advanced(GO_EXECUTABLE) |
2466 | + |
2467 | +find_package_handle_standard_args(Go |
2468 | + REQUIRED_VARS GO_EXECUTABLE GO_VERSION GO_PLATFORM GO_ARCH |
2469 | + VERSION_VAR GO_VERSION |
2470 | +) |
2471 | diff --git a/configure.ac b/configure.ac |
2472 | deleted file mode 100644 |
2473 | index 92cf2ef..0000000 |
2474 | --- a/configure.ac |
2475 | +++ /dev/null |
2476 | @@ -1,165 +0,0 @@ |
2477 | -AC_PREREQ(2.50) |
2478 | -AC_INIT([lcm], 1.3.1) |
2479 | -AC_CONFIG_SRCDIR([lcm/lcm.h]) |
2480 | -AC_CANONICAL_SYSTEM |
2481 | -AM_INIT_AUTOMAKE([foreign tar-ustar]) |
2482 | -AC_CONFIG_MACRO_DIR([m4]) |
2483 | - |
2484 | -AC_PROG_CC |
2485 | -PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.0.0 gthread-2.0 >= 2.0.0],,[AC_MSG_ERROR([LCM requires GLib >= 2.0])]) |
2486 | -AC_PATH_PROGS(JAR, [jar]) |
2487 | -AC_PATH_PROGS(JAVAC, [javac]) |
2488 | - |
2489 | -dnl enable silent build if possible (automake >= 1.11) |
2490 | -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
2491 | - |
2492 | -dnl --------------------------------------------------------------------------- |
2493 | -dnl When making a release: |
2494 | -dnl 1. If the library source code has changed at all since the last release, |
2495 | -dnl then increment REVISION. |
2496 | -dnl 2. If the interface has been changed since the last release, increment |
2497 | -dnl CURRENT, and set REVISION to 0. |
2498 | -dnl 3. If the interface changes consist solely of additions, increment AGE. |
2499 | -dnl 4. If the interface has removed or changed elements, set AGE to 0. |
2500 | -dnl --------------------------------------------------------------------------- |
2501 | -LIBLCM_AGE=3 |
2502 | -LIBLCM_REVISION=4 |
2503 | -LIBLCM_CURRENT=4 |
2504 | -CHART2D_VERSION=3.2.2 |
2505 | -AC_SUBST(LIBLCM_AGE) |
2506 | -AC_SUBST(LIBLCM_REVISION) |
2507 | -AC_SUBST(LIBLCM_CURRENT) |
2508 | -AC_SUBST(CHART2D_VERSION) |
2509 | -LIBLCM_VERSION_INFO=$LIBLCM_CURRENT:$LIBLCM_REVISION:$LIBLCM_AGE |
2510 | -AC_SUBST(LIBLCM_VERSION_INFO) |
2511 | - |
2512 | -AM_DISABLE_STATIC |
2513 | -AM_PROG_LIBTOOL |
2514 | - |
2515 | -# link against the socket and nsl libraries if needed |
2516 | -LIB_SOCKET_NSL |
2517 | - |
2518 | -# nanosleep might need special linkage |
2519 | -AC_SEARCH_LIBS([nanosleep], [rt]) |
2520 | - |
2521 | -# inet_aton might need special linkage |
2522 | -AC_SEARCH_LIBS([inet_aton], [resolv]) |
2523 | - |
2524 | -dnl ------------------ |
2525 | -dnl Python support |
2526 | -dnl ------------------ |
2527 | -AC_ARG_WITH(python, |
2528 | - [AS_HELP_STRING([--without-python], |
2529 | - [Do not compile lcm-python bindings even if Python is available])], |
2530 | - [], [with_python=yes]) |
2531 | - |
2532 | -AS_IF([test "x$with_python" != xno], |
2533 | - [AM_PATH_PYTHON(2.3) |
2534 | - AM_CHECK_PYTHON_HEADERS(with_python=yes,with_python=no)]) |
2535 | -AM_CONDITIONAL(HAVE_PYTHON, test "x$with_python" = "xyes") |
2536 | - |
2537 | -pylcmexecdir="$pyexecdir/$PACKAGE" |
2538 | -AC_SUBST(pylcmexecdir) |
2539 | - |
2540 | -dnl ------------------ |
2541 | -dnl Java support |
2542 | -dnl ------------------ |
2543 | -AC_ARG_WITH(java, |
2544 | - [AS_HELP_STRING([--without-java], |
2545 | - [Do not compile lcm-java bindings even if Java is available])], |
2546 | - [], [with_java=yes]) |
2547 | -if test "x$with_java" = xno -o "x$JAR" = x -o "x$JAVAC" = x; then |
2548 | - AC_MSG_WARN([Java support disabled]) |
2549 | - with_java="no" |
2550 | -fi |
2551 | - |
2552 | -AM_CONDITIONAL(HAVE_JAVA, test "x$with_java" = "xyes") |
2553 | -java_apiversion="1.0" |
2554 | -AC_ARG_WITH(jardir, |
2555 | - [AS_HELP_STRING([--with-jardir=DIR], |
2556 | - [Installation directory for lcm.jar (default=DATADIR/java)]. Ignored if Java is not enabled.)], |
2557 | - [jardir="$with_jardir"], [jardir=$datadir/java]) |
2558 | - |
2559 | -AC_SUBST(jardir) |
2560 | -INSTALLED_CLASSPATH=\${jardir}/lcm.jar |
2561 | -AC_SUBST(INSTALLED_CLASSPATH) |
2562 | -AC_SUBST(java_apiversion) |
2563 | - |
2564 | -dnl --------------- |
2565 | -dnl Lua support |
2566 | -dnl --------------- |
2567 | -AC_ARG_WITH(lua, |
2568 | - [AS_HELP_STRING([--without-lua], |
2569 | - [Do not compile lcm-lua bindings even if Lua is available])], |
2570 | - [], [with_lua=yes]) |
2571 | - |
2572 | -AS_IF([test "x$with_lua" != 'xno'], |
2573 | - [ AX_PROG_LUA([5.1], [], [lua_interp='yes'], [lua_interp='no']) |
2574 | - |
2575 | - AS_IF([test "x$lua_interp" = 'xyes'], |
2576 | - [ AX_LUA_HEADERS([lua_headers='yes'], [lua_headers='no']) |
2577 | - AX_LUA_LIBS([lua_libs='yes'], [lua_libs='no']) |
2578 | - ]) |
2579 | - |
2580 | - AS_IF([test "x$lua_interp" = 'xyes' && |
2581 | - test "x$lua_headers" = 'xyes' && |
2582 | - test "x$lua_libs" = 'xyes'], |
2583 | - [with_lua='yes'], |
2584 | - [with_lua='no']) |
2585 | - ]) |
2586 | - |
2587 | -AM_CONDITIONAL(HAVE_LUA, test "x$with_lua" = "xyes") |
2588 | - |
2589 | -dnl --------------------------------------------------------------------------- |
2590 | -dnl Warnings |
2591 | -dnl --------------------------------------------------------------------------- |
2592 | -if test "x$GCC" = "xyes"; then |
2593 | - AM_CFLAGS="$AM_CFLAGS -g -std=gnu99 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT -Wno-unused-parameter -Wno-format-zero-length -Wshadow" |
2594 | - AC_SUBST(AM_CFLAGS) |
2595 | -fi |
2596 | - |
2597 | -AC_OUTPUT([ |
2598 | - Makefile |
2599 | - lcm/Makefile |
2600 | - lcm/lcm.pc |
2601 | - liblcm-test/Makefile |
2602 | - lcm-logger/Makefile |
2603 | - lcmgen/Makefile |
2604 | - lcm-java/Makefile |
2605 | - lcm-java/lcm-java.pc |
2606 | - lcm-python/Makefile |
2607 | - lcm-lua/Makefile |
2608 | - examples/Makefile |
2609 | - m4/Makefile |
2610 | - m4macros/Makefile |
2611 | -]) |
2612 | - |
2613 | -if test "x$with_java" = "xyes"; then |
2614 | - JAVA_STR="Enabled" |
2615 | -else |
2616 | - JAVA_STR="Disabled" |
2617 | -fi |
2618 | - |
2619 | -if test "$with_python" = "yes"; then |
2620 | - PYTHON_STR="Enabled" |
2621 | -else |
2622 | - PYTHON_STR="Disabled" |
2623 | -fi |
2624 | - |
2625 | -if test "$with_lua" = "yes"; then |
2626 | - LUA_STR="Enabled" |
2627 | -else |
2628 | - LUA_STR="Disabled" |
2629 | -fi |
2630 | - |
2631 | -echo " |
2632 | -" |
2633 | - |
2634 | -echo "Configuration (LCM v${PACKAGE_VERSION}): |
2635 | - |
2636 | - Source code location: ${srcdir} |
2637 | - Compiler: ${CC} |
2638 | - Java Support: ${JAVA_STR} |
2639 | - Python Support: ${PYTHON_STR} |
2640 | - Lua Support: ${LUA_STR} |
2641 | -" |
2642 | diff --git a/debian/README.source b/debian/README.source |
2643 | deleted file mode 100644 |
2644 | index 73f719f..0000000 |
2645 | --- a/debian/README.source |
2646 | +++ /dev/null |
2647 | @@ -1,10 +0,0 @@ |
2648 | -The source was repacked to remove 3rd-party dependencies that we already have in |
2649 | -Debian: |
2650 | - |
2651 | - rm -rf lcm-1.3.1/lcm-java/jchart2d-code/ |
2652 | - rm -rf lcm-1.3.1/WinSpecific/ |
2653 | - rm -rf lcm-1.3.1/test/gtest/ |
2654 | - rm -rf lcm-1.3.1/test/java/junit-4.11/ |
2655 | - rm -rf lcm-1.3.1/test/java/hamcrest-core-1.3/ |
2656 | - |
2657 | - -- Dima Kogan <dkogan@debian.org>, Sun, 9 Oct 2016 02:32:51 -0700 |
2658 | diff --git a/debian/changelog b/debian/changelog |
2659 | index 4a0f7f9..87dacd7 100644 |
2660 | --- a/debian/changelog |
2661 | +++ b/debian/changelog |
2662 | @@ -1,3 +1,43 @@ |
2663 | +lcm (1.5.0~repack1-0ubuntu1) noble; urgency=medium |
2664 | + |
2665 | + [ Jose Luis Rivero ] |
2666 | + * New upstream version 1.5.0~repack |
2667 | + (LP: #1956368, #2053256) |
2668 | + * Formatter changes |
2669 | + * Bump standards to 4.6.2 (no changes needed) |
2670 | + * Use default-jdk package for java support |
2671 | + * Bump version to 1.5.0~repack1 |
2672 | + * Rediff patches: |
2673 | + * PATCH: use gnuinstalldirs in CMake |
2674 | + * PATCH: use gtest from system |
2675 | + * PATCH: use java system dependencies instead of embedded files |
2676 | + * PATCH: Encode utf8 characters to fix the java build |
2677 | + * PATCH: fix manpages name to make lintian happy |
2678 | + * Add CMake to d/control |
2679 | + * Use --no-parallel for testing |
2680 | + * Cleanup d/rules |
2681 | + * Update liblcm-doc.docs for new paths |
2682 | + * Generalize d/liblcm-dev.install |
2683 | + * Convert package to use pybuild. Change d/rules heavily. |
2684 | + * Update java dependencies in d/control |
2685 | + * Update d/copyright file |
2686 | + * Keep lcm-java.pc only in the java package |
2687 | + * Remove .doctrees from the -docs package |
2688 | + * Add bindnow to DEB_BUILD_MAINT_OPTIONS |
2689 | + * Replace embedded fonts and jquery with system dependencies |
2690 | + * Remove .gitignore from liblcm-doc installation |
2691 | + * Update existing patch for javadoc generation |
2692 | + * Rework java patch to use offline generation |
2693 | + * Reorder java dependencies: in -bin and -java |
2694 | + * Adding Section: to packages |
2695 | + * Added autotest: install and build-cpp |
2696 | + |
2697 | + [ Vladimir Petko ] |
2698 | + * Use javahelper to package jar file |
2699 | + * PATCH: fix build error due to the quotes around pythonpath |
2700 | + |
2701 | + -- Jose Luis Rivero <jrivero@osrfoundation.org> Wed, 10 Apr 2024 13:28:38 +0200 |
2702 | + |
2703 | lcm (1.3.1+repack1-7build2) noble; urgency=medium |
2704 | |
2705 | * No-change rebuild for CVE-2024-3094 |
2706 | diff --git a/debian/control b/debian/control |
2707 | index be8dfed..3fa1443 100644 |
2708 | --- a/debian/control |
2709 | +++ b/debian/control |
2710 | @@ -3,11 +3,24 @@ Priority: optional |
2711 | Section: libs |
2712 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
2713 | XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org> |
2714 | -Build-Depends: debhelper-compat (= 13), |
2715 | - libglib2.0-dev, libtool, |
2716 | - default-jdk-headless | java-sdk, libjchart2d-java, libhamcrest-java, junit, |
2717 | - doxygen |
2718 | -Standards-Version: 3.9.8 |
2719 | +Build-Depends: |
2720 | + debhelper-compat (= 13), |
2721 | + dh-sequence-python3, |
2722 | + default-jdk, |
2723 | + default-jdk-doc, |
2724 | + doxygen, |
2725 | + cmake, |
2726 | + javahelper, |
2727 | + junit4, |
2728 | + libglib2.0-dev, |
2729 | + libgtest-dev, |
2730 | + libjchart2d-java, |
2731 | + libtool, |
2732 | + python3-dev, |
2733 | + python3-myst-parser <!nodoc>, |
2734 | + python3-sphinx <!nodoc>, |
2735 | + python3-sphinx-rtd-theme <!nodoc> |
2736 | +Standards-Version: 4.6.2 |
2737 | Homepage: http://lcm-proj.github.io/ |
2738 | Vcs-Git: https://salsa.debian.org/debian/lcm.git |
2739 | Vcs-Browser: https://salsa.debian.org/debian/lcm |
2740 | @@ -15,8 +28,10 @@ Rules-Requires-Root: no |
2741 | |
2742 | Package: liblcm1 |
2743 | Architecture: any |
2744 | -Depends: ${shlibs:Depends}, ${misc:Depends} |
2745 | -Description: Lightweight Communications and Marshalling |
2746 | +Depends: |
2747 | + ${misc:Depends}, |
2748 | + ${shlibs:Depends}, |
2749 | +Description: Lightweight Communications and Marshalling - Runtime lib |
2750 | LCM is a set of libraries and tools for message passing and data marshalling, |
2751 | targeted at real-time systems where high-bandwidth and low latency are |
2752 | critical. It provides a publish/subscribe message passing model and automatic |
2753 | @@ -25,52 +40,90 @@ Description: Lightweight Communications and Marshalling |
2754 | . |
2755 | This package provides the runtime libraries. |
2756 | |
2757 | -Package: liblcm-dev |
2758 | +Package: liblcm-bin |
2759 | Architecture: any |
2760 | -Depends: liblcm1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, |
2761 | - liblcm-bin |
2762 | -Description: Lightweight Communications and Marshalling |
2763 | +Depends: |
2764 | + liblcm-java, |
2765 | + default-jre, |
2766 | + liblcm1 (= ${binary:Version}), |
2767 | + ${misc:Depends}, |
2768 | + ${shlibs:Depends}, |
2769 | +Description: Lightweight Communications and Marshalling - Executable tools |
2770 | LCM is a set of libraries and tools for message passing and data marshalling, |
2771 | targeted at real-time systems where high-bandwidth and low latency are |
2772 | critical. It provides a publish/subscribe message passing model and automatic |
2773 | marshalling/unmarshalling code generation with bindings for applications in a |
2774 | variety of programming languages. |
2775 | . |
2776 | - This package provides the runtime libraries. |
2777 | + This package provides the executable tools. |
2778 | |
2779 | -Package: liblcm-bin |
2780 | +Package: liblcm-dev |
2781 | +Section: libdevel |
2782 | Architecture: any |
2783 | -Depends: liblcm1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} |
2784 | -Description: Lightweight Communications and Marshalling |
2785 | +Depends: |
2786 | + liblcm-bin, |
2787 | + liblcm1 (= ${binary:Version}), |
2788 | + ${misc:Depends}, |
2789 | + ${shlibs:Depends}, |
2790 | +Description: Lightweight Communications and Marshalling - Dev files |
2791 | LCM is a set of libraries and tools for message passing and data marshalling, |
2792 | targeted at real-time systems where high-bandwidth and low latency are |
2793 | critical. It provides a publish/subscribe message passing model and automatic |
2794 | marshalling/unmarshalling code generation with bindings for applications in a |
2795 | variety of programming languages. |
2796 | . |
2797 | - This package provides the executable tools. |
2798 | + This package provides the development files. |
2799 | |
2800 | -Package: liblcm-java |
2801 | -Architecture: any |
2802 | -Depends: liblcm1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, |
2803 | - liblcm-bin |
2804 | -Description: Lightweight Communications and Marshalling |
2805 | +Package: liblcm-doc |
2806 | +Section: doc |
2807 | +Architecture: all |
2808 | +Depends: |
2809 | + fonts-lato, |
2810 | + fonts-roboto-slab, |
2811 | + fonts-font-awesome, |
2812 | + libjs-jquery, |
2813 | + libjs-jquery-ui, |
2814 | + ${misc:Depends}, |
2815 | + ${shlibs:Depends}, |
2816 | + ${sphinxdoc:Depends} |
2817 | +Description: Lightweight Communications and Marshalling - Documentation |
2818 | LCM is a set of libraries and tools for message passing and data marshalling, |
2819 | targeted at real-time systems where high-bandwidth and low latency are |
2820 | critical. It provides a publish/subscribe message passing model and automatic |
2821 | marshalling/unmarshalling code generation with bindings for applications in a |
2822 | variety of programming languages. |
2823 | . |
2824 | - This package provides the java interface. |
2825 | + This package contains the documentation. |
2826 | |
2827 | -Package: liblcm-doc |
2828 | +Package: liblcm-java |
2829 | +Section: java |
2830 | Architecture: all |
2831 | -Depends: ${shlibs:Depends}, ${misc:Depends} |
2832 | -Description: Lightweight Communications and Marshalling |
2833 | +Depends: |
2834 | + libjchart2d-java, |
2835 | + ${misc:Depends} |
2836 | +Description: Lightweight Communications and Marshalling - Java Interface |
2837 | + LCM is a set of libraries and tools for message passing and data marshalling, |
2838 | + targeted at real-time systems where high-bandwidth and low latency are |
2839 | + critical. It provides a publish/subscribe message passing model and automatic |
2840 | + marshalling/unmarshalling code generation with bindings for applications in a |
2841 | + variety of programming languages. |
2842 | + . |
2843 | + This package provides the Java interface. |
2844 | + |
2845 | +Package: python3-lcm |
2846 | +Section: python |
2847 | +Architecture: any |
2848 | +Depends: |
2849 | + liblcm-bin, |
2850 | + liblcm1 (= ${binary:Version}), |
2851 | + ${misc:Depends}, |
2852 | + ${shlibs:Depends}, |
2853 | + ${python3:Depends} |
2854 | +Description: Lightweight Communications and Marshalling - Python Interface |
2855 | LCM is a set of libraries and tools for message passing and data marshalling, |
2856 | targeted at real-time systems where high-bandwidth and low latency are |
2857 | critical. It provides a publish/subscribe message passing model and automatic |
2858 | marshalling/unmarshalling code generation with bindings for applications in a |
2859 | variety of programming languages. |
2860 | . |
2861 | - This package contains the documentation |
2862 | + This package provides the Python interface. |
2863 | diff --git a/debian/copyright b/debian/copyright |
2864 | index cad9f6e..fcedcc4 100644 |
2865 | --- a/debian/copyright |
2866 | +++ b/debian/copyright |
2867 | @@ -2,26 +2,28 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
2868 | Upstream-Name: lcm |
2869 | Upstream-Contact: lcm-users@googlegroups.com |
2870 | Source: https://github.com/lcm-proj/lcm |
2871 | +Files-Excluded: .github |
2872 | + lcm-java/jchart2d-code |
2873 | + test/gtest |
2874 | + test/java/hamcrest-core-*.jar |
2875 | + test/java/junit-*.jar |
2876 | + WinSpecific |
2877 | |
2878 | Files: * |
2879 | -Copyright: 2007-2016 LCM developers |
2880 | +Copyright: 2007-2024 LCM developers (see AUTHORS) |
2881 | License: LGPL-2.1+ |
2882 | |
2883 | Files: lcm-lite/lcmlite_ios.* |
2884 | Copyright: 2010 Edwin Olson |
2885 | License: LGPL-2.1+ |
2886 | |
2887 | -Files: m4/ax_lua.m4 |
2888 | -Copyright: 2013 Tim Perkins <tprk77@gmail.com>, Reuben Thomas <rrt@sc3d.org> |
2889 | -License: GPL-3+ |
2890 | - |
2891 | -Files: m4/ax_version_compare.m4 |
2892 | -Copyright: 2008 Tim Toolan <toolan@ele.uri.edu> |
2893 | -License: AXVC |
2894 | - |
2895 | -Files: m4/lib_socket_nsl.m4 |
2896 | -Copyright: 2005 Russ Allbery <rra@stanford.edu>, Stepan Kasal <kasal@ucw.cz>, Warren Young <warren@etr-usa.com> |
2897 | -License: LSN |
2898 | +Files: cmake/3.7/UseJava.cmake |
2899 | + cmake/3.7/UseJavaClassFilelist.cmake |
2900 | + cmake/3.7/UseJavaSymlinks.cmake |
2901 | +Copyright: 2010-2011, Andreas schneider <asn@redhat.com> |
2902 | + 2010-2013, Kitware, Inc |
2903 | + 2013, OpenGamma Ltd <graham@opengamma.com> |
2904 | +License: BSD-3-clause |
2905 | |
2906 | |
2907 | License: LGPL-2.1+ |
2908 | @@ -32,21 +34,35 @@ License: LGPL-2.1+ |
2909 | On Debian GNU/Linux systems, the complete text of the Lesser General Public |
2910 | License can be found in `/usr/share/common-licenses/LGPL-2.1'. |
2911 | |
2912 | -License: GPL-3+ |
2913 | - This program is free software; you can redistribute it and/or modify it under |
2914 | - the terms of the GNU General Public License as published by the Free Software |
2915 | - Foundation; either version 3, or (at your option) any later version. |
2916 | +License: BSD-3-clause |
2917 | + Software License Agreement (BSD License) |
2918 | . |
2919 | - On Debian GNU/Linux systems, the complete text of the General Public License |
2920 | - can be found in `/usr/share/common-licenses/GPL-3'. |
2921 | - |
2922 | -License: AXVC |
2923 | - Copying and distribution of this file, with or without modification, are |
2924 | - permitted in any medium without royalty provided the copyright notice |
2925 | - and this notice are preserved. This file is offered as-is, without any |
2926 | - warranty. |
2927 | - |
2928 | -License: LSN |
2929 | - Copying and distribution of this file, with or without |
2930 | - modification, are permitted in any medium without royalty provided |
2931 | - the copyright notice and this notice are preserved. |
2932 | + Copyright (c) 2008, Willow Garage, Inc. |
2933 | + All rights reserved. |
2934 | + . |
2935 | + Redistribution and use in source and binary forms, with or without |
2936 | + modification, are permitted provided that the following conditions |
2937 | + are met: |
2938 | + . |
2939 | + * Redistributions of source code must retain the above copyright |
2940 | + notice, this list of conditions and the following disclaimer. |
2941 | + * Redistributions in binary form must reproduce the above |
2942 | + copyright notice, this list of conditions and the following |
2943 | + disclaimer in the documentation and/or other materials provided |
2944 | + with the distribution. |
2945 | + * Neither the name of the Willow Garage nor the names of its |
2946 | + contributors may be used to endorse or promote products derived |
2947 | + from this software without specific prior written permission. |
2948 | + . |
2949 | + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
2950 | + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
2951 | + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
2952 | + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
2953 | + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
2954 | + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
2955 | + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
2956 | + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
2957 | + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
2958 | + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
2959 | + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
2960 | + POSSIBILITY OF SUCH DAMAGE. |
2961 | diff --git a/debian/liblcm-bin.lintian-overrides b/debian/liblcm-bin.lintian-overrides |
2962 | new file mode 100644 |
2963 | index 0000000..cdf372e |
2964 | --- /dev/null |
2965 | +++ b/debian/liblcm-bin.lintian-overrides |
2966 | @@ -0,0 +1,2 @@ |
2967 | +# no upstream man page |
2968 | +liblcm-bin: no-manual-page [usr/bin/lcm-logfilter] |
2969 | diff --git a/debian/liblcm-dev.install b/debian/liblcm-dev.install |
2970 | index 1e67dfd..d15c26f 100644 |
2971 | --- a/debian/liblcm-dev.install |
2972 | +++ b/debian/liblcm-dev.install |
2973 | @@ -1,5 +1,6 @@ |
2974 | -usr/include/ |
2975 | -usr/lib/*/pkgconfig/lcm.pc |
2976 | +usr/include/* |
2977 | usr/lib/*/*.so |
2978 | +usr/lib/*/*.a |
2979 | +usr/lib/*/pkgconfig/*.pc |
2980 | +usr/lib/*/lcm/cmake/*.cmake |
2981 | usr/share/aclocal/ |
2982 | - |
2983 | diff --git a/debian/liblcm-doc.docs b/debian/liblcm-doc.docs |
2984 | index 9100e1c..73bec91 100644 |
2985 | --- a/debian/liblcm-doc.docs |
2986 | +++ b/debian/liblcm-doc.docs |
2987 | @@ -1,5 +1,4 @@ |
2988 | -examples/ |
2989 | -docs/content/* |
2990 | -docs/html/ |
2991 | -NEWS |
2992 | +NEWS.md |
2993 | README.md |
2994 | +.pybuild/*/build/docs/_build/ |
2995 | +examples/ |
2996 | diff --git a/debian/liblcm-doc.links b/debian/liblcm-doc.links |
2997 | new file mode 100644 |
2998 | index 0000000..982870d |
2999 | --- /dev/null |
3000 | +++ b/debian/liblcm-doc.links |
3001 | @@ -0,0 +1,4 @@ |
3002 | +usr/share/javascript/jquery/jquery.min.js usr/share/doc/liblcm-dev/_build/javadocs/script-dir/jquery-3.6.1.min.js |
3003 | +usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css usr/share/doc/liblcm-dev/_build/javadocs/script-dir/jquery-ui.min.css |
3004 | +usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/doc/liblcm-dev/_build/javadocs/script-dir/jquery-ui.min.js |
3005 | +usr/share/javascript/jquery-ui/jquery.js usr/share/doc/liblcm-dev/_build/javadocs/jquery/external/jquery/jquery.js |
3006 | diff --git a/debian/liblcm-java.install b/debian/liblcm-java.install |
3007 | index 40d6507..7d1bfe8 100644 |
3008 | --- a/debian/liblcm-java.install |
3009 | +++ b/debian/liblcm-java.install |
3010 | @@ -1,2 +1,2 @@ |
3011 | +usr/lib/pkgconfig/lcm-java.pc |
3012 | usr/share/java/ |
3013 | -usr/lib/*/pkgconfig/lcm-java.pc |
3014 | diff --git a/debian/liblcm-java.jlibs b/debian/liblcm-java.jlibs |
3015 | new file mode 100644 |
3016 | index 0000000..7ecb836 |
3017 | --- /dev/null |
3018 | +++ b/debian/liblcm-java.jlibs |
3019 | @@ -0,0 +1 @@ |
3020 | +debian/tmp/usr/share/java/lcm.jar |
3021 | diff --git a/debian/patches/0001-I-use-the-java-dependencies-from-the-system.patch b/debian/patches/0001-I-use-the-java-dependencies-from-the-system.patch |
3022 | deleted file mode 100644 |
3023 | index b18c7b6..0000000 |
3024 | --- a/debian/patches/0001-I-use-the-java-dependencies-from-the-system.patch |
3025 | +++ /dev/null |
3026 | @@ -1,65 +0,0 @@ |
3027 | -From: Dima Kogan <dima@secretsauce.net> |
3028 | -Date: Sun, 9 Oct 2016 02:50:04 -0700 |
3029 | -Subject: I use the java dependencies from the system |
3030 | - |
3031 | -jchart2d, jide, xmlgraphics |
3032 | ---- |
3033 | - lcm-java/Makefile.am | 22 ++++++---------------- |
3034 | - 1 file changed, 6 insertions(+), 16 deletions(-) |
3035 | - |
3036 | -diff --git a/lcm-java/Makefile.am b/lcm-java/Makefile.am |
3037 | -index fc24103..2934699 100644 |
3038 | ---- a/lcm-java/Makefile.am |
3039 | -+++ b/lcm-java/Makefile.am |
3040 | -@@ -1,22 +1,14 @@ |
3041 | - JAVAROOT = $(abs_builddir)/build |
3042 | - JARFILE = lcm.jar |
3043 | --jchart2d_src_dir = $(srcdir)/jchart2d-code/src |
3044 | --jide_jar = $(srcdir)/jchart2d-code/ext/jide-oss-2.9.7.jar |
3045 | --xmlgraphics_jar = $(srcdir)/jchart2d-code/ext/xmlgraphics-commons-1.3.1.jar |
3046 | --abs_jchart2d_src_dir = $(abs_srcdir)/jchart2d-code/src |
3047 | --abs_jide_jar = $(abs_srcdir)/jchart2d-code/ext/jide-oss-2.9.7.jar |
3048 | --abs_xmlgraphics_jar = $(abs_srcdir)/jchart2d-code/ext/xmlgraphics-commons-1.3.1.jar |
3049 | --JAVACFLAGS = -source 1.5 -target 1.5 -classpath $(abs_jide_jar):$(abs_xmlgraphics_jar):$(abs_jchart2d_src_dir) |
3050 | -+JAVACFLAGS = -source 1.5 -target 1.5 -classpath /usr/share/java/jchart2d.jar |
3051 | - |
3052 | - .PHONY classfiles: classdist_noinst.stamp classnoinst.stamp |
3053 | - |
3054 | --$(JARFILE): $(jchart2d_jar) $(jide_jar) $(xmlgraphics_jar) $(JAVAROOT) classfiles |
3055 | -+$(JARFILE): $(JAVAROOT) classfiles |
3056 | - rm -f $(JARFILE) |
3057 | -- cd $(JAVAROOT) && $(JAR) xf $(abs_jide_jar) # && mv $(JAVAROOT)/META-INF $(JAVAROOT)/META-INF.jide |
3058 | -- cd $(JAVAROOT) && $(JAR) xf $(abs_xmlgraphics_jar) # && mv $(JAVAROOT)/META-INF $(JAVAROOT)/META-INF.xmlgraphics |
3059 | - $(JAR) cf $(JARFILE) -C $(JAVAROOT) . |
3060 | - |
3061 | --jar_DATA = $(JARFILE) $(jchart2d_jar) |
3062 | -+jar_DATA = $(JARFILE) |
3063 | - |
3064 | - lcm-logplayer-gui: Makefile |
3065 | - @echo > $@ "#!/bin/sh" |
3066 | -@@ -25,7 +17,7 @@ lcm-logplayer-gui: Makefile |
3067 | - |
3068 | - lcm-spy: Makefile |
3069 | - @echo > $@ "#!/bin/sh" |
3070 | -- @echo >> $@ "exec java -server -Djava.net.preferIPv4Stack=true -Xincgc -Xmx128m -Xms64m -ea -cp ${jardir}/lcm.jar lcm.spy.Spy \$$*" |
3071 | -+ @echo >> $@ "exec java -server -Djava.net.preferIPv4Stack=true -Xincgc -Xmx128m -Xms64m -ea -cp ${jardir}/lcm.jar:${jardir}/jchart2d.jar lcm.spy.Spy \$$*" |
3072 | - chmod 755 $@ |
3073 | - |
3074 | - javaroot_cleanfiles = $(shell find $(JAVAROOT) -type f) |
3075 | -@@ -38,9 +30,7 @@ clean-local: |
3076 | - |
3077 | - lcm_java_files = $(shell find $(srcdir)/lcm -type f -name "*.java" -not -path "*/\.*") |
3078 | - |
3079 | --jchart2d_java_files = $(shell find $(jchart2d_src_dir) -type f -name "*.java" -not -path "*/\.*") |
3080 | -- |
3081 | --dist_noinst_JAVA = $(lcm_java_files) $(jchart2d_java_files) |
3082 | -+dist_noinst_JAVA = $(lcm_java_files) |
3083 | - |
3084 | - $(dist_noinst_JAVA): $(abs_builddir)/build |
3085 | - |
3086 | -@@ -51,4 +41,4 @@ man_MANS = lcm-spy.1 lcm-logplayer-gui.1 |
3087 | - |
3088 | - pkgconfigdir = $(libdir)/pkgconfig |
3089 | - pkgconfig_DATA = lcm-java.pc |
3090 | --EXTRA_DIST = lcm-java.pc.in lcm-spy.1 lcm-logplayer-gui.1 jchart2d-code |
3091 | -+EXTRA_DIST = lcm-java.pc.in lcm-spy.1 lcm-logplayer-gui.1 |
3092 | diff --git a/debian/patches/0001-fix-manpages-name.patch b/debian/patches/0001-fix-manpages-name.patch |
3093 | new file mode 100644 |
3094 | index 0000000..07c0678 |
3095 | --- /dev/null |
3096 | +++ b/debian/patches/0001-fix-manpages-name.patch |
3097 | @@ -0,0 +1,47 @@ |
3098 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3099 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3100 | +Subject: Missing brief description in manpages |
3101 | + Lintian was complaining about has-bad-whatis |
3102 | +Forwarded: https://github.com/lcm-proj/lcm/pull/487 |
3103 | + |
3104 | +--- |
3105 | +--- a/liblcm-test/lcm-example.1 |
3106 | ++++ b/liblcm-test/lcm-example.1 |
3107 | +@@ -1,6 +1,6 @@ |
3108 | + .TH lcm_example 1 2007-12-13 "LCM" "Lightweight Communications and Marshalling (LCM)" |
3109 | + .SH NAME |
3110 | +-lcm_example |
3111 | ++lcm_example \- Example program for the LC Communications library |
3112 | + .SH SYNOPSIS |
3113 | + .TP 5 |
3114 | + \fBlcm_example |
3115 | +--- a/liblcm-test/lcm-sink.1 |
3116 | ++++ b/liblcm-test/lcm-sink.1 |
3117 | +@@ -1,6 +1,6 @@ |
3118 | + .TH lcm_sink 1 2007-12-13 "LCM" "Lightweight Communications and Marshalling (LCM)" |
3119 | + .SH NAME |
3120 | +-lcm_sink |
3121 | ++lcm_sink \- Dumps the contents of received message to stdout |
3122 | + .SH SYNOPSIS |
3123 | + .TP 5 |
3124 | + \fBlcm_sink |
3125 | +--- a/liblcm-test/lcm-source.1 |
3126 | ++++ b/liblcm-test/lcm-source.1 |
3127 | +@@ -1,6 +1,6 @@ |
3128 | + .TH lcm_source 1 2007-12-13 "LCM" "Lightweight Communications and Marshalling (LCM)" |
3129 | + .SH NAME |
3130 | +-lcm_source |
3131 | ++lcm_source \- Transmit random messages over the LC Communications library |
3132 | + .SH SYNOPSIS |
3133 | + .TP 5 |
3134 | + \fBlcm_source \fI[options]\fR |
3135 | +--- a/liblcm-test/lcm-tester.1 |
3136 | ++++ b/liblcm-test/lcm-tester.1 |
3137 | +@@ -1,6 +1,6 @@ |
3138 | + .TH lcm_tester 1 2007-12-13 "LCM" "Lightweight Communications and Marshalling (LCM)" |
3139 | + .SH NAME |
3140 | +-lcm_tester |
3141 | ++lcm_tester \- Program for testing the functionality of the LC Communications library |
3142 | + .SH SYNOPSIS |
3143 | + .TP 5 |
3144 | + \fBlcm_tester |
3145 | diff --git a/debian/patches/0002-Not-building-docs-for-.NET.patch b/debian/patches/0002-Not-building-docs-for-.NET.patch |
3146 | deleted file mode 100644 |
3147 | index e8a459e..0000000 |
3148 | --- a/debian/patches/0002-Not-building-docs-for-.NET.patch |
3149 | +++ /dev/null |
3150 | @@ -1,22 +0,0 @@ |
3151 | -From: Dima Kogan <dima@secretsauce.net> |
3152 | -Date: Sun, 9 Oct 2016 14:08:17 -0700 |
3153 | -Subject: Not building docs for .NET |
3154 | - |
3155 | ---- |
3156 | - docs/build-docs.sh | 6 ------ |
3157 | - 1 file changed, 6 deletions(-) |
3158 | - |
3159 | -diff --git a/docs/build-docs.sh b/docs/build-docs.sh |
3160 | -index 6f7f9bf..6856217 100755 |
3161 | ---- a/docs/build-docs.sh |
3162 | -+++ b/docs/build-docs.sh |
3163 | -@@ -24,9 +24,3 @@ javadoc -d ../docs/html/javadocs -link http://java.sun.com/j2se/1.5.0/docs/api $ |
3164 | - # Doxygen |
3165 | - cd ../docs |
3166 | - doxygen |
3167 | -- |
3168 | --# .NET |
3169 | --cd ../lcm-dotnet |
3170 | --doxygen |
3171 | --mv lcm-dotnet/html ../docs/html/lcm-dotnet |
3172 | --rm -rf lcm-dotnet |
3173 | diff --git a/debian/patches/0002-encode-utf8-java-chars.patch b/debian/patches/0002-encode-utf8-java-chars.patch |
3174 | new file mode 100644 |
3175 | index 0000000..a4a6aa7 |
3176 | --- /dev/null |
3177 | +++ b/debian/patches/0002-encode-utf8-java-chars.patch |
3178 | @@ -0,0 +1,33 @@ |
3179 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3180 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3181 | +Subject: Use encoded utf-8 representatio of the bullet char |
3182 | + Fix broken compilation on Debian Sid |
3183 | +Forwarded: https://github.com/lcm-proj/lcm/pull/488 |
3184 | + |
3185 | +--- |
3186 | +diff --git a/lcm-java/lcm/logging/LogPlayer.java b/lcm-java/lcm/logging/LogPlayer.java |
3187 | +index c3b6c62..fc4321b 100644 |
3188 | +--- a/lcm-java/lcm/logging/LogPlayer.java |
3189 | ++++ b/lcm-java/lcm/logging/LogPlayer.java |
3190 | +@@ -1120,7 +1120,7 @@ public class LogPlayer extends JComponent |
3191 | + } |
3192 | + |
3193 | + { |
3194 | +- String spacer = " • "; |
3195 | ++ String spacer = " \u2022 "; |
3196 | + String filename = p.logName.getText(); |
3197 | + |
3198 | + String title = "LogPlayer"; |
3199 | +diff --git a/lcm-java/lcm/spy/Spy.java b/lcm-java/lcm/spy/Spy.java |
3200 | +index e3a6a7e..143cdaf 100644 |
3201 | +--- a/lcm-java/lcm/spy/Spy.java |
3202 | ++++ b/lcm-java/lcm/spy/Spy.java |
3203 | +@@ -38,7 +38,7 @@ public class Spy |
3204 | + } |
3205 | + String title = "LCM Spy"; |
3206 | + { |
3207 | +- String spacer = " • "; |
3208 | ++ String spacer = " \u2022 "; |
3209 | + if (null != titleOptions.label) { |
3210 | + title += spacer + titleOptions.label; |
3211 | + } |
3212 | diff --git a/debian/patches/0003-Python-docs-are-now-built-using-the-already-built-py.patch b/debian/patches/0003-Python-docs-are-now-built-using-the-already-built-py.patch |
3213 | deleted file mode 100644 |
3214 | index a84a7a2..0000000 |
3215 | --- a/debian/patches/0003-Python-docs-are-now-built-using-the-already-built-py.patch |
3216 | +++ /dev/null |
3217 | @@ -1,37 +0,0 @@ |
3218 | -From: Dima Kogan <dima@secretsauce.net> |
3219 | -Date: Sun, 9 Oct 2016 14:19:09 -0700 |
3220 | -Subject: Python docs are now built using the already-built python module |
3221 | - |
3222 | -We were re-building lcm for the docs |
3223 | ---- |
3224 | - docs/build-docs.sh | 15 +++------------ |
3225 | - 1 file changed, 3 insertions(+), 12 deletions(-) |
3226 | - |
3227 | -diff --git a/docs/build-docs.sh b/docs/build-docs.sh |
3228 | -index 6856217..3527ca9 100755 |
3229 | ---- a/docs/build-docs.sh |
3230 | -+++ b/docs/build-docs.sh |
3231 | -@@ -1,20 +1,11 @@ |
3232 | - #!/bin/sh |
3233 | - |
3234 | --[ -d html ] && rm -rf html |
3235 | -- |
3236 | --[ -d lcm-dotnet ] & rm -rf lcm-dotnet |
3237 | -- |
3238 | --[ -d html ] || mkdir html |
3239 | -+rm -rf html |
3240 | -+mkdir -p html/python |
3241 | - |
3242 | - # Python |
3243 | --# Build python modules locally so that Epydoc does not need to rely on a |
3244 | --# system-installed version of LCM |
3245 | --cd ../lcm-python |
3246 | --python setup.py install --prefix build |
3247 | --cd ../docs |
3248 | - pyver=$(python -c "import platform; print platform.python_version()[:3]") |
3249 | --PYTHONPATH=../lcm-python/build/python${pyver}/site-packages/:$PYTHONPATH epydoc --config epydoc.cfg |
3250 | -- |
3251 | -+LD_LIBRARY_PATH=$PWD/../debian/tmp/usr/lib/`dpkg-architecture -qDEB_HOST_GNU_TYPE` PYTHONPATH=../debian/tmp/usr/lib/python${pyver}/dist-packages/:$PYTHONPATH epydoc --config epydoc.cfg |
3252 | - # Java |
3253 | - cd ../lcm-java |
3254 | - CLASSES="lcm/lcm/LCM.java lcm/logging/Log.java lcm/lcm/LCMSubscriber.java lcm/lcm/LCMEncodable.java lcm/lcm/MessageAggregator.java" |
3255 | diff --git a/debian/patches/0003-use-gnuinstalldir.patch b/debian/patches/0003-use-gnuinstalldir.patch |
3256 | new file mode 100644 |
3257 | index 0000000..3b5e7e5 |
3258 | --- /dev/null |
3259 | +++ b/debian/patches/0003-use-gnuinstalldir.patch |
3260 | @@ -0,0 +1,102 @@ |
3261 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3262 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3263 | +Subject: Use GNUInstallDirs to fix installation paths |
3264 | +Forwarded: no |
3265 | + |
3266 | +--- |
3267 | +--- a/CMakeLists.txt |
3268 | ++++ b/CMakeLists.txt |
3269 | +@@ -6,6 +6,8 @@ |
3270 | + |
3271 | + project(lcm) |
3272 | + |
3273 | ++include(GNUInstallDirs) |
3274 | ++ |
3275 | + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") |
3276 | + if(CMAKE_VERSION VERSION_LESS 3.7) |
3277 | + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3.7") |
3278 | +--- a/lcm-logger/CMakeLists.txt |
3279 | ++++ b/lcm-logger/CMakeLists.txt |
3280 | +@@ -7,11 +7,11 @@ |
3281 | + install(TARGETS |
3282 | + lcm-logger |
3283 | + lcm-logplayer |
3284 | +- DESTINATION bin |
3285 | ++ DESTINATION ${CMAKE_INSTALL_BINDIR} |
3286 | + ) |
3287 | + |
3288 | + install(FILES |
3289 | + lcm-logger.1 |
3290 | + lcm-logplayer.1 |
3291 | +- DESTINATION share/man/man1 |
3292 | ++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 |
3293 | + ) |
3294 | +--- a/lcm-pkgconfig/CMakeLists.txt |
3295 | ++++ b/lcm-pkgconfig/CMakeLists.txt |
3296 | +@@ -2,7 +2,7 @@ |
3297 | + |
3298 | + configure_file(lcm.pc.in ${lcm_BINARY_DIR}/lcm.pc @ONLY) |
3299 | + install(FILES ${lcm_BINARY_DIR}/lcm.pc |
3300 | +- DESTINATION lib${LIB_SUFFIX}/pkgconfig) |
3301 | ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/pkgconfig) |
3302 | + |
3303 | + if(LCM_ENABLE_JAVA) |
3304 | + configure_file(lcm-java.pc.in ${lcm_BINARY_DIR}/lcm-java.pc @ONLY) |
3305 | +--- a/lcm/CMakeLists.txt |
3306 | ++++ b/lcm/CMakeLists.txt |
3307 | +@@ -83,9 +83,9 @@ |
3308 | + |
3309 | + install(TARGETS lcm-coretypes lcm-static lcm |
3310 | + EXPORT lcmTargets |
3311 | +- RUNTIME DESTINATION bin |
3312 | +- LIBRARY DESTINATION lib${LIB_SUFFIX} |
3313 | +- ARCHIVE DESTINATION lib${LIB_SUFFIX} |
3314 | +- PUBLIC_HEADER DESTINATION include/lcm |
3315 | +- INCLUDES DESTINATION include |
3316 | ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
3317 | ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} |
3318 | ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} |
3319 | ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lcm |
3320 | ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
3321 | + ) |
3322 | +--- a/lcmgen/CMakeLists.txt |
3323 | ++++ b/lcmgen/CMakeLists.txt |
3324 | +@@ -47,7 +47,7 @@ |
3325 | + |
3326 | + install(TARGETS lcm-gen |
3327 | + EXPORT lcmTargets |
3328 | +- RUNTIME DESTINATION bin |
3329 | ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
3330 | + ) |
3331 | + |
3332 | +-install(FILES lcm-gen.1 DESTINATION share/man/man1) |
3333 | ++install(FILES lcm-gen.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
3334 | +--- a/liblcm-test/CMakeLists.txt |
3335 | ++++ b/liblcm-test/CMakeLists.txt |
3336 | +@@ -31,7 +31,7 @@ |
3337 | + lcm-tester |
3338 | + lcm-example |
3339 | + lcm-logfilter |
3340 | +- DESTINATION bin |
3341 | ++ DESTINATION ${CMAKE_INSTALL_BINDIR} |
3342 | + ) |
3343 | + |
3344 | + install(FILES |
3345 | +@@ -39,5 +39,5 @@ |
3346 | + lcm-sink.1 |
3347 | + lcm-source.1 |
3348 | + lcm-tester.1 |
3349 | +- DESTINATION share/man/man1 |
3350 | ++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 |
3351 | + ) |
3352 | +--- a/lcm-cmake/install.cmake |
3353 | ++++ b/lcm-cmake/install.cmake |
3354 | +@@ -3,7 +3,7 @@ |
3355 | + if(WIN32) |
3356 | + set(CONFIG_INSTALL_DIR CMake) |
3357 | + else() |
3358 | +- set(CONFIG_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/cmake) |
3359 | ++ set(CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/${PROJECT_NAME}/cmake) |
3360 | + endif() |
3361 | + |
3362 | + # Java exported targets (note: must precede configure_package_config_file) |
3363 | diff --git a/debian/patches/0004-doxygen-docs-go-to-a-subdir.patch b/debian/patches/0004-doxygen-docs-go-to-a-subdir.patch |
3364 | deleted file mode 100644 |
3365 | index 531a392..0000000 |
3366 | --- a/debian/patches/0004-doxygen-docs-go-to-a-subdir.patch |
3367 | +++ /dev/null |
3368 | @@ -1,34 +0,0 @@ |
3369 | -From: Dima Kogan <dima@secretsauce.net> |
3370 | -Date: Sun, 9 Oct 2016 14:34:18 -0700 |
3371 | -Subject: doxygen docs go to a subdir |
3372 | - |
3373 | ---- |
3374 | - docs/Doxyfile | 2 +- |
3375 | - docs/build-docs.sh | 1 + |
3376 | - 2 files changed, 2 insertions(+), 1 deletion(-) |
3377 | - |
3378 | -diff --git a/docs/Doxyfile b/docs/Doxyfile |
3379 | -index 862a0a1..8665911 100644 |
3380 | ---- a/docs/Doxyfile |
3381 | -+++ b/docs/Doxyfile |
3382 | -@@ -23,7 +23,7 @@ |
3383 | - DOXYFILE_ENCODING = UTF-8 |
3384 | - PROJECT_NAME = LCM |
3385 | - PROJECT_NUMBER = |
3386 | --OUTPUT_DIRECTORY = |
3387 | -+OUTPUT_DIRECTORY = html/general |
3388 | - CREATE_SUBDIRS = NO |
3389 | - OUTPUT_LANGUAGE = English |
3390 | - BRIEF_MEMBER_DESC = YES |
3391 | -diff --git a/docs/build-docs.sh b/docs/build-docs.sh |
3392 | -index 3527ca9..f42c21c 100755 |
3393 | ---- a/docs/build-docs.sh |
3394 | -+++ b/docs/build-docs.sh |
3395 | -@@ -2,6 +2,7 @@ |
3396 | - |
3397 | - rm -rf html |
3398 | - mkdir -p html/python |
3399 | -+mkdir -p html/general |
3400 | - |
3401 | - # Python |
3402 | - pyver=$(python -c "import platform; print platform.python_version()[:3]") |
3403 | diff --git a/debian/patches/0004-use-offline-javadoc-links.patch b/debian/patches/0004-use-offline-javadoc-links.patch |
3404 | new file mode 100644 |
3405 | index 0000000..d89377e |
3406 | --- /dev/null |
3407 | +++ b/debian/patches/0004-use-offline-javadoc-links.patch |
3408 | @@ -0,0 +1,30 @@ |
3409 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3410 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3411 | +Subject: Use file system jdk-docs to avoid test failures |
3412 | + Testing suite is being run without network on |
3413 | + Debian. It was broken trying to access to |
3414 | + java.sun.com. Instead of that change to use filesystem |
3415 | + docs installed. |
3416 | +Forwarded: not-needed |
3417 | + |
3418 | +--- |
3419 | +--- a/lcm-java/make-javadocs.sh |
3420 | ++++ b/lcm-java/make-javadocs.sh |
3421 | +@@ -7,5 +7,5 @@ |
3422 | + CLASSES="lcm/lcm/LCM.java lcm/logging/Log.java lcm/lcm/LCMSubscriber.java lcm/lcm/LCMEncodable.java lcm/lcm/MessageAggregator.java lcm/lcm/LCMDataInputStream.java lcm/lcm/LCMDataOutputStream.java" |
3423 | + |
3424 | + mkdir javadocs |
3425 | +-javadoc -d javadocs -link http://java.sun.com/j2se/1.5.0/docs/api $CLASSES |
3426 | ++javadoc -d javadocs -link /usr/share/doc/default-jdk-doc/api/ $CLASSES |
3427 | + #javadoc -d javadocs -sourcepath . -subpackages lcm |
3428 | +--- a/lcm-java/CMakeLists.txt |
3429 | ++++ b/lcm-java/CMakeLists.txt |
3430 | +@@ -106,7 +106,7 @@ |
3431 | + add_custom_target(doc-java |
3432 | + COMMAND ${Java_JAVADOC_EXECUTABLE} |
3433 | + -d ${lcm_BINARY_DIR}/docs/_build/javadocs |
3434 | +- -link http://docs.oracle.com/javase/8/docs/api/ |
3435 | ++ -link /usr/share/doc/default-jdk-doc/api/ |
3436 | + ${lcm_java_doc_classes} |
3437 | + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
3438 | + DEPENDS doc-setup doc-sphinx) |
3439 | diff --git a/debian/patches/0005-I-default-to-java-1.6-instead-of-1.5.patch b/debian/patches/0005-I-default-to-java-1.6-instead-of-1.5.patch |
3440 | deleted file mode 100644 |
3441 | index 82cf983..0000000 |
3442 | --- a/debian/patches/0005-I-default-to-java-1.6-instead-of-1.5.patch |
3443 | +++ /dev/null |
3444 | @@ -1,60 +0,0 @@ |
3445 | -From: Dima Kogan <dima@secretsauce.net> |
3446 | -Date: Sat, 31 Mar 2018 01:36:02 -0700 |
3447 | -Subject: I default to java 1.6 instead of 1.5 |
3448 | - |
3449 | ---- |
3450 | - docs/build-docs.sh | 2 +- |
3451 | - lcm-java/Makefile.am | 2 +- |
3452 | - lcm-java/build.xml | 2 +- |
3453 | - lcm-java/make-javadocs.sh | 2 +- |
3454 | - 4 files changed, 4 insertions(+), 4 deletions(-) |
3455 | - |
3456 | -diff --git a/docs/build-docs.sh b/docs/build-docs.sh |
3457 | -index f42c21c..32f9dfe 100755 |
3458 | ---- a/docs/build-docs.sh |
3459 | -+++ b/docs/build-docs.sh |
3460 | -@@ -11,7 +11,7 @@ LD_LIBRARY_PATH=$PWD/../debian/tmp/usr/lib/`dpkg-architecture -qDEB_HOST_GNU_TYP |
3461 | - cd ../lcm-java |
3462 | - CLASSES="lcm/lcm/LCM.java lcm/logging/Log.java lcm/lcm/LCMSubscriber.java lcm/lcm/LCMEncodable.java lcm/lcm/MessageAggregator.java" |
3463 | - |
3464 | --javadoc -d ../docs/html/javadocs -link http://java.sun.com/j2se/1.5.0/docs/api $CLASSES |
3465 | -+javadoc -d ../docs/html/javadocs -link https://docs.oracle.com/javase/6/docs/api/index.html $CLASSES |
3466 | - |
3467 | - # Doxygen |
3468 | - cd ../docs |
3469 | -diff --git a/lcm-java/Makefile.am b/lcm-java/Makefile.am |
3470 | -index 2934699..779831e 100644 |
3471 | ---- a/lcm-java/Makefile.am |
3472 | -+++ b/lcm-java/Makefile.am |
3473 | -@@ -1,6 +1,6 @@ |
3474 | - JAVAROOT = $(abs_builddir)/build |
3475 | - JARFILE = lcm.jar |
3476 | --JAVACFLAGS = -source 1.5 -target 1.5 -classpath /usr/share/java/jchart2d.jar |
3477 | -+JAVACFLAGS = -source 8 -target 8 -classpath /usr/share/java/jchart2d.jar |
3478 | - |
3479 | - .PHONY classfiles: classdist_noinst.stamp classnoinst.stamp |
3480 | - |
3481 | -diff --git a/lcm-java/build.xml b/lcm-java/build.xml |
3482 | -index bedce46..a5db195 100644 |
3483 | ---- a/lcm-java/build.xml |
3484 | -+++ b/lcm-java/build.xml |
3485 | -@@ -36,7 +36,7 @@ |
3486 | - debug="on" |
3487 | - optimize="off" |
3488 | - destdir="build" |
3489 | -- source="1.5"> |
3490 | -+ source="1.6"> |
3491 | - </javac> |
3492 | - </target> |
3493 | - |
3494 | -diff --git a/lcm-java/make-javadocs.sh b/lcm-java/make-javadocs.sh |
3495 | -index e772e5e..43e756b 100755 |
3496 | ---- a/lcm-java/make-javadocs.sh |
3497 | -+++ b/lcm-java/make-javadocs.sh |
3498 | -@@ -7,5 +7,5 @@ fi |
3499 | - CLASSES="lcm/lcm/LCM.java lcm/logging/Log.java lcm/lcm/LCMSubscriber.java lcm/lcm/LCMEncodable.java lcm/lcm/MessageAggregator.java lcm/lcm/LCMDataInputStream.java lcm/lcm/LCMDataOutputStream.java" |
3500 | - |
3501 | - mkdir javadocs |
3502 | --javadoc -d javadocs -link http://java.sun.com/j2se/1.5.0/docs/api $CLASSES |
3503 | -+javadoc -d javadocs -link https://docs.oracle.com/javase/6/docs/api/index.html $CLASSES |
3504 | - #javadoc -d javadocs -sourcepath . -subpackages lcm |
3505 | diff --git a/debian/patches/0005-use-java-system-dependencies.patch b/debian/patches/0005-use-java-system-dependencies.patch |
3506 | new file mode 100644 |
3507 | index 0000000..1ed782d |
3508 | --- /dev/null |
3509 | +++ b/debian/patches/0005-use-java-system-dependencies.patch |
3510 | @@ -0,0 +1,56 @@ |
3511 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3512 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3513 | +Subject: Do not use embedded copies of dependencies |
3514 | + Replace jchart2d, hamcrest-core and junit4 by |
3515 | + system dependencies. |
3516 | +Forwarded: not-needed |
3517 | + |
3518 | +--- |
3519 | +--- a/lcm-java/CMakeLists.txt |
3520 | ++++ b/lcm-java/CMakeLists.txt |
3521 | +@@ -21,8 +21,6 @@ |
3522 | + endif() |
3523 | + endif() |
3524 | + |
3525 | +-add_subdirectory(jchart2d-code) |
3526 | +- |
3527 | + set(lcm_java_sources |
3528 | + lcm/util/JImage.java |
3529 | + lcm/util/TableSorter.java |
3530 | +@@ -59,7 +57,7 @@ |
3531 | + ) |
3532 | + |
3533 | + add_jar(lcm-java |
3534 | +- INCLUDE_JARS jchart2d |
3535 | ++ INCLUDE_JARS /usr/share/java/jchart2d.jar |
3536 | + SOURCES ${lcm_java_sources} |
3537 | + OUTPUT_NAME lcm |
3538 | + ) |
3539 | +--- a/lcm-java/lcm-spy.sh.in |
3540 | ++++ b/lcm-java/lcm-spy.sh.in |
3541 | +@@ -9,11 +9,11 @@ |
3542 | + # Find dependency JARs |
3543 | + if [ -e "$mydir/lcm.jar" ]; then |
3544 | + jars="$mydir/lcm.jar" |
3545 | +- jars="$jars:$mydir/jchart2d-code/jchart2d-3.2.2.jar" |
3546 | ++ jars="$jars:/usr/share/java/jchart2d-3.2.2.jar" |
3547 | + ext="$mydir/jchart2d-code/ext" |
3548 | + elif [ -e "$mydir/../share/java/lcm.jar" ]; then |
3549 | + jars="$mydir/../share/java/lcm.jar" |
3550 | +- jars="$jars:$mydir/../share/java/jchart2d-3.2.2.jar" |
3551 | ++ jars="$jars:/usr/share/java/jchart2d-3.2.2.jar" |
3552 | + ext="$mydir/../share/java" |
3553 | + else |
3554 | + echo "Unable to find 'lcm.jar'; please check your installation" >&2 |
3555 | +--- a/test/java/CMakeLists.txt |
3556 | ++++ b/test/java/CMakeLists.txt |
3557 | +@@ -1,7 +1,7 @@ |
3558 | + include(UseJava) |
3559 | + |
3560 | +-set(hamcrest-core_JAR ${CMAKE_CURRENT_SOURCE_DIR}/hamcrest-core-1.3.jar) |
3561 | +-set(junit_JAR ${CMAKE_CURRENT_SOURCE_DIR}/junit-4.11.jar) |
3562 | ++set(hamcrest-core_JAR /usr/share/java/hamcrest-core.jar) |
3563 | ++set(junit_JAR /usr/share/java/junit4.jar) |
3564 | + |
3565 | + add_jar(lcm-test-java |
3566 | + OUTPUT_NAME lcm-test |
3567 | diff --git a/debian/patches/0006-use-getst-system-test.patch b/debian/patches/0006-use-getst-system-test.patch |
3568 | new file mode 100644 |
3569 | index 0000000..25ac1ad |
3570 | --- /dev/null |
3571 | +++ b/debian/patches/0006-use-getst-system-test.patch |
3572 | @@ -0,0 +1,22 @@ |
3573 | +From: Jose Luis Rivero <jrivero@openrobotics.org> |
3574 | +Date: Sat 03 Feb 2024 07:14:26 +0200 |
3575 | +Subject: Use gtest from system files |
3576 | +Forwarded: not-needed |
3577 | + |
3578 | +--- |
3579 | +--- a/test/CMakeLists.txt |
3580 | ++++ b/test/CMakeLists.txt |
3581 | +@@ -1,7 +1,12 @@ |
3582 | +-add_subdirectory(gtest) |
3583 | +- |
3584 | + add_subdirectory(types) |
3585 | + |
3586 | ++add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc) |
3587 | ++add_library(gtest_main STATIC /usr/src/gtest/src/gtest_main.cc) |
3588 | ++target_include_directories(gtest PRIVATE |
3589 | ++ $<BUILD_INTERFACE:/usr/src/gtest>) |
3590 | ++target_include_directories(gtest_main PRIVATE |
3591 | ++ $<BUILD_INTERFACE:/usr/src/gtest>) |
3592 | ++ |
3593 | + add_subdirectory(c) |
3594 | + add_subdirectory(cpp) |
3595 | diff --git a/debian/patches/move-quotes-patch.patch b/debian/patches/move-quotes-patch.patch |
3596 | new file mode 100644 |
3597 | index 0000000..7e79db9 |
3598 | --- /dev/null |
3599 | +++ b/debian/patches/move-quotes-patch.patch |
3600 | @@ -0,0 +1,15 @@ |
3601 | +From: Vladimir Petko |
3602 | +Subject: Avod to interpreting quoted PYTHONPATH as a command |
3603 | +Last-update: 04-07-2024 |
3604 | +--- |
3605 | +--- a/docs/CMakeLists.txt |
3606 | ++++ b/docs/CMakeLists.txt |
3607 | +@@ -52,7 +52,7 @@ |
3608 | + endif() |
3609 | + |
3610 | + add_custom_target(doc-sphinx |
3611 | +- COMMAND "PYTHONPATH=${CMAKE_BINARY_DIR}/python" ${SPHINX_EXECUTABLE} ${lcm_SOURCE_DIR}/docs ${lcm_BINARY_DIR}/docs/_build |
3612 | ++ COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_BINARY_DIR}/python" ${SPHINX_EXECUTABLE} ${lcm_SOURCE_DIR}/docs ${lcm_BINARY_DIR}/docs/_build |
3613 | + WORKING_DIRECTORY ${lcm_SOURCE_DIR}/docs |
3614 | + DEPENDS doc-setup lcm-python lcm-python-init) |
3615 | + |
3616 | diff --git a/debian/patches/remove-epydoc b/debian/patches/remove-epydoc |
3617 | deleted file mode 100644 |
3618 | index 5d2f145..0000000 |
3619 | --- a/debian/patches/remove-epydoc |
3620 | +++ /dev/null |
3621 | @@ -1,23 +0,0 @@ |
3622 | -Description: Remove dependency on epydoc |
3623 | -Author: Kenneth J. Pronovici <pronovic@debian.org> |
3624 | -Bug-Debian: https://bugs.debian.org/881547 |
3625 | ---- lcm-1.3.1+repack1.orig/docs/build-docs.sh |
3626 | -+++ lcm-1.3.1+repack1/docs/build-docs.sh |
3627 | -@@ -1,12 +1,14 @@ |
3628 | - #!/bin/sh |
3629 | - |
3630 | - rm -rf html |
3631 | --mkdir -p html/python |
3632 | -+#mkdir -p html/python |
3633 | - mkdir -p html/general |
3634 | - |
3635 | - # Python |
3636 | --pyver=$(python -c "import platform; print platform.python_version()[:3]") |
3637 | --LD_LIBRARY_PATH=$PWD/../debian/tmp/usr/lib/`dpkg-architecture -qDEB_HOST_GNU_TYPE` PYTHONPATH=../debian/tmp/usr/lib/python${pyver}/dist-packages/:$PYTHONPATH epydoc --config epydoc.cfg |
3638 | -+# These docs can no longer be generated in Debian because epydoc has been removed |
3639 | -+#pyver=$(python -c "import platform; print platform.python_version()[:3]") |
3640 | -+#LD_LIBRARY_PATH=$PWD/../debian/tmp/usr/lib/`dpkg-architecture -qDEB_HOST_GNU_TYPE` PYTHONPATH=../debian/tmp/usr/lib/python${pyver}/dist-packages/:$PYTHONPATH epydoc --config epydoc.cfg |
3641 | -+ |
3642 | - # Java |
3643 | - cd ../lcm-java |
3644 | - CLASSES="lcm/lcm/LCM.java lcm/logging/Log.java lcm/lcm/LCMSubscriber.java lcm/lcm/LCMEncodable.java lcm/lcm/MessageAggregator.java" |
3645 | diff --git a/debian/patches/series b/debian/patches/series |
3646 | index 4cdcc41..9653373 100644 |
3647 | --- a/debian/patches/series |
3648 | +++ b/debian/patches/series |
3649 | @@ -1,6 +1,7 @@ |
3650 | -0001-I-use-the-java-dependencies-from-the-system.patch |
3651 | -0002-Not-building-docs-for-.NET.patch |
3652 | -0003-Python-docs-are-now-built-using-the-already-built-py.patch |
3653 | -0004-doxygen-docs-go-to-a-subdir.patch |
3654 | -0005-I-default-to-java-1.6-instead-of-1.5.patch |
3655 | -remove-epydoc |
3656 | +0001-fix-manpages-name.patch |
3657 | +0002-encode-utf8-java-chars.patch |
3658 | +0003-use-gnuinstalldir.patch |
3659 | +0004-use-offline-javadoc-links.patch |
3660 | +0005-use-java-system-dependencies.patch |
3661 | +0006-use-getst-system-test.patch |
3662 | +move-quotes-patch.patch |
3663 | diff --git a/debian/python3-lcm.install b/debian/python3-lcm.install |
3664 | new file mode 100644 |
3665 | index 0000000..4dd56cf |
3666 | --- /dev/null |
3667 | +++ b/debian/python3-lcm.install |
3668 | @@ -0,0 +1 @@ |
3669 | +usr/lib/python3/dist-packages/lcm |
3670 | diff --git a/debian/rules b/debian/rules |
3671 | index 9585850..2880d1b 100755 |
3672 | --- a/debian/rules |
3673 | +++ b/debian/rules |
3674 | @@ -1,24 +1,32 @@ |
3675 | #!/usr/bin/make -f |
3676 | |
3677 | +include /usr/share/java/java_defaults.mk |
3678 | + |
3679 | +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow |
3680 | +export PYBUILD_SYSTEM=cmake |
3681 | +export PYBUILD_CONFIGURE_ARGS=-DLCM_JAVA_TARGET_VERSION=$(java_compat_level) \ |
3682 | + -DCMAKE_JAVA_COMPILE_FLAGS=-g |
3683 | + |
3684 | %: |
3685 | - dh $@ |
3686 | + dh $@ --with=sphinxdoc --with=javahelper --buildsystem=pybuild |
3687 | |
3688 | -override_dh_auto_build: |
3689 | - dh_auto_build |
3690 | +execute_after_dh_auto_build-indep: |
3691 | + $(MAKE) -C `pybuild --print build_dir --interpreter python3` doc |
3692 | + $(RM) -fr `pybuild --print build_dir --interpreter python3`/docs/_build/.doctrees |
3693 | |
3694 | -override_dh_auto_install: |
3695 | - dh_auto_install |
3696 | - find debian/tmp -name '*.la' -delete |
3697 | +# Tests exercise the passing of messages and are broken if |
3698 | +# several of them are run in parallel |
3699 | +override_dh_auto_test: |
3700 | + PYBUILD_SYSTEM=custom \ |
3701 | + PYBUILD_TEST_ARGS="dh_auto_test --no-parallel --buildsystem=cmake --builddirectory={build_dir}" dh_auto_test |
3702 | |
3703 | -# I build the docs after the 'make install' because the python docs require an installed lcm |
3704 | - cd docs; ./build-docs.sh |
3705 | +# Leave the pkg-config file in the java package |
3706 | +execute_after_dh_install: |
3707 | + $(RM) debian/liblcm-java/usr/lib/pkgconfig/lcm-java.pc |
3708 | |
3709 | -override_dh_installdocs: |
3710 | - dh_installdocs |
3711 | - # Remove example makefile which contains build paths and |
3712 | - # binary paths |
3713 | - rm -vf debian/liblcm-doc/usr/share/doc/liblcm-dev/examples/Makefile |
3714 | +execute_after_dh_installdocs: |
3715 | + $(RM) debian/liblcm-doc/usr/share/doc/liblcm-dev/examples/.gitignore |
3716 | |
3717 | override_dh_auto_clean: |
3718 | dh_auto_clean |
3719 | - rm -rf docs/html |
3720 | + rm -rf docs/_build |
3721 | diff --git a/debian/tests/build-cpp-example b/debian/tests/build-cpp-example |
3722 | new file mode 100755 |
3723 | index 0000000..70b90d3 |
3724 | --- /dev/null |
3725 | +++ b/debian/tests/build-cpp-example |
3726 | @@ -0,0 +1,12 @@ |
3727 | +#!/bin/bash |
3728 | +# (C) 2024 Jose Luis Rivero |
3729 | +# Author: Jose Luis Rivero <jrivero@osrfoundation.org> |
3730 | + |
3731 | +set -e |
3732 | + |
3733 | +cd "${AUTOPKGTEST_TMP}" |
3734 | + |
3735 | +cp -a /usr/share/doc/liblcm-dev/examples/ . |
3736 | +cd examples/cpp |
3737 | +cmake -S . -B build |
3738 | +cmake --build build |
3739 | diff --git a/debian/tests/control b/debian/tests/control |
3740 | new file mode 100644 |
3741 | index 0000000..6580210 |
3742 | --- /dev/null |
3743 | +++ b/debian/tests/control |
3744 | @@ -0,0 +1,7 @@ |
3745 | +Tests: install |
3746 | +Depends: liblcm-bin |
3747 | +Restrictions: allow-stderr, superficial |
3748 | + |
3749 | +Tests: build-cpp-example |
3750 | +Depends: cmake, build-essential, liblcm-doc, liblcm-dev |
3751 | +Restrictions: allow-stderr, superficial |
3752 | diff --git a/debian/tests/install b/debian/tests/install |
3753 | new file mode 100755 |
3754 | index 0000000..06f380c |
3755 | --- /dev/null |
3756 | +++ b/debian/tests/install |
3757 | @@ -0,0 +1,22 @@ |
3758 | +#!/bin/bash |
3759 | +# (C) 2024 Jose Luis Rivero |
3760 | +# Author: Jose Luis Rivero <jrivero@osrfoundation.org> |
3761 | + |
3762 | +set -ex |
3763 | + |
3764 | +WORKDIR=$(mktemp -d) |
3765 | +trap 'rm -rf $WORKDIR' 0 INT QUIT ABRT PIPE TERM |
3766 | +cd "$WORKDIR" |
3767 | + |
3768 | +# Useful to check that binaries built with dynamic languages |
3769 | +# are able to load everything fine. |
3770 | +for binary in lcm-gen \ |
3771 | + lcm-logfilter \ |
3772 | + lcm-logger \ |
3773 | + lcm-logplayer \ |
3774 | + lcm-logplayer-gui \ |
3775 | + lcm-source \ |
3776 | + lcm-spy; do |
3777 | + ${binary} -h || true |
3778 | + ${binary} -h 2>&1 | grep -i "usage: lcm" |
3779 | +done |
3780 | diff --git a/debian/watch b/debian/watch |
3781 | index 4c48490..36af17e 100644 |
3782 | --- a/debian/watch |
3783 | +++ b/debian/watch |
3784 | @@ -1,3 +1,7 @@ |
3785 | -version = 3 |
3786 | -opts=dversionmangle=s/\+repack.*$// \ |
3787 | - https://github.com/lcm-proj/lcm/tags .*/lcm/archive/v(\d[\d\.]+).tar.gz |
3788 | +version=4 |
3789 | +opts="searchmode=plain,\ |
3790 | +repacksuffix=~repack1,\ |
3791 | +dversionmangle=s/\~repack\d//,\ |
3792 | +filenamemangle=s%.*/v?@ANY_VERSION@%@PACKAGE@-$1.tar.xz%" \ |
3793 | +https://api.github.com/repos/lcm-proj/lcm/releases?per_page=50 \ |
3794 | +https://api.github.com/repos/[^/]+/[^/]+/tarball/v?@ANY_VERSION@ |
3795 | diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora |
3796 | new file mode 100644 |
3797 | index 0000000..c60a998 |
3798 | --- /dev/null |
3799 | +++ b/docker/Dockerfile.fedora |
3800 | @@ -0,0 +1,18 @@ |
3801 | +FROM fedora:37 |
3802 | + |
3803 | +# cmake3: To build LCM |
3804 | +# clang: For compiling code with Clang |
3805 | +# glib2-devel: A dependency of LCM |
3806 | +# java-17-openjdk-devel: Latest LTS release of Java for building lcm-spy, lcm-logplayer-gui, etc. |
3807 | +# python3-devel: Support library to compile the Python Extension Module |
3808 | +RUN dnf install -y \ |
3809 | + cmake3 \ |
3810 | + clang \ |
3811 | + glib2-devel \ |
3812 | + java-17-openjdk-devel \ |
3813 | + python3-devel |
3814 | + |
3815 | +WORKDIR /work |
3816 | + |
3817 | +# Necessary to encode certain characters when compiling the Java code. |
3818 | +ENV LANG=C.UTF-8 |
3819 | diff --git a/docs/.gitignore b/docs/.gitignore |
3820 | deleted file mode 100644 |
3821 | index 29544da..0000000 |
3822 | --- a/docs/.gitignore |
3823 | +++ /dev/null |
3824 | @@ -1 +0,0 @@ |
3825 | -doxygen_sqlite3.db |
3826 | diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt |
3827 | new file mode 100644 |
3828 | index 0000000..5d8f6a9 |
3829 | --- /dev/null |
3830 | +++ b/docs/CMakeLists.txt |
3831 | @@ -0,0 +1,59 @@ |
3832 | +add_custom_target(doc) |
3833 | + |
3834 | +find_program(DOXYGEN_EXECUTABLE doxygen) |
3835 | +if(NOT DOXYGEN_EXECUTABLE) |
3836 | + message(WARNING |
3837 | + "Doxygen was not found; documentation generation will be incomplete") |
3838 | + return() |
3839 | +endif() |
3840 | + |
3841 | +set(BUILD_DIR ${lcm_BINARY_DIR}) |
3842 | + |
3843 | +configure_file( |
3844 | + ${lcm_SOURCE_DIR}/docs/Doxyfile.in |
3845 | + ${lcm_BINARY_DIR}/docs/Doxyfile |
3846 | + @ONLY) |
3847 | + |
3848 | +configure_file( |
3849 | + ${lcm_SOURCE_DIR}/lcm-dotnet/Doxyfile.in |
3850 | + ${lcm_BINARY_DIR}/lcm-dotnet/Doxyfile |
3851 | + @ONLY) |
3852 | + |
3853 | +add_custom_target(doc-clean |
3854 | + COMMAND ${CMAKE_COMMAND} -E remove_directory ${lcm_BINARY_DIR}/docs/_build) |
3855 | + |
3856 | +add_custom_target(doc-setup |
3857 | + COMMAND ${CMAKE_COMMAND} -E make_directory ${lcm_BINARY_DIR}/docs/_build/ |
3858 | + DEPENDS doc-clean) |
3859 | + |
3860 | +add_custom_target(doc-doxygen |
3861 | + COMMAND ${CMAKE_COMMAND} -E make_directory ${lcm_BINARY_DIR}/docs/_build/doxygen_output/ |
3862 | + COMMAND ${DOXYGEN_EXECUTABLE} ${lcm_BINARY_DIR}/docs/Doxyfile |
3863 | + COMMAND ${CMAKE_COMMAND} -E copy |
3864 | + ${lcm_SOURCE_DIR}/docs/redirect.html |
3865 | + ${lcm_BINARY_DIR}/docs/_build/doxygen_output/c_cpp/html/index.html |
3866 | + WORKING_DIRECTORY ${lcm_SOURCE_DIR}/docs |
3867 | + DEPENDS doc-setup doc-sphinx) |
3868 | + |
3869 | +add_custom_target(doc-dotnet |
3870 | + COMMAND ${CMAKE_COMMAND} -E make_directory ${lcm_BINARY_DIR}/docs/_build/doxygen_output/ |
3871 | + COMMAND ${DOXYGEN_EXECUTABLE} ${lcm_BINARY_DIR}/lcm-dotnet/Doxyfile |
3872 | + COMMAND ${CMAKE_COMMAND} -E copy |
3873 | + ${lcm_SOURCE_DIR}/docs/redirect.html |
3874 | + ${lcm_BINARY_DIR}/docs/_build/doxygen_output/lcm-dotnet/html/index.html |
3875 | + WORKING_DIRECTORY ${lcm_SOURCE_DIR}/lcm-dotnet |
3876 | + DEPENDS doc-setup doc-doxygen) |
3877 | + |
3878 | +find_program(SPHINX_EXECUTABLE sphinx-build) |
3879 | +if(NOT SPHINX_EXECUTABLE) |
3880 | + message(WARNING |
3881 | + "Sphinx was not found; documentation generation will be incomplete") |
3882 | + return() |
3883 | +endif() |
3884 | + |
3885 | +add_custom_target(doc-sphinx |
3886 | + COMMAND "PYTHONPATH=${CMAKE_BINARY_DIR}/python" ${SPHINX_EXECUTABLE} ${lcm_SOURCE_DIR}/docs ${lcm_BINARY_DIR}/docs/_build |
3887 | + WORKING_DIRECTORY ${lcm_SOURCE_DIR}/docs |
3888 | + DEPENDS doc-setup lcm-python lcm-python-init) |
3889 | + |
3890 | +add_dependencies(doc doc-dotnet doc-doxygen) |
3891 | diff --git a/docs/Doxyfile b/docs/Doxyfile |
3892 | deleted file mode 100644 |
3893 | index 862a0a1..0000000 |
3894 | --- a/docs/Doxyfile |
3895 | +++ /dev/null |
3896 | @@ -1,1238 +0,0 @@ |
3897 | -# Doxyfile 1.6.3 |
3898 | - |
3899 | -# This file describes the settings to be used by the documentation system |
3900 | -# doxygen (www.doxygen.org) for a project |
3901 | -# |
3902 | -# All text after a hash (#) is considered a comment and will be ignored |
3903 | -# The format is: |
3904 | -# TAG = value [value, ...] |
3905 | -# For lists items can also be appended using: |
3906 | -# TAG += value [value, ...] |
3907 | -# Values that contain spaces should be placed between quotes (" ") |
3908 | - |
3909 | -#--------------------------------------------------------------------------- |
3910 | -# Project related configuration options |
3911 | -#--------------------------------------------------------------------------- |
3912 | - |
3913 | -# This tag specifies the encoding used for all characters in the config file |
3914 | -# that follow. The default is UTF-8 which is also the encoding used for all |
3915 | -# text before the first occurrence of this tag. Doxygen uses libiconv (or the |
3916 | -# iconv built into libc) for the transcoding. See |
3917 | -# http://www.gnu.org/software/libiconv for the list of possible encodings. |
3918 | - |
3919 | -DOXYFILE_ENCODING = UTF-8 |
3920 | -PROJECT_NAME = LCM |
3921 | -PROJECT_NUMBER = |
3922 | -OUTPUT_DIRECTORY = |
3923 | -CREATE_SUBDIRS = NO |
3924 | -OUTPUT_LANGUAGE = English |
3925 | -BRIEF_MEMBER_DESC = YES |
3926 | -REPEAT_BRIEF = YES |
3927 | -ABBREVIATE_BRIEF = |
3928 | - |
3929 | -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then |
3930 | -# Doxygen will generate a detailed section even if there is only a brief |
3931 | -# description. |
3932 | - |
3933 | -ALWAYS_DETAILED_SEC = NO |
3934 | - |
3935 | -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all |
3936 | -# inherited members of a class in the documentation of that class as if those |
3937 | -# members were ordinary class members. Constructors, destructors and assignment |
3938 | -# operators of the base classes will not be shown. |
3939 | - |
3940 | -INLINE_INHERITED_MEMB = NO |
3941 | - |
3942 | -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full |
3943 | -# path before files name in the file list and in the header files. If set |
3944 | -# to NO the shortest path that makes the file name unique will be used. |
3945 | - |
3946 | -FULL_PATH_NAMES = NO |
3947 | - |
3948 | -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag |
3949 | -# can be used to strip a user-defined part of the path. Stripping is |
3950 | -# only done if one of the specified strings matches the left-hand part of |
3951 | -# the path. The tag can be used to show relative paths in the file list. |
3952 | -# If left blank the directory from which doxygen is run is used as the |
3953 | -# path to strip. |
3954 | - |
3955 | -STRIP_FROM_PATH = |
3956 | - |
3957 | -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of |
3958 | -# the path mentioned in the documentation of a class, which tells |
3959 | -# the reader which header file to include in order to use a class. |
3960 | -# If left blank only the name of the header file containing the class |
3961 | -# definition is used. Otherwise one should specify the include paths that |
3962 | -# are normally passed to the compiler using the -I flag. |
3963 | - |
3964 | -STRIP_FROM_INC_PATH = |
3965 | -SHORT_NAMES = NO |
3966 | -JAVADOC_AUTOBRIEF = NO |
3967 | -QT_AUTOBRIEF = NO |
3968 | -MULTILINE_CPP_IS_BRIEF = NO |
3969 | -INHERIT_DOCS = YES |
3970 | -SEPARATE_MEMBER_PAGES = NO |
3971 | - |
3972 | -# The TAB_SIZE tag can be used to set the number of spaces in a tab. |
3973 | -# Doxygen uses this value to replace tabs by spaces in code fragments. |
3974 | - |
3975 | -TAB_SIZE = 4 |
3976 | - |
3977 | -# This tag can be used to specify a number of aliases that acts |
3978 | -# as commands in the documentation. An alias has the form "name=value". |
3979 | -# For example adding "sideeffect=\par Side Effects:\n" will allow you to |
3980 | -# put the command \sideeffect (or @sideeffect) in the documentation, which |
3981 | -# will result in a user-defined paragraph with heading "Side Effects:". |
3982 | -# You can put \n's in the value part of an alias to insert newlines. |
3983 | - |
3984 | -ALIASES = |
3985 | -OPTIMIZE_OUTPUT_FOR_C = NO |
3986 | -OPTIMIZE_OUTPUT_JAVA = NO |
3987 | -OPTIMIZE_FOR_FORTRAN = NO |
3988 | -OPTIMIZE_OUTPUT_VHDL = NO |
3989 | -EXTENSION_MAPPING = |
3990 | -BUILTIN_STL_SUPPORT = NO |
3991 | -CPP_CLI_SUPPORT = NO |
3992 | -SIP_SUPPORT = NO |
3993 | -IDL_PROPERTY_SUPPORT = YES |
3994 | -DISTRIBUTE_GROUP_DOC = NO |
3995 | -SUBGROUPING = YES |
3996 | -TYPEDEF_HIDES_STRUCT = YES |
3997 | -SYMBOL_CACHE_SIZE = 0 |
3998 | - |
3999 | -#--------------------------------------------------------------------------- |
4000 | -# Build related configuration options |
4001 | -#--------------------------------------------------------------------------- |
4002 | - |
4003 | -EXTRACT_ALL = NO |
4004 | -EXTRACT_PRIVATE = NO |
4005 | -EXTRACT_STATIC = YES |
4006 | -EXTRACT_LOCAL_CLASSES = YES |
4007 | -EXTRACT_LOCAL_METHODS = NO |
4008 | -EXTRACT_ANON_NSPACES = NO |
4009 | - |
4010 | -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all |
4011 | -# undocumented members of documented classes, files or namespaces. |
4012 | -# If set to NO (the default) these members will be included in the |
4013 | -# various overviews, but no documentation section is generated. |
4014 | -# This option has no effect if EXTRACT_ALL is enabled. |
4015 | - |
4016 | -HIDE_UNDOC_MEMBERS = NO |
4017 | -HIDE_UNDOC_CLASSES = NO |
4018 | -HIDE_FRIEND_COMPOUNDS = NO |
4019 | -HIDE_IN_BODY_DOCS = NO |
4020 | - |
4021 | -# The INTERNAL_DOCS tag determines if documentation |
4022 | -# that is typed after a \internal command is included. If the tag is set |
4023 | -# to NO (the default) then the documentation will be excluded. |
4024 | -# Set it to YES to include the internal documentation. |
4025 | - |
4026 | -INTERNAL_DOCS = NO |
4027 | -CASE_SENSE_NAMES = YES |
4028 | -HIDE_SCOPE_NAMES = NO |
4029 | -SHOW_INCLUDE_FILES = YES |
4030 | -FORCE_LOCAL_INCLUDES = NO |
4031 | -INLINE_INFO = YES |
4032 | -SORT_MEMBER_DOCS = YES |
4033 | -SORT_BRIEF_DOCS = NO |
4034 | -SORT_MEMBERS_CTORS_1ST = NO |
4035 | -SORT_GROUP_NAMES = YES |
4036 | -SORT_BY_SCOPE_NAME = NO |
4037 | - |
4038 | -# The GENERATE_TODOLIST tag can be used to enable (YES) or |
4039 | -# disable (NO) the todo list. This list is created by putting \todo |
4040 | -# commands in the documentation. |
4041 | - |
4042 | -GENERATE_TODOLIST = YES |
4043 | -GENERATE_TESTLIST = YES |
4044 | -GENERATE_BUGLIST = YES |
4045 | - |
4046 | -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or |
4047 | -# disable (NO) the deprecated list. This list is created by putting |
4048 | -# \deprecated commands in the documentation. |
4049 | - |
4050 | -GENERATE_DEPRECATEDLIST= YES |
4051 | - |
4052 | -# The ENABLED_SECTIONS tag can be used to enable conditional |
4053 | -# documentation sections, marked by \if sectionname ... \endif. |
4054 | - |
4055 | -ENABLED_SECTIONS = |
4056 | - |
4057 | -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines |
4058 | -# the initial value of a variable or define consists of for it to appear in |
4059 | -# the documentation. If the initializer consists of more lines than specified |
4060 | -# here it will be hidden. Use a value of 0 to hide initializers completely. |
4061 | -# The appearance of the initializer of individual variables and defines in the |
4062 | -# documentation can be controlled using \showinitializer or \hideinitializer |
4063 | -# command in the documentation regardless of this setting. |
4064 | - |
4065 | -MAX_INITIALIZER_LINES = 30 |
4066 | - |
4067 | -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated |
4068 | -# at the bottom of the documentation of classes and structs. If set to YES the |
4069 | -# list will mention the files that were used to generate the documentation. |
4070 | - |
4071 | -SHOW_USED_FILES = YES |
4072 | - |
4073 | -# If the sources in your project are distributed over multiple directories |
4074 | -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy |
4075 | -# in the documentation. The default is NO. |
4076 | - |
4077 | -SHOW_DIRECTORIES = NO |
4078 | - |
4079 | -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. |
4080 | -# This will remove the Files entry from the Quick Index and from the |
4081 | -# Folder Tree View (if specified). The default is YES. |
4082 | - |
4083 | -SHOW_FILES = YES |
4084 | - |
4085 | -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the |
4086 | -# Namespaces page. |
4087 | -# This will remove the Namespaces entry from the Quick Index |
4088 | -# and from the Folder Tree View (if specified). The default is YES. |
4089 | - |
4090 | -SHOW_NAMESPACES = YES |
4091 | - |
4092 | -# The FILE_VERSION_FILTER tag can be used to specify a program or script that |
4093 | -# doxygen should invoke to get the current version for each file (typically from |
4094 | -# the version control system). Doxygen will invoke the program by executing (via |
4095 | -# popen()) the command <command> <input-file>, where <command> is the value of |
4096 | -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file |
4097 | -# provided by doxygen. Whatever the program writes to standard output |
4098 | -# is used as the file version. See the manual for examples. |
4099 | - |
4100 | -FILE_VERSION_FILTER = |
4101 | - |
4102 | -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by |
4103 | -# doxygen. The layout file controls the global structure of the generated output files |
4104 | -# in an output format independent way. The create the layout file that represents |
4105 | -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a |
4106 | -# file name after the option, if omitted DoxygenLayout.xml will be used as the name |
4107 | -# of the layout file. |
4108 | - |
4109 | -LAYOUT_FILE = DoxygenLayout.xml |
4110 | - |
4111 | -#--------------------------------------------------------------------------- |
4112 | -# configuration options related to warning and progress messages |
4113 | -#--------------------------------------------------------------------------- |
4114 | - |
4115 | -# The QUIET tag can be used to turn on/off the messages that are generated |
4116 | -# by doxygen. Possible values are YES and NO. If left blank NO is used. |
4117 | - |
4118 | -QUIET = NO |
4119 | - |
4120 | -# The WARNINGS tag can be used to turn on/off the warning messages that are |
4121 | -# generated by doxygen. Possible values are YES and NO. If left blank |
4122 | -# NO is used. |
4123 | - |
4124 | -WARNINGS = YES |
4125 | - |
4126 | -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings |
4127 | -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will |
4128 | -# automatically be disabled. |
4129 | - |
4130 | -WARN_IF_UNDOCUMENTED = YES |
4131 | - |
4132 | -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for |
4133 | -# potential errors in the documentation, such as not documenting some |
4134 | -# parameters in a documented function, or documenting parameters that |
4135 | -# don't exist or using markup commands wrongly. |
4136 | - |
4137 | -WARN_IF_DOC_ERROR = YES |
4138 | - |
4139 | -# This WARN_NO_PARAMDOC option can be abled to get warnings for |
4140 | -# functions that are documented, but have no documentation for their parameters |
4141 | -# or return value. If set to NO (the default) doxygen will only warn about |
4142 | -# wrong or incomplete parameter documentation, but not about the absence of |
4143 | -# documentation. |
4144 | - |
4145 | -WARN_NO_PARAMDOC = NO |
4146 | - |
4147 | -# The WARN_FORMAT tag determines the format of the warning messages that |
4148 | -# doxygen can produce. The string should contain the $file, $line, and $text |
4149 | -# tags, which will be replaced by the file and line number from which the |
4150 | -# warning originated and the warning text. Optionally the format may contain |
4151 | -# $version, which will be replaced by the version of the file (if it could |
4152 | -# be obtained via FILE_VERSION_FILTER) |
4153 | - |
4154 | -WARN_FORMAT = "$file:$line: $text" |
4155 | - |
4156 | -# The WARN_LOGFILE tag can be used to specify a file to which warning |
4157 | -# and error messages should be written. If left blank the output is written |
4158 | -# to stderr. |
4159 | - |
4160 | -WARN_LOGFILE = |
4161 | - |
4162 | -#--------------------------------------------------------------------------- |
4163 | -# configuration options related to the input files |
4164 | -#--------------------------------------------------------------------------- |
4165 | - |
4166 | -# The INPUT tag can be used to specify the files and/or directories that contain |
4167 | -# documented source files. You may enter file names like "myfile.cpp" or |
4168 | -# directories like "/usr/src/myproject". Separate the files or directories |
4169 | -# with spaces. |
4170 | - |
4171 | -INPUT = ../lcm content |
4172 | - |
4173 | -# This tag can be used to specify the character encoding of the source files |
4174 | -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is |
4175 | -# also the default input encoding. Doxygen uses libiconv (or the iconv built |
4176 | -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for |
4177 | -# the list of possible encodings. |
4178 | - |
4179 | -INPUT_ENCODING = UTF-8 |
4180 | - |
4181 | -# If the value of the INPUT tag contains directories, you can use the |
4182 | -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp |
4183 | -# and *.h) to filter out the source-files in the directories. If left |
4184 | -# blank the following patterns are tested: |
4185 | -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx |
4186 | -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 |
4187 | - |
4188 | -FILE_PATTERNS = *.md \ |
4189 | - lcm.h \ |
4190 | - eventlog.h \ |
4191 | - lcm-cpp.hpp \ |
4192 | - listener-async.c |
4193 | - |
4194 | -# The RECURSIVE tag can be used to turn specify whether or not subdirectories |
4195 | -# should be searched for input files as well. Possible values are YES and NO. |
4196 | -# If left blank NO is used. |
4197 | - |
4198 | -RECURSIVE = YES |
4199 | - |
4200 | -# The EXCLUDE tag can be used to specify files and/or directories that should |
4201 | -# excluded from the INPUT source files. This way you can easily exclude a |
4202 | -# subdirectory from a directory tree whose root is specified with the INPUT tag. |
4203 | - |
4204 | -EXCLUDE = lcm-cpp-impl.hpp |
4205 | - |
4206 | -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or |
4207 | -# directories that are symbolic links (a Unix filesystem feature) are excluded |
4208 | -# from the input. |
4209 | - |
4210 | -EXCLUDE_SYMLINKS = NO |
4211 | - |
4212 | -# If the value of the INPUT tag contains directories, you can use the |
4213 | -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude |
4214 | -# certain files from those directories. Note that the wildcards are matched |
4215 | -# against the file with absolute path, so to exclude all test directories |
4216 | -# for example use the pattern */test/* |
4217 | - |
4218 | -EXCLUDE_PATTERNS = |
4219 | - |
4220 | -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names |
4221 | -# (namespaces, classes, functions, etc.) that should be excluded from the |
4222 | -# output. The symbol name can be a fully qualified name, a word, or if the |
4223 | -# wildcard * is used, a substring. Examples: ANamespace, AClass, |
4224 | -# AClass::ANamespace, ANamespace::*Test |
4225 | - |
4226 | -EXCLUDE_SYMBOLS = lcm::LCM*Subscription __lcm_hash_ptr dbg_* |
4227 | - |
4228 | -# The EXAMPLE_PATH tag can be used to specify one or more files or |
4229 | -# directories that contain example code fragments that are included (see |
4230 | -# the \include command). |
4231 | - |
4232 | -EXAMPLE_PATH = ../examples |
4233 | - |
4234 | -# If the value of the EXAMPLE_PATH tag contains directories, you can use the |
4235 | -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp |
4236 | -# and *.h) to filter out the source-files in the directories. If left |
4237 | -# blank all files are included. |
4238 | - |
4239 | -EXAMPLE_PATTERNS = |
4240 | - |
4241 | -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be |
4242 | -# searched for input files to be used with the \include or \dontinclude |
4243 | -# commands irrespective of the value of the RECURSIVE tag. |
4244 | -# Possible values are YES and NO. If left blank NO is used. |
4245 | - |
4246 | -EXAMPLE_RECURSIVE = NO |
4247 | - |
4248 | -# The IMAGE_PATH tag can be used to specify one or more files or |
4249 | -# directories that contain image that are included in the documentation (see |
4250 | -# the \image command). |
4251 | - |
4252 | -IMAGE_PATH = |
4253 | - |
4254 | -# The INPUT_FILTER tag can be used to specify a program that doxygen should |
4255 | -# invoke to filter for each input file. Doxygen will invoke the filter program |
4256 | -# by executing (via popen()) the command <filter> <input-file>, where <filter> |
4257 | -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an |
4258 | -# input file. Doxygen will then use the output that the filter program writes |
4259 | -# to standard output. |
4260 | -# If FILTER_PATTERNS is specified, this tag will be |
4261 | -# ignored. |
4262 | - |
4263 | -INPUT_FILTER = |
4264 | - |
4265 | -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern |
4266 | -# basis. |
4267 | -# Doxygen will compare the file name with each pattern and apply the |
4268 | -# filter if there is a match. |
4269 | -# The filters are a list of the form: |
4270 | -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further |
4271 | -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER |
4272 | -# is applied to all files. |
4273 | - |
4274 | -FILTER_PATTERNS = |
4275 | - |
4276 | -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using |
4277 | -# INPUT_FILTER) will be used to filter the input files when producing source |
4278 | -# files to browse (i.e. when SOURCE_BROWSER is set to YES). |
4279 | - |
4280 | -FILTER_SOURCE_FILES = NO |
4281 | - |
4282 | -#--------------------------------------------------------------------------- |
4283 | -# configuration options related to source browsing |
4284 | -#--------------------------------------------------------------------------- |
4285 | - |
4286 | -# If the SOURCE_BROWSER tag is set to YES then a list of source files will |
4287 | -# be generated. Documented entities will be cross-referenced with these sources. |
4288 | -# Note: To get rid of all source code in the generated output, make sure also |
4289 | -# VERBATIM_HEADERS is set to NO. |
4290 | - |
4291 | -SOURCE_BROWSER = NO |
4292 | - |
4293 | -# Setting the INLINE_SOURCES tag to YES will include the body |
4294 | -# of functions and classes directly in the documentation. |
4295 | - |
4296 | -INLINE_SOURCES = NO |
4297 | - |
4298 | -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct |
4299 | -# doxygen to hide any special comment blocks from generated source code |
4300 | -# fragments. Normal C and C++ comments will always remain visible. |
4301 | - |
4302 | -STRIP_CODE_COMMENTS = YES |
4303 | - |
4304 | -# If the REFERENCED_BY_RELATION tag is set to YES |
4305 | -# then for each documented function all documented |
4306 | -# functions referencing it will be listed. |
4307 | - |
4308 | -REFERENCED_BY_RELATION = NO |
4309 | - |
4310 | -# If the REFERENCES_RELATION tag is set to YES |
4311 | -# then for each documented function all documented entities |
4312 | -# called/used by that function will be listed. |
4313 | - |
4314 | -REFERENCES_RELATION = NO |
4315 | - |
4316 | -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) |
4317 | -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from |
4318 | -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will |
4319 | -# link to the source code. |
4320 | -# Otherwise they will link to the documentation. |
4321 | - |
4322 | -REFERENCES_LINK_SOURCE = YES |
4323 | - |
4324 | -# If the USE_HTAGS tag is set to YES then the references to source code |
4325 | -# will point to the HTML generated by the htags(1) tool instead of doxygen |
4326 | -# built-in source browser. The htags tool is part of GNU's global source |
4327 | -# tagging system (see http://www.gnu.org/software/global/global.html). You |
4328 | -# will need version 4.8.6 or higher. |
4329 | - |
4330 | -USE_HTAGS = NO |
4331 | - |
4332 | -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen |
4333 | -# will generate a verbatim copy of the header file for each class for |
4334 | -# which an include is specified. Set to NO to disable this. |
4335 | - |
4336 | -VERBATIM_HEADERS = YES |
4337 | - |
4338 | -#--------------------------------------------------------------------------- |
4339 | -# configuration options related to the alphabetical class index |
4340 | -#--------------------------------------------------------------------------- |
4341 | - |
4342 | -ALPHABETICAL_INDEX = YES |
4343 | -COLS_IN_ALPHA_INDEX = 5 |
4344 | -IGNORE_PREFIX = |
4345 | - |
4346 | -#--------------------------------------------------------------------------- |
4347 | -# configuration options related to the HTML output |
4348 | -#--------------------------------------------------------------------------- |
4349 | - |
4350 | -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will |
4351 | -# generate HTML output. |
4352 | - |
4353 | -GENERATE_HTML = YES |
4354 | - |
4355 | -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. |
4356 | -# If a relative path is entered the value of OUTPUT_DIRECTORY will be |
4357 | -# put in front of it. If left blank `html' will be used as the default path. |
4358 | - |
4359 | -HTML_OUTPUT = html |
4360 | - |
4361 | -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for |
4362 | -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank |
4363 | -# doxygen will generate files with .html extension. |
4364 | - |
4365 | -HTML_FILE_EXTENSION = .html |
4366 | - |
4367 | -# The HTML_HEADER tag can be used to specify a personal HTML header for |
4368 | -# each generated HTML page. If it is left blank doxygen will generate a |
4369 | -# standard header. |
4370 | - |
4371 | -HTML_HEADER = |
4372 | - |
4373 | -# The HTML_FOOTER tag can be used to specify a personal HTML footer for |
4374 | -# each generated HTML page. If it is left blank doxygen will generate a |
4375 | -# standard footer. |
4376 | - |
4377 | -HTML_FOOTER = footer.html |
4378 | - |
4379 | -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading |
4380 | -# style sheet that is used by each HTML page. It can be used to |
4381 | -# fine-tune the look of the HTML output. If the tag is left blank doxygen |
4382 | -# will generate a default style sheet. Note that doxygen will try to copy |
4383 | -# the style sheet file to the HTML output directory, so don't put your own |
4384 | -# stylesheet in the HTML output directory as well, or it will be erased! |
4385 | - |
4386 | -HTML_STYLESHEET = |
4387 | - |
4388 | -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML |
4389 | -# page will contain the date and time when the page was generated. Setting |
4390 | -# this to NO can help when comparing the output of multiple runs. |
4391 | - |
4392 | -HTML_TIMESTAMP = YES |
4393 | - |
4394 | -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, |
4395 | -# files or namespaces will be aligned in HTML using tables. If set to |
4396 | -# NO a bullet list will be used. |
4397 | - |
4398 | -HTML_ALIGN_MEMBERS = YES |
4399 | - |
4400 | -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML |
4401 | -# documentation will contain sections that can be hidden and shown after the |
4402 | -# page has loaded. For this to work a browser that supports |
4403 | -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox |
4404 | -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). |
4405 | - |
4406 | -HTML_DYNAMIC_SECTIONS = NO |
4407 | - |
4408 | -# If the GENERATE_DOCSET tag is set to YES, additional index files |
4409 | -# will be generated that can be used as input for Apple's Xcode 3 |
4410 | -# integrated development environment, introduced with OSX 10.5 (Leopard). |
4411 | -# To create a documentation set, doxygen will generate a Makefile in the |
4412 | -# HTML output directory. Running make will produce the docset in that |
4413 | -# directory and running "make install" will install the docset in |
4414 | -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find |
4415 | -# it at startup. |
4416 | -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. |
4417 | - |
4418 | -GENERATE_DOCSET = NO |
4419 | - |
4420 | -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the |
4421 | -# feed. A documentation feed provides an umbrella under which multiple |
4422 | -# documentation sets from a single provider (such as a company or product suite) |
4423 | -# can be grouped. |
4424 | - |
4425 | -DOCSET_FEEDNAME = "Doxygen generated docs" |
4426 | - |
4427 | -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that |
4428 | -# should uniquely identify the documentation set bundle. This should be a |
4429 | -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen |
4430 | -# will append .docset to the name. |
4431 | - |
4432 | -DOCSET_BUNDLE_ID = org.doxygen.Project |
4433 | - |
4434 | -# If the GENERATE_HTMLHELP tag is set to YES, additional index files |
4435 | -# will be generated that can be used as input for tools like the |
4436 | -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) |
4437 | -# of the generated HTML documentation. |
4438 | - |
4439 | -GENERATE_HTMLHELP = NO |
4440 | - |
4441 | -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can |
4442 | -# be used to specify the file name of the resulting .chm file. You |
4443 | -# can add a path in front of the file if the result should not be |
4444 | -# written to the html output directory. |
4445 | - |
4446 | -CHM_FILE = |
4447 | - |
4448 | -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can |
4449 | -# be used to specify the location (absolute path including file name) of |
4450 | -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run |
4451 | -# the HTML help compiler on the generated index.hhp. |
4452 | - |
4453 | -HHC_LOCATION = |
4454 | - |
4455 | -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag |
4456 | -# controls if a separate .chi index file is generated (YES) or that |
4457 | -# it should be included in the master .chm file (NO). |
4458 | - |
4459 | -GENERATE_CHI = NO |
4460 | - |
4461 | -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING |
4462 | -# is used to encode HtmlHelp index (hhk), content (hhc) and project file |
4463 | -# content. |
4464 | - |
4465 | -CHM_INDEX_ENCODING = |
4466 | - |
4467 | -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag |
4468 | -# controls whether a binary table of contents is generated (YES) or a |
4469 | -# normal table of contents (NO) in the .chm file. |
4470 | - |
4471 | -BINARY_TOC = NO |
4472 | - |
4473 | -# The TOC_EXPAND flag can be set to YES to add extra items for group members |
4474 | -# to the contents of the HTML help documentation and to the tree view. |
4475 | - |
4476 | -TOC_EXPAND = NO |
4477 | - |
4478 | -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER |
4479 | -# are set, an additional index file will be generated that can be used as input for |
4480 | -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated |
4481 | -# HTML documentation. |
4482 | - |
4483 | -GENERATE_QHP = NO |
4484 | - |
4485 | -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can |
4486 | -# be used to specify the file name of the resulting .qch file. |
4487 | -# The path specified is relative to the HTML output folder. |
4488 | - |
4489 | -QCH_FILE = |
4490 | - |
4491 | -# The QHP_NAMESPACE tag specifies the namespace to use when generating |
4492 | -# Qt Help Project output. For more information please see |
4493 | -# http://doc.trolltech.com/qthelpproject.html#namespace |
4494 | - |
4495 | -QHP_NAMESPACE = org.doxygen.Project |
4496 | - |
4497 | -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating |
4498 | -# Qt Help Project output. For more information please see |
4499 | -# http://doc.trolltech.com/qthelpproject.html#virtual-folders |
4500 | - |
4501 | -QHP_VIRTUAL_FOLDER = doc |
4502 | - |
4503 | -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. |
4504 | -# For more information please see |
4505 | -# http://doc.trolltech.com/qthelpproject.html#custom-filters |
4506 | - |
4507 | -QHP_CUST_FILTER_NAME = |
4508 | - |
4509 | -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see |
4510 | -# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>. |
4511 | - |
4512 | -QHP_CUST_FILTER_ATTRS = |
4513 | - |
4514 | -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's |
4515 | -# filter section matches. |
4516 | -# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>. |
4517 | - |
4518 | -QHP_SECT_FILTER_ATTRS = |
4519 | - |
4520 | -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can |
4521 | -# be used to specify the location of Qt's qhelpgenerator. |
4522 | -# If non-empty doxygen will try to run qhelpgenerator on the generated |
4523 | -# .qhp file. |
4524 | - |
4525 | -QHG_LOCATION = |
4526 | - |
4527 | -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files |
4528 | -# will be generated, which together with the HTML files, form an Eclipse help |
4529 | -# plugin. To install this plugin and make it available under the help contents |
4530 | -# menu in Eclipse, the contents of the directory containing the HTML and XML |
4531 | -# files needs to be copied into the plugins directory of eclipse. The name of |
4532 | -# the directory within the plugins directory should be the same as |
4533 | -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. |
4534 | - |
4535 | -GENERATE_ECLIPSEHELP = NO |
4536 | - |
4537 | -# A unique identifier for the eclipse help plugin. When installing the plugin |
4538 | -# the directory name containing the HTML and XML files should also have |
4539 | -# this name. |
4540 | - |
4541 | -ECLIPSE_DOC_ID = org.doxygen.Project |
4542 | - |
4543 | -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at |
4544 | -# top of each HTML page. The value NO (the default) enables the index and |
4545 | -# the value YES disables it. |
4546 | - |
4547 | -DISABLE_INDEX = NO |
4548 | - |
4549 | -# This tag can be used to set the number of enum values (range [1..20]) |
4550 | -# that doxygen will group on one line in the generated HTML documentation. |
4551 | - |
4552 | -ENUM_VALUES_PER_LINE = 4 |
4553 | - |
4554 | -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index |
4555 | -# structure should be generated to display hierarchical information. |
4556 | -# If the tag value is set to YES, a side panel will be generated |
4557 | -# containing a tree-like index structure (just like the one that |
4558 | -# is generated for HTML Help). For this to work a browser that supports |
4559 | -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). |
4560 | -# Windows users are probably better off using the HTML help feature. |
4561 | - |
4562 | -GENERATE_TREEVIEW = NO |
4563 | - |
4564 | -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, |
4565 | -# and Class Hierarchy pages using a tree view instead of an ordered list. |
4566 | - |
4567 | -USE_INLINE_TREES = NO |
4568 | - |
4569 | -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be |
4570 | -# used to set the initial width (in pixels) of the frame in which the tree |
4571 | -# is shown. |
4572 | - |
4573 | -TREEVIEW_WIDTH = 250 |
4574 | - |
4575 | -# Use this tag to change the font size of Latex formulas included |
4576 | -# as images in the HTML documentation. The default is 10. Note that |
4577 | -# when you change the font size after a successful doxygen run you need |
4578 | -# to manually remove any form_*.png images from the HTML output directory |
4579 | -# to force them to be regenerated. |
4580 | - |
4581 | -FORMULA_FONTSIZE = 10 |
4582 | - |
4583 | -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript |
4584 | -# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should |
4585 | -# typically be disabled. For large projects the javascript based search engine |
4586 | -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. |
4587 | - |
4588 | -SEARCHENGINE = YES |
4589 | - |
4590 | -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index |
4591 | -# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup |
4592 | -# and does not have live searching capabilities. |
4593 | - |
4594 | -SERVER_BASED_SEARCH = NO |
4595 | - |
4596 | -#--------------------------------------------------------------------------- |
4597 | -# configuration options related to the LaTeX output |
4598 | -#--------------------------------------------------------------------------- |
4599 | - |
4600 | -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will |
4601 | -# generate Latex output. |
4602 | - |
4603 | -GENERATE_LATEX = NO |
4604 | - |
4605 | -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. |
4606 | -# If a relative path is entered the value of OUTPUT_DIRECTORY will be |
4607 | -# put in front of it. If left blank `latex' will be used as the default path. |
4608 | - |
4609 | -LATEX_OUTPUT = latex |
4610 | - |
4611 | -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be |
4612 | -# invoked. If left blank `latex' will be used as the default command name. |
4613 | -# Note that when enabling USE_PDFLATEX this option is only used for |
4614 | -# generating bitmaps for formulas in the HTML output, but not in the |
4615 | -# Makefile that is written to the output directory. |
4616 | - |
4617 | -LATEX_CMD_NAME = latex |
4618 | - |
4619 | -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to |
4620 | -# generate index for LaTeX. If left blank `makeindex' will be used as the |
4621 | -# default command name. |
4622 | - |
4623 | -MAKEINDEX_CMD_NAME = makeindex |
4624 | - |
4625 | -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact |
4626 | -# LaTeX documents. This may be useful for small projects and may help to |
4627 | -# save some trees in general. |
4628 | - |
4629 | -COMPACT_LATEX = NO |
4630 | - |
4631 | -# The PAPER_TYPE tag can be used to set the paper type that is used |
4632 | -# by the printer. Possible values are: a4, a4wide, letter, legal and |
4633 | -# executive. If left blank a4wide will be used. |
4634 | - |
4635 | -PAPER_TYPE = a4wide |
4636 | - |
4637 | -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX |
4638 | -# packages that should be included in the LaTeX output. |
4639 | - |
4640 | -EXTRA_PACKAGES = |
4641 | - |
4642 | -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for |
4643 | -# the generated latex document. The header should contain everything until |
4644 | -# the first chapter. If it is left blank doxygen will generate a |
4645 | -# standard header. Notice: only use this tag if you know what you are doing! |
4646 | - |
4647 | -LATEX_HEADER = |
4648 | - |
4649 | -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated |
4650 | -# is prepared for conversion to pdf (using ps2pdf). The pdf file will |
4651 | -# contain links (just like the HTML output) instead of page references |
4652 | -# This makes the output suitable for online browsing using a pdf viewer. |
4653 | - |
4654 | -PDF_HYPERLINKS = YES |
4655 | - |
4656 | -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of |
4657 | -# plain latex in the generated Makefile. Set this option to YES to get a |
4658 | -# higher quality PDF documentation. |
4659 | - |
4660 | -USE_PDFLATEX = YES |
4661 | - |
4662 | -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. |
4663 | -# command to the generated LaTeX files. This will instruct LaTeX to keep |
4664 | -# running if errors occur, instead of asking the user for help. |
4665 | -# This option is also used when generating formulas in HTML. |
4666 | - |
4667 | -LATEX_BATCHMODE = NO |
4668 | - |
4669 | -# If LATEX_HIDE_INDICES is set to YES then doxygen will not |
4670 | -# include the index chapters (such as File Index, Compound Index, etc.) |
4671 | -# in the output. |
4672 | - |
4673 | -LATEX_HIDE_INDICES = NO |
4674 | - |
4675 | -# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. |
4676 | - |
4677 | -LATEX_SOURCE_CODE = NO |
4678 | - |
4679 | -#--------------------------------------------------------------------------- |
4680 | -# configuration options related to the RTF output |
4681 | -#--------------------------------------------------------------------------- |
4682 | - |
4683 | -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output |
4684 | -# The RTF output is optimized for Word 97 and may not look very pretty with |
4685 | -# other RTF readers or editors. |
4686 | - |
4687 | -GENERATE_RTF = NO |
4688 | - |
4689 | -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. |
4690 | -# If a relative path is entered the value of OUTPUT_DIRECTORY will be |
4691 | -# put in front of it. If left blank `rtf' will be used as the default path. |
4692 | - |
4693 | -RTF_OUTPUT = rtf |
4694 | - |
4695 | -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact |
4696 | -# RTF documents. This may be useful for small projects and may help to |
4697 | -# save some trees in general. |
4698 | - |
4699 | -COMPACT_RTF = NO |
4700 | - |
4701 | -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated |
4702 | -# will contain hyperlink fields. The RTF file will |
4703 | -# contain links (just like the HTML output) instead of page references. |
4704 | -# This makes the output suitable for online browsing using WORD or other |
4705 | -# programs which support those fields. |
4706 | -# Note: wordpad (write) and others do not support links. |
4707 | - |
4708 | -RTF_HYPERLINKS = NO |
4709 | - |
4710 | -# Load stylesheet definitions from file. Syntax is similar to doxygen's |
4711 | -# config file, i.e. a series of assignments. You only have to provide |
4712 | -# replacements, missing definitions are set to their default value. |
4713 | - |
4714 | -RTF_STYLESHEET_FILE = |
4715 | - |
4716 | -# Set optional variables used in the generation of an rtf document. |
4717 | -# Syntax is similar to doxygen's config file. |
4718 | - |
4719 | -RTF_EXTENSIONS_FILE = |
4720 | - |
4721 | -#--------------------------------------------------------------------------- |
4722 | -# configuration options related to the man page output |
4723 | -#--------------------------------------------------------------------------- |
4724 | - |
4725 | -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will |
4726 | -# generate man pages |
4727 | - |
4728 | -GENERATE_MAN = NO |
4729 | - |
4730 | -# The MAN_OUTPUT tag is used to specify where the man pages will be put. |
4731 | -# If a relative path is entered the value of OUTPUT_DIRECTORY will be |
4732 | -# put in front of it. If left blank `man' will be used as the default path. |
4733 | - |
4734 | -MAN_OUTPUT = man |
4735 | - |
4736 | -# The MAN_EXTENSION tag determines the extension that is added to |
4737 | -# the generated man pages (default is the subroutine's section .3) |
4738 | - |
4739 | -MAN_EXTENSION = .3 |
4740 | - |
4741 | -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, |
4742 | -# then it will generate one additional man file for each entity |
4743 | -# documented in the real man page(s). These additional files |
4744 | -# only source the real man page, but without them the man command |
4745 | -# would be unable to find the correct page. The default is NO. |
4746 | - |
4747 | -MAN_LINKS = NO |
4748 | - |
4749 | -#--------------------------------------------------------------------------- |
4750 | -# configuration options related to the XML output |
4751 | -#--------------------------------------------------------------------------- |
4752 | - |
4753 | -# If the GENERATE_XML tag is set to YES Doxygen will |
4754 | -# generate an XML file that captures the structure of |
4755 | -# the code including all documentation. |
4756 | - |
4757 | -GENERATE_XML = NO |
4758 | - |
4759 | -# The XML_OUTPUT tag is used to specify where the XML pages will be put. |
4760 | -# If a relative path is entered the value of OUTPUT_DIRECTORY will be |
4761 | -# put in front of it. If left blank `xml' will be used as the default path. |
4762 | - |
4763 | -XML_OUTPUT = xml |
4764 | - |
4765 | -# The XML_SCHEMA tag can be used to specify an XML schema, |
4766 | -# which can be used by a validating XML parser to check the |
4767 | -# syntax of the XML files. |
4768 | - |
4769 | -XML_SCHEMA = |
4770 | - |
4771 | -# The XML_DTD tag can be used to specify an XML DTD, |
4772 | -# which can be used by a validating XML parser to check the |
4773 | -# syntax of the XML files. |
4774 | - |
4775 | -XML_DTD = |
4776 | - |
4777 | -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will |
4778 | -# dump the program listings (including syntax highlighting |
4779 | -# and cross-referencing information) to the XML output. Note that |
4780 | -# enabling this will significantly increase the size of the XML output. |
4781 | - |
4782 | -XML_PROGRAMLISTING = YES |
4783 | - |
4784 | -#--------------------------------------------------------------------------- |
4785 | -# configuration options for the AutoGen Definitions output |
4786 | -#--------------------------------------------------------------------------- |
4787 | - |
4788 | -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will |
4789 | -# generate an AutoGen Definitions (see autogen.sf.net) file |
4790 | -# that captures the structure of the code including all |
4791 | -# documentation. Note that this feature is still experimental |
4792 | -# and incomplete at the moment. |
4793 | - |
4794 | -GENERATE_AUTOGEN_DEF = NO |
4795 | - |
4796 | -#--------------------------------------------------------------------------- |
4797 | -# configuration options related to the Perl module output |
4798 | -#--------------------------------------------------------------------------- |
4799 | - |
4800 | -# If the GENERATE_PERLMOD tag is set to YES Doxygen will |
4801 | -# generate a Perl module file that captures the structure of |
4802 | -# the code including all documentation. Note that this |
4803 | -# feature is still experimental and incomplete at the |
4804 | -# moment. |
4805 | - |
4806 | -GENERATE_PERLMOD = NO |
4807 | - |
4808 | -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate |
4809 | -# the necessary Makefile rules, Perl scripts and LaTeX code to be able |
4810 | -# to generate PDF and DVI output from the Perl module output. |
4811 | - |
4812 | -PERLMOD_LATEX = NO |
4813 | - |
4814 | -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be |
4815 | -# nicely formatted so it can be parsed by a human reader. |
4816 | -# This is useful |
4817 | -# if you want to understand what is going on. |
4818 | -# On the other hand, if this |
4819 | -# tag is set to NO the size of the Perl module output will be much smaller |
4820 | -# and Perl will parse it just the same. |
4821 | - |
4822 | -PERLMOD_PRETTY = YES |
4823 | - |
4824 | -# The names of the make variables in the generated doxyrules.make file |
4825 | -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. |
4826 | -# This is useful so different doxyrules.make files included by the same |
4827 | -# Makefile don't overwrite each other's variables. |
4828 | - |
4829 | -PERLMOD_MAKEVAR_PREFIX = |
4830 | - |
4831 | -#--------------------------------------------------------------------------- |
4832 | -# Configuration options related to the preprocessor |
4833 | -#--------------------------------------------------------------------------- |
4834 | - |
4835 | -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will |
4836 | -# evaluate all C-preprocessor directives found in the sources and include |
4837 | -# files. |
4838 | - |
4839 | -ENABLE_PREPROCESSING = YES |
4840 | - |
4841 | -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro |
4842 | -# names in the source code. If set to NO (the default) only conditional |
4843 | -# compilation will be performed. Macro expansion can be done in a controlled |
4844 | -# way by setting EXPAND_ONLY_PREDEF to YES. |
4845 | - |
4846 | -MACRO_EXPANSION = YES |
4847 | - |
4848 | -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES |
4849 | -# then the macro expansion is limited to the macros specified with the |
4850 | -# PREDEFINED and EXPAND_AS_DEFINED tags. |
4851 | - |
4852 | -EXPAND_ONLY_PREDEF = YES |
4853 | - |
4854 | -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files |
4855 | -# in the INCLUDE_PATH (see below) will be search if a #include is found. |
4856 | - |
4857 | -SEARCH_INCLUDES = YES |
4858 | - |
4859 | -# The INCLUDE_PATH tag can be used to specify one or more directories that |
4860 | -# contain include files that are not input files but should be processed by |
4861 | -# the preprocessor. |
4862 | - |
4863 | -INCLUDE_PATH = |
4864 | - |
4865 | -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard |
4866 | -# patterns (like *.h and *.hpp) to filter out the header-files in the |
4867 | -# directories. If left blank, the patterns specified with FILE_PATTERNS will |
4868 | -# be used. |
4869 | - |
4870 | -INCLUDE_FILE_PATTERNS = |
4871 | - |
4872 | -# The PREDEFINED tag can be used to specify one or more macro names that |
4873 | -# are defined before the preprocessor is started (similar to the -D option of |
4874 | -# gcc). The argument of the tag is a list of macros of the form: name |
4875 | -# or name=definition (no spaces). If the definition and the = are |
4876 | -# omitted =1 is assumed. To prevent a macro definition from being |
4877 | -# undefined via #undef or recursively expanded use the := operator |
4878 | -# instead of the = operator. |
4879 | - |
4880 | -PREDEFINED = LCM_API_FUNCTION= |
4881 | - |
4882 | -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then |
4883 | -# this tag can be used to specify a list of macro names that should be expanded. |
4884 | -# The macro definition that is found in the sources will be used. |
4885 | -# Use the PREDEFINED tag if you want to use a different macro definition. |
4886 | - |
4887 | -EXPAND_AS_DEFINED = |
4888 | - |
4889 | -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then |
4890 | -# doxygen's preprocessor will remove all function-like macros that are alone |
4891 | -# on a line, have an all uppercase name, and do not end with a semicolon. Such |
4892 | -# function macros are typically used for boiler-plate code, and will confuse |
4893 | -# the parser if not removed. |
4894 | - |
4895 | -SKIP_FUNCTION_MACROS = YES |
4896 | - |
4897 | -#--------------------------------------------------------------------------- |
4898 | -# Configuration::additions related to external references |
4899 | -#--------------------------------------------------------------------------- |
4900 | - |
4901 | -# The TAGFILES option can be used to specify one or more tagfiles. |
4902 | -# Optionally an initial location of the external documentation |
4903 | -# can be added for each tagfile. The format of a tag file without |
4904 | -# this location is as follows: |
4905 | -# |
4906 | -# TAGFILES = file1 file2 ... |
4907 | -# Adding location for the tag files is done as follows: |
4908 | -# |
4909 | -# TAGFILES = file1=loc1 "file2 = loc2" ... |
4910 | -# where "loc1" and "loc2" can be relative or absolute paths or |
4911 | -# URLs. If a location is present for each tag, the installdox tool |
4912 | -# does not have to be run to correct the links. |
4913 | -# Note that each tag file must have a unique name |
4914 | -# (where the name does NOT include the path) |
4915 | -# If a tag file is not located in the directory in which doxygen |
4916 | -# is run, you must also specify the path to the tagfile here. |
4917 | - |
4918 | -TAGFILES = |
4919 | - |
4920 | -# When a file name is specified after GENERATE_TAGFILE, doxygen will create |
4921 | -# a tag file that is based on the input files it reads. |
4922 | - |
4923 | -GENERATE_TAGFILE = |
4924 | - |
4925 | -# If the ALLEXTERNALS tag is set to YES all external classes will be listed |
4926 | -# in the class index. If set to NO only the inherited external classes |
4927 | -# will be listed. |
4928 | - |
4929 | -ALLEXTERNALS = NO |
4930 | - |
4931 | -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed |
4932 | -# in the modules index. If set to NO, only the current project's groups will |
4933 | -# be listed. |
4934 | - |
4935 | -EXTERNAL_GROUPS = YES |
4936 | - |
4937 | -# The PERL_PATH should be the absolute path and name of the perl script |
4938 | -# interpreter (i.e. the result of `which perl'). |
4939 | - |
4940 | -PERL_PATH = /usr/bin/perl |
4941 | - |
4942 | -#--------------------------------------------------------------------------- |
4943 | -# Configuration options related to the dot tool |
4944 | -#--------------------------------------------------------------------------- |
4945 | - |
4946 | -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will |
4947 | -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base |
4948 | -# or super classes. Setting the tag to NO turns the diagrams off. Note that |
4949 | -# this option is superseded by the HAVE_DOT option below. This is only a |
4950 | -# fallback. It is recommended to install and use dot, since it yields more |
4951 | -# powerful graphs. |
4952 | - |
4953 | -CLASS_DIAGRAMS = YES |
4954 | - |
4955 | -# You can define message sequence charts within doxygen comments using the \msc |
4956 | -# command. Doxygen will then run the mscgen tool (see |
4957 | -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the |
4958 | -# documentation. The MSCGEN_PATH tag allows you to specify the directory where |
4959 | -# the mscgen tool resides. If left empty the tool is assumed to be found in the |
4960 | -# default search path. |
4961 | - |
4962 | -MSCGEN_PATH = |
4963 | - |
4964 | -# If set to YES, the inheritance and collaboration graphs will hide |
4965 | -# inheritance and usage relations if the target is undocumented |
4966 | -# or is not a class. |
4967 | - |
4968 | -HIDE_UNDOC_RELATIONS = YES |
4969 | - |
4970 | -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is |
4971 | -# available from the path. This tool is part of Graphviz, a graph visualization |
4972 | -# toolkit from AT&T and Lucent Bell Labs. The other options in this section |
4973 | -# have no effect if this option is set to NO (the default) |
4974 | - |
4975 | -HAVE_DOT = NO |
4976 | - |
4977 | -# By default doxygen will write a font called FreeSans.ttf to the output |
4978 | -# directory and reference it in all dot files that doxygen generates. This |
4979 | -# font does not include all possible unicode characters however, so when you need |
4980 | -# these (or just want a differently looking font) you can specify the font name |
4981 | -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, |
4982 | -# which can be done by putting it in a standard location or by setting the |
4983 | -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory |
4984 | -# containing the font. |
4985 | - |
4986 | -DOT_FONTNAME = FreeSans |
4987 | - |
4988 | -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. |
4989 | -# The default size is 10pt. |
4990 | - |
4991 | -DOT_FONTSIZE = 10 |
4992 | - |
4993 | -# By default doxygen will tell dot to use the output directory to look for the |
4994 | -# FreeSans.ttf font (which doxygen will put there itself). If you specify a |
4995 | -# different font using DOT_FONTNAME you can set the path where dot |
4996 | -# can find it using this tag. |
4997 | - |
4998 | -DOT_FONTPATH = |
4999 | - |
5000 | -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen |
Thank you for such great effort!!!!
Please rebase against the latest pkg/ubuntu/devel. The MP has conflicts in d/control and d/changelog.
nit: consider using ~repack1 or ~us1 as the suffix so that if Debian publishes 1.5.0 we can use sync instead of fakesync.
d/control:
liblcm-java:
java package must Architecture: all[1]. It would be nice to mention that the package also provides a GUI interface (spy) as opposed to just Java Interface.
We are not building Java tests, so we can drop junit4/hamcrest dependency for source/binary. Also the test code seems to depend on junit only.
d/test/*: I wonder if it would be possible to use AUTOPKGTEST_TMP instead of WORKDIR? This way we can avoid managing a temporary directory.
d/liblcm- java.links: Debian Java policy[1] requires /usr/share/ java/lcm- 1.5.jar to be file and lcm.jar - a link. (lintian warning bad-jar-name) -extraname] -fullversion. jar. The extraname is optional and used internally within the package to separate the different jars provided by the package. The fullversion is the version of that jar file. In some cases that is not the same as the package version.
---
Their classes must be in jar archive(s) in the directory /usr/share/java, with the name packagename[
--- [1]
d/rules: it would be nice to pass target release level to javac. This way we will future proof default java transitions. java/java_ defaults. mk in d/rules and set -DLCM_JAVA_ TARGET_ VERSION= $(java_ compat_ level) in the cmake parameters.
To do it add include /usr/share/
Note: I wonder if using cmake build system will allow to do it easier?
We also need to add -g to CMAKE_JAVA_ COMPILE_ FLAGS according to Debian Java policy[1]
---
Class files in a Java library must be built with debug symbols.
---
Some lintian warnings: lcm-logfilter] - probably either override or provide a man page path-segment lcm [usr/share/ doc/liblcm- dev/_build/ javadocs/ lcm/lcm/ ] - probably just override
W: liblcm-bin: no-manual-page [usr/bin/
P: liblcm-doc: repeated-
[1] https:/ /www.debian. org/doc/ packaging- manuals/ java-policy/ ch02.html# policy- libraries