Skip to content

Commit 1e2e250

Browse files
pre-commit-ci[bot]nim65s
pre-commit-ci[bot]
authored and
nim65s
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent d987eca commit 1e2e250

10 files changed

+4242
-113
lines changed

‎AUTHORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Authors:
1+
Authors:

‎CMakeLists.txt

+88-92
Original file line numberDiff line numberDiff line change
@@ -36,113 +36,109 @@ else()
3636
endif()
3737
endif()
3838

39-
4039
include("${JRL_CMAKE_MODULES}/hpp.cmake")
4140

42-
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
43-
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
41+
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
42+
project(${PROJECT_NAME} ${PROJECT_ARGS})
4443

45-
# Arguments are:
46-
# - (required) package name
47-
# - (optional) git url
48-
# - (optional) robotpkg name
49-
MACRO(ADD_PKG pkg)
50-
SET (OPT_ARGS ${ARGN})
51-
LIST(APPEND SETUP_DOC_PKG ${pkg})
52-
LIST(LENGTH OPT_ARGS N_OPT_ARGS)
53-
IF(${N_OPT_ARGS} GREATER 0)
54-
LIST(GET OPT_ARGS 0 ${pkg}_giturl)
55-
ENDIF(${N_OPT_ARGS} GREATER 0)
56-
IF(${N_OPT_ARGS} GREATER 1)
57-
LIST(GET OPT_ARGS 1 ${pkg}_robotpkg_package)
58-
ENDIF(${N_OPT_ARGS} GREATER 1)
59-
ENDMACRO(ADD_PKG)
44+
# Arguments are: - (required) package name - (optional) git url - (optional)
45+
# robotpkg name
46+
macro(ADD_PKG pkg)
47+
set(OPT_ARGS ${ARGN})
48+
list(APPEND SETUP_DOC_PKG ${pkg})
49+
list(LENGTH OPT_ARGS N_OPT_ARGS)
50+
if(${N_OPT_ARGS} GREATER 0)
51+
list(GET OPT_ARGS 0 ${pkg}_giturl)
52+
endif(${N_OPT_ARGS} GREATER 0)
53+
if(${N_OPT_ARGS} GREATER 1)
54+
list(GET OPT_ARGS 1 ${pkg}_robotpkg_package)
55+
endif(${N_OPT_ARGS} GREATER 1)
56+
endmacro(ADD_PKG)
6057

