diff --git a/.travis.yml b/.travis.yml index 5c9a04ef..8d563b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ after_success: - if [ "$TRAVIS_BRANCH" == "master" ]; then cd /tmp/euslisp-docs; git remote rm origin; git remote add origin https://k-okada:$GH_TOKEN@github.com/jsk-ros-pkg/euslisp-docs.git; fi - if [ "$TRAVIS_BRANCH" == "master" ]; then cd ${CI_SOURCE_PATH}/doc/latex; ${CI_SOURCE_PATH}/.upload-doc.sh; fi - if [ "$TRAVIS_BRANCH" == "master" ]; then mkdir -p /tmp/euslisp-docs/docs/euslisp; cd /tmp/euslisp-docs/docs/euslisp; cp /tmp/html/*.{md,png} .; fi - - if [ "$TRAVIS_BRANCH" == "master" ]; then git add *.md; git commit -m "Update euslisp form https://github.com/$TRAVIS_REPO_SLUG/tree/$TRAVIS_COMMIT"; git push -fq origin master; fi + - if [ "$TRAVIS_BRANCH" == "master" ]; then git add *.md *.png; git commit -m "Update euslisp form https://github.com/$TRAVIS_REPO_SLUG/tree/$TRAVIS_COMMIT"; git push -fq origin master; fi diff --git a/.upload-doc.sh b/.upload-doc.sh index 2227ed9e..bbc3889a 100755 --- a/.upload-doc.sh +++ b/.upload-doc.sh @@ -2,6 +2,7 @@ rm -fr /tmp/html mkdir -p /tmp/html +sed -i 's@^\(\\tableofcontents\)@% \1@' manual.tex latex2html -dir /tmp/html/ -local_icons -auto_prefix -iso_language JP manual -split 1 -no_navigation # euslisp-docs, generate markdown from pandoc sudo apt-get install -qq -y pandoc diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 638eee2c..00000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,76 +0,0 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html -cmake_minimum_required(VERSION 2.8.3) -project(euslisp) - -find_package(catkin) - -# check arch and os -execute_process(COMMAND bash -c "gcc -dumpmachine" OUTPUT_VARIABLE gcc_dump_machine OUTPUT_STRIP_TRAILING_WHITESPACE) -message("-- gcc dumpmachine returns ${gcc_dump_machine}") -if(gcc_dump_machine MATCHES "x86_64-linux-.*") - set(ARCHDIR "Linux64") - set(MAKEFILE "Makefile.Linux64") -elseif(gcc_dump_machine MATCHES "i686-linux-.*") - set(ARCHDIR "Linux") - set(MAKEFILE "Makefile.Linux.thread") -elseif(gcc_dump_machine MATCHES "arm.*-.*") - set(ARCHDIR "LinuxARM") - set(MAKEFILE "Makefile.LinuxARM") -elseif(gcc_dump_machine MATCHES "cygwin.*-.*") - set(ARCHDIR "Cygwin") - set(MAKEFILE "Makefile.Cygwin") -elseif(gcc_dump_machine MATCHES ".*darwin.*") - set(ARCHDIR "Darwin") - set(MAKEFILE "Makefile.Darwin") -else() - message(FATAL_ERROR "-- -- This machine is not supported") -endif() - -# build euslisp -add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/lisp/Makefile - COMMAND cmake -E create_symlink ${MAKEFILE} Makefile - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lisp/) -add_custom_target(compile_euslisp ALL - DEPENDS ${PROJECT_SOURCE_DIR}/lisp/Makefile - COMMAND export EUSDIR=${PROJECT_SOURCE_DIR} lt_cv_sys_lib_dlsearch_path_spec=${lt_cv_sys_lib_dlsearch_path_spec} LD_LIBRARY_PATH=${PROJECT_SOURCE_DIR}/${ARCHDIR}/lib:\$LD_LIBRARY_PATH && \$\(MAKE\) -C ${PROJECT_SOURCE_DIR}/lisp -f Makefile EUSRPATH=) - -add_custom_target(install_euslisp - COMMAND export EUSDIR=${PROJECT_SOURCE_DIR} lt_cv_sys_lib_dlsearch_path_spec=${lt_cv_sys_lib_dlsearch_path_spec} LD_LIBRARY_PATH=${PROJECT_SOURCE_DIR}/${ARCHDIR}/lib:\$LD_LIBRARY_PATH && ${CMAKE_COMMAND} -E make_directory \${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin && \$\(MAKE\) -C ${PROJECT_SOURCE_DIR}/lisp -f Makefile install PUBBINDIR=\${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin) - -install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build . --target install_euslisp)") -install(DIRECTORY contrib doc lib lisp models ${ARCHDIR} - DESTINATION share/euslisp/jskeus/eus/ - USE_SOURCE_PERMISSIONS) -install(FILES package.xml DESTINATION share/euslisp/) -install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink lisp/c include WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/euslisp/jskeus/eus/)") - -catkin_package(CFG_EXTRAS euslisp-extras.cmake) -catkin_add_env_hooks(99.euslisp SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) - -string(REGEX MATCH "catkin" need_catkin "$ENV{_}") -get_filename_component(install_dir_name ${CMAKE_INSTALL_PREFIX} NAME) -if(need_catkin AND NOT install_dir_name MATCHES "install") # check if install_prefix end with /install, we can remove this section of we remove all rosrun euslisp ... usage - install(CODE " -## this is tricky force write catkin marker file -set(_catkin_marker_file \"\${CMAKE_INSTALL_PREFIX}/.catkin\") -# check if the develspace marker file exists yet -if(EXISTS \${_catkin_marker_file}) - file(READ \${_catkin_marker_file} _existing_sourcespaces) - if(_existing_sourcespaces STREQUAL \"\") - # write this sourcespace to the marker file - file(WRITE \${_catkin_marker_file} \"${CMAKE_INSTALL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}\") - else() - # append to existing list of sourcespaces if it's not in the list - list(FIND _existing_sourcespaces \"${CMAKE_INSTALL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}\" _existing_sourcespace_index) - if(_existing_sourcespace_index EQUAL -1) - file(APPEND \${_catkin_marker_file} \";${CMAKE_INSTALL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}\") - endif() - endif() -else() - # create a new develspace marker file - # NOTE: extra care must be taken when running multiple catkin jobs in parallel - # so that this does not overwrite the result of a similar call in another package - file(WRITE \${_catkin_marker_file} \"${CMAKE_INSTALL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}\") -endif() -") -endif() diff --git a/cmake/euslisp-extras.cmake.in b/cmake/euslisp-extras.cmake.in deleted file mode 100644 index b07f5f52..00000000 --- a/cmake/euslisp-extras.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -# euslisp.cmake -set(EUSDIR @CMAKE_INSTALL_PREFIX@/share/euslisp/jskeus/eus) -set(ARCHDIR @ARCHDIR@) -set(euslisp_INCLUDE_DIRS ${EUSDIR}/include) -message("-- set EUSDIR to ${EUSDIR}") -message("-- set ARCHDIR to ${ARCHDIR}") - diff --git a/doc/HISTORY b/doc/HISTORY index 87fc7e73..c10d4e63 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -526,4 +526,9 @@ fix to work on class documentation (common.l) lisp/l/packsym.l raise error when intsymvector is full, which previouusly go into infinite loop 2015-Jun ; version 9.14 - fix assert API. Now message is optional (defmacro assert (pred &optional message) \ No newline at end of file + fix assert API. Now message is optional (defmacro assert (pred &optional message) +2015-Aug ; version 9.15 + fix char comparison function (previous version retuns opossite result) + support multiple argument at function /= + add url encode feature (escape-url function) + support microsecond add/subtract in interval-time class \ No newline at end of file diff --git a/doc/html/jmanual-footnode.html b/doc/html/jmanual-footnode.html index e2b52997..120cbaf6 100644 --- a/doc/html/jmanual-footnode.html +++ b/doc/html/jmanual-footnode.html @@ -64,7 +64,7 @@ . -