61-
MACRO(ADD_HPP_PKG pkg)
62-
ADD_PKG(${pkg} git+https://github.com:humanoid-path-planner/${pkg})
63-
ENDMACRO(ADD_HPP_PKG)
58+
macro(ADD_HPP_PKG pkg)
59+
add_pkg(${pkg} git+https://github.com:humanoid-path-planner/${pkg})
60+
endmacro(ADD_HPP_PKG)
6461

65-
SET(SETUP_DOC_PKG)
62+
set(SETUP_DOC_PKG)
6663

67-
ADD_HPP_PKG(hpp-fcl)
68-
ADD_HPP_PKG(hpp-util)
69-
ADD_HPP_PKG(hpp-statistics)
70-
ADD_HPP_PKG(pinocchio)
71-
ADD_HPP_PKG(hpp-pinocchio)
72-
ADD_HPP_PKG(hpp-core)
73-
ADD_HPP_PKG(hpp-corbaserver)
74-
ADD_HPP_PKG(hpp-constraints)
75-
ADD_HPP_PKG(hpp-manipulation)
76-
ADD_HPP_PKG(hpp-manipulation-urdf)
77-
ADD_HPP_PKG(hpp-manipulation-corba)
78-
ADD_HPP_PKG(gepetto-viewer)
79-
ADD_HPP_PKG(gepetto-viewer-corba)
80-
ADD_HPP_PKG(hpp-gepetto-viewer)
81-
ADD_HPP_PKG(hpp_tutorial)
64+
add_hpp_pkg(hpp-fcl)
65+
add_hpp_pkg(hpp-util)
66+
add_hpp_pkg(hpp-statistics)
67+
add_hpp_pkg(pinocchio)
68+
add_hpp_pkg(hpp-pinocchio)
69+
add_hpp_pkg(hpp-core)
70+
add_hpp_pkg(hpp-corbaserver)
71+
add_hpp_pkg(hpp-constraints)
72+
add_hpp_pkg(hpp-manipulation)
73+
add_hpp_pkg(hpp-manipulation-urdf)
74+
add_hpp_pkg(hpp-manipulation-corba)
75+
add_hpp_pkg(gepetto-viewer)
76+
add_hpp_pkg(gepetto-viewer-corba)
77+
add_hpp_pkg(hpp-gepetto-viewer)
78+
add_hpp_pkg(hpp_tutorial)
8279

83-
FOREACH(PKG ${SETUP_DOC_PKG})
84-
ADD_PROJECT_DEPENDENCY(${PKG})
80+
foreach(PKG ${SETUP_DOC_PKG})
81+
add_project_dependency(${PKG})
8582

86-
SET(PREFIX "${PKG}")
87-
SET(DOC_VAR "${PKG}")
88-
LIST(APPEND LOGGING_WATCHED_VARIABLES
89-
${PREFIX}_FOUND)
90-
IF(${PREFIX}_FOUND)
91-
IF(DEFINED ${PREFIX}_DOXYGENDOCDIR)
92-
SET(DOC_PREFIX ${${PREFIX}_DOXYGENDOCDIR})
93-
ELSEIF(DEFINED ${PREFIX}_DOCDIR)
94-
SET(DOC_PREFIX ${${PREFIX}_DOCDIR})
95-
ELSE(DEFINED ${PREFIX}_DOCDIR)
96-
SET(DOC_PREFIX ${${PREFIX}_PREFIX}/share/doc/${PKG}/doxygen-html)
97-
ENDIF(DEFINED ${PREFIX}_DOXYGENDOCDIR)
98-
STRING(REPLACE ${CMAKE_INSTALL_PREFIX}/share/doc ../.. DOC_PREFIX "${DOC_PREFIX}")
99-
IF (EXISTS ${DOC_PREFIX}/main.html)
100-
SET(${DOC_VAR}_URL ${DOC_PREFIX}/main.html)
101-
ELSE (EXISTS ${DOC_PREFIX}/main.html)
102-
SET(${DOC_VAR}_URL ${DOC_PREFIX}/index.html)
103-
ENDIF (EXISTS ${DOC_PREFIX}/main.html)
104-
SET(${DOC_VAR}_LINK "<a href='${${DOC_VAR}_URL}'>${PKG}</a>")
105-
ELSE(${PREFIX}_FOUND)
106-
SET(PACKAGE_NAME ${PKG})
107-
SET(DOC_PKG_NAME "hpp_doc_missing_${DOC_VAR}")
108-
SET(${DOC_VAR}_LINK "\\ref ${DOC_PKG_NAME}")
109-
SET(${DOC_VAR}_URL ${${DOC_VAR}_LINK})
110-
SET(STEPS)
111-
IF(DEFINED ${PKG}_giturl)
112-
SET(STEPS "${STEPS}\\li get the source code through \\c git:
83+
set(PREFIX "${PKG}")
84+
set(DOC_VAR "${PKG}")
85+
list(APPEND LOGGING_WATCHED_VARIABLES ${PREFIX}_FOUND)
86+
if(${PREFIX}_FOUND)
87+
if(DEFINED ${PREFIX}_DOXYGENDOCDIR)
88+
set(DOC_PREFIX ${${PREFIX}_DOXYGENDOCDIR})
89+
elseif(DEFINED ${PREFIX}_DOCDIR)
90+
set(DOC_PREFIX ${${PREFIX}_DOCDIR})
91+
else(DEFINED ${PREFIX}_DOCDIR)
92+
set(DOC_PREFIX ${${PREFIX}_PREFIX}/share/doc/${PKG}/doxygen-html)
93+
endif(DEFINED ${PREFIX}_DOXYGENDOCDIR)
94+
string(REPLACE ${CMAKE_INSTALL_PREFIX}/share/doc ../.. DOC_PREFIX
95+
"${DOC_PREFIX}")
96+
if(EXISTS ${DOC_PREFIX}/main.html)
97+
set(${DOC_VAR}_URL ${DOC_PREFIX}/main.html)
98+
else(EXISTS ${DOC_PREFIX}/main.html)
99+
set(${DOC_VAR}_URL ${DOC_PREFIX}/index.html)
100+
endif(EXISTS ${DOC_PREFIX}/main.html)
101+
set(${DOC_VAR}_LINK "<a href='${${DOC_VAR}_URL}'>${PKG}</a>")
102+
else(${PREFIX}_FOUND)
103+
set(PACKAGE_NAME ${PKG})
104+
set(DOC_PKG_NAME "hpp_doc_missing_${DOC_VAR}")
105+
set(${DOC_VAR}_LINK "\\ref ${DOC_PKG_NAME}")
106+
set(${DOC_VAR}_URL ${${DOC_VAR}_LINK})
107+
set(STEPS)
108+
if(DEFINED ${PKG}_giturl)
109+
set(STEPS
110+
"${STEPS}\\li get the source code through \\c git:
113111
\\code git clone --recursive ${${PKG}_giturl} \\endcode
114112
Then configure, compile and install the package.\n")
115-
ENDIF(DEFINED ${PKG}_giturl)
116-
IF(DEFINED ${PKG}_robotpkg_package)
117-
SET(STEPS "${STEPS}\\li install it through \\c robotpkg :
113+
endif(DEFINED ${PKG}_giturl)
114+
if(DEFINED ${PKG}_robotpkg_package)
115+
set(STEPS
116+
"${STEPS}\\li install it through \\c robotpkg :
118117
\\code
119118
cd robotpkg/${${PKG}_robotpkg_package}
120119
make update
121120
\\endcode")
122-
ENDIF(DEFINED ${PKG}_robotpkg_package)
123-
CONFIGURE_FILE(doc/missing.dox.in ${CMAKE_BINARY_DIR}/doc/${PKG}-missing.dox @ONLY)
124-
ENDIF(${PREFIX}_FOUND)
125-
LIST(APPEND LOGGING_WATCHED_VARIABLES ${DOC_VAR}_URL ${DOC_VAR}_LINK)
121+
endif(DEFINED ${PKG}_robotpkg_package)
122+
configure_file(doc/missing.dox.in
123+
${CMAKE_BINARY_DIR}/doc/${PKG}-missing.dox @ONLY)
124+
endif(${PREFIX}_FOUND)
125+
list(APPEND LOGGING_WATCHED_VARIABLES ${DOC_VAR}_URL ${DOC_VAR}_LINK)
126126

127-
ENDFOREACH(PKG ${SETUP_DOC_PKG})
127+
endforeach(PKG ${SETUP_DOC_PKG})
128128

129-
CONFIG_FILES(doc/main.dox doc/doxygenLayout.xml)
129+
config_files(doc/main.dox doc/doxygenLayout.xml)
130130

131-
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/graphDep.dot
132-
COMMAND ${CMAKE_SOURCE_DIR}/scripts/packageDep --quiet --output ${CMAKE_BINARY_DIR}/graphDep.dot ${SETUP_DOC_PKG})
133-
ADD_CUSTOM_TARGET(generate-html ALL
134-
DEPENDS graphDep.dot)
131+
add_custom_command(
132+
OUTPUT ${CMAKE_BINARY_DIR}/graphDep.dot
133+
COMMAND ${CMAKE_SOURCE_DIR}/scripts/packageDep --quiet --output
134+
${CMAKE_BINARY_DIR}/graphDep.dot ${SETUP_DOC_PKG})
135+
add_custom_target(generate-html ALL DEPENDS graphDep.dot)
135136

136-
INSTALL(FILES
137-
doc/index.html
138-
doc/jquery-3.3.1.min.js
139-
${CMAKE_BINARY_DIR}/doc/main.dox
140-
DESTINATION ${CMAKE_INSTALL_DOCDIR})
141-
INSTALL(DIRECTORY
142-
doc/figures
143-
DESTINATION ${CMAKE_INSTALL_DOCDIR})
144-
IF(NOT DEFINED INSTALL_DOCUMENTATION OR ${INSTALL_DOCUMENTATION})
145-
INSTALL(
146-
FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen-xml/index.xml
147-
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
148-
ENDIF()
137+
install(FILES doc/index.html doc/jquery-3.3.1.min.js
138+
${CMAKE_BINARY_DIR}/doc/main.dox
139+
DESTINATION ${CMAKE_INSTALL_DOCDIR})
140+
install(DIRECTORY doc/figures DESTINATION ${CMAKE_INSTALL_DOCDIR})
141+
if(NOT DEFINED INSTALL_DOCUMENTATION OR ${INSTALL_DOCUMENTATION})
142+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen-xml/index.xml
143+
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
144+
endif()

‎ChangeLog

+10-10
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,10 @@
288288
* bootstrap: New.
289289
* build-aux/bootstrap: New.
290290

291-
2009/04/30 Florent Lamiraux <florent@laas.fr>
291+
2009/04/30 Florent Lamiraux <florent@laas.fr>
292292

293293
* Fix link to kwsPlus
294-
294+
295295
2009/04/23 hppDoc-1.3 release
296296

297297
27. Add link to roboptim libraries.
@@ -300,14 +300,14 @@
300300
24. Added link to liboptimization
301301
23. Update link to hppCmpPlanner
302302
22. Update doc to recent changes
303-
303+
304304
2009/03/16 hppDoc-1.2 release
305305

306306
21. Update links to directories where html doc is now installed.
307307
20. Added link to cmake.
308308

309309
2009/02/03 hppDoc-1.1 release
310-
310+
311311
2008/06/19
312312
18. Added local information pages for packages not installed.
313313
17. Added picture illustrating walk planning on front page.
@@ -322,28 +322,28 @@
322322
2008/03/06
323323
11. Added link to hppTimingPlanner.
324324
10. Changed message when package is not installed.
325-
325+
326326
2008/02/22
327-
9. When package referenced in the documentation is not installed, the link
327+
9. When package referenced in the documentation is not installed, the link
328328
to this package is redirected to a page explaining how to install the package.
329-
329+
330330
2008/02/17
331331
8. Added a page briefly explaining autotools.
332332

333333
2008/02/07
334334
7. Some packages have been added.
335335
6. Documentation is not anymore produced by doxygen
336-
336+
337337
2007/10/31
338338
5. Reorganization of the main page and addition of a link to hppModel.
339339

340340
2007/10/02
341341
4. Correction of link to dynamicsJRLJapan.
342-
342+
343343
2007/10/01
344344
3. Added documentation page on development rules.
345345
2. Comment all dependences in configure.ac in order to be able to install the doc before the other packages.
346-
346+
347347
2007/04/25
348348
1. add the packages hppTutorialPlanner and kppTutorialPlanner
349349

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ It is recommended to create a specific directory to install this package.
99
mkdir build
1010
cd build
1111
cmake [OPTIONS] ..
12-
make
12+
make
1313
make install

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c)
2+
# Copyright (c)
33
#
44
# Permission to use, copy, modify, and distribute this software for any
55
# purpose with or without fee is hereby granted, provided that the above

‎doc/doxygenLayout.xml.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</tab>
1313
<tab type="classes" visible="yes" title="">
1414
<tab type="classlist" visible="yes" title="" intro=""/>
15-
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
15+
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
1616
<tab type="hierarchy" visible="yes" title="" intro=""/>
1717
<tab type="classmembers" visible="yes" title="" intro=""/>
1818
</tab>
1919
<tab type="files" visible="no" title="">
2020
<tab type="filelist" visible="yes" title="" intro=""/>
2121
<tab type="globals" visible="yes" title="" intro=""/>
2222
</tab>
23-
<tab type="examples" visible="yes" title="" intro=""/>
23+
<tab type="examples" visible="yes" title="" intro=""/>
2424
</navindex>
2525

2626
<!-- Layout definition for a class page -->

‎doc/doxygen_extra.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
div.dotgraph iframe[src="dot_graphDep.svg"]{
2-
width:100%;
1+
div.dotgraph iframe[src="dot_graphDep.svg"]{
2+
width:100%;
33
}

‎doc/jquery-3.3.1.min.js

+4,136-2
Large diffs are not rendered by default.

‎releases/additional-rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ release:
5555
git tag -d v${$(@:.remove-tag=)_version}; \
5656
fi
5757

58-
# if repository is HPP_REPO, print version of package
58+
# if repository is HPP_REPO, print version of package
5959
%.print-version:
6060
@cd ${SRC_DIR}/$(@:.print-version=); \
6161
if [ "${$(@:.print-version=)_repository}" = "${HPP_REPO}" ]; then \

‎scripts/packageDep

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencySet = set()
4343

4444

4545
def extractDep(inPkg):
46-
4746
packageSet.add(inPkg)
4847
depSet = set()
4948

0 commit comments

Comments
 (0)