[openrtm-commit:02685] r753 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder: manager template template/cmake template/cmake/doc
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 7月 13日 (木) 12:19:17 JST
Author: ga
Date: 2017-07-13 12:19:17 +0900 (Thu, 13 Jul 2017)
New Revision: 753
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/Doxyfile.in.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl
Log:
Modified CMakeLists.txt #4135
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-07-13 02:34:42 UTC (rev 752)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-07-13 03:19:17 UTC (rev 753)
@@ -22,10 +22,7 @@
protected static final String MSG_ERROR_GENERATE_FILE = IRTCBMessageConstants.ERROR_CODE_GENERATION;
- protected String DOXYGEN_FILE_PATTERNS;
-
public CMakeGenerateManager() {
- DOXYGEN_FILE_PATTERNS = "*.cpp *.h *.idl";
}
@Override
@@ -69,7 +66,6 @@
map.put("template", TEMPLATE_PATH);
map.put("rtcParam", rtcParam);
map.put("helper", new TemplateHelper());
- map.put("DOXYGEN_FILE_PATTERNS", DOXYGEN_FILE_PATTERNS);
return map;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2017-07-13 02:34:42 UTC (rev 752)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2017-07-13 03:19:17 UTC (rev 753)
@@ -2,11 +2,11 @@
import java.io.File;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
-
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.StringUtil.*;
@@ -115,6 +115,10 @@
return source.contains("::");
}
+ public boolean isCpp(RtcParam source) {
+ return source.getLangList().contains(IRtcBuilderConstants.LANG_CPP);
+ }
+
public static String getServiceImplSuffix() {
return DEFAULT_SVC_IMPL_SUFFIX;
}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/Doxyfile.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/Doxyfile.in.vsl 2017-07-13 02:34:42 UTC (rev 752)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/Doxyfile.in.vsl 2017-07-13 03:19:17 UTC (rev 753)
@@ -1,487 +0,0 @@
-
-${sharp} Project related configuration options
-
-DOXYFILE_ENCODING = UTF-8
-
-PROJECT_NAME = @PACKAGE_NAME@
-
-PROJECT_NUMBER = @PACKAGE_VERSION@
-
-OUTPUT_DIRECTORY = doc
-
-CREATE_SUBDIRS = NO
-
-OUTPUT_LANGUAGE = Japanese
-
-BRIEF_MEMBER_DESC = YES
-
-REPEAT_BRIEF = YES
-
-ABBREVIATE_BRIEF =
-
-ALWAYS_DETAILED_SEC = NO
-
-INLINE_INHERITED_MEMB = NO
-
-FULL_PATH_NAMES = YES
-
-STRIP_FROM_PATH =
-
-STRIP_FROM_INC_PATH =
-
-SHORT_NAMES = NO
-
-JAVADOC_AUTOBRIEF = NO
-
-QT_AUTOBRIEF = NO
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-INHERIT_DOCS = YES
-
-SEPARATE_MEMBER_PAGES = NO
-
-TAB_SIZE = 8
-
-ALIASES =
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-EXTENSION_MAPPING =
-
-BUILTIN_STL_SUPPORT = NO
-
-CPP_CLI_SUPPORT = NO
-
-SIP_SUPPORT = NO
-
-IDL_PROPERTY_SUPPORT = YES
-
-DISTRIBUTE_GROUP_DOC = NO
-
-SUBGROUPING = YES
-
-TYPEDEF_HIDES_STRUCT = NO
-
-SYMBOL_CACHE_SIZE = 0
-
-
-${sharp} Build related configuration options
-
-EXTRACT_ALL = NO
-
-EXTRACT_PRIVATE = NO
-
-EXTRACT_STATIC = NO
-
-EXTRACT_LOCAL_CLASSES = YES
-
-EXTRACT_LOCAL_METHODS = NO
-
-EXTRACT_ANON_NSPACES = NO
-
-HIDE_UNDOC_MEMBERS = NO
-
-HIDE_UNDOC_CLASSES = NO
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-HIDE_IN_BODY_DOCS = NO
-
-INTERNAL_DOCS = NO
-
-CASE_SENSE_NAMES = NO
-
-HIDE_SCOPE_NAMES = NO
-
-SHOW_INCLUDE_FILES = YES
-
-FORCE_LOCAL_INCLUDES = NO
-
-INLINE_INFO = YES
-
-SORT_MEMBER_DOCS = YES
-
-SORT_BRIEF_DOCS = NO
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-SORT_GROUP_NAMES = NO
-
-SORT_BY_SCOPE_NAME = YES
-
-GENERATE_TODOLIST = YES
-
-GENERATE_TESTLIST = YES
-
-GENERATE_BUGLIST = YES
-
-GENERATE_DEPRECATEDLIST = YES
-
-ENABLED_SECTIONS =
-
-MAX_INITIALIZER_LINES = 30
-
-SHOW_USED_FILES = YES
-
-SHOW_DIRECTORIES = NO
-
-SHOW_FILES = YES
-
-SHOW_NAMESPACES = YES
-
-FILE_VERSION_FILTER =
-
-LAYOUT_FILE =
-
-
-${sharp} configuration options related to warning and progress messages
-
-QUIET = NO
-
-WARNINGS = YES
-
-WARN_IF_UNDOCUMENTED = YES
-
-WARN_IF_DOC_ERROR = YES
-
-WARN_NO_PARAMDOC = NO
-
-WARN_FORMAT = "${dol}file:${dol}line: ${dol}text"
-
-WARN_LOGFILE =
-
-
-${sharp} configuration options related to the input files
-
-INPUT = @CMAKE_CURRENT_SOURCE_DIR@
-
-INPUT_ENCODING = UTF-8
-
-FILE_PATTERNS = ${DOXYGEN_FILE_PATTERNS}
-
-RECURSIVE = YES
-
-EXCLUDE = _CPack_Packages
-
-EXCLUDE_SYMLINKS = NO
-
-EXCLUDE_PATTERNS = .svn .git
-
-EXCLUDE_SYMBOLS =
-
-EXAMPLE_PATH =
-
-EXAMPLE_PATTERNS =
-
-EXAMPLE_RECURSIVE = NO
-
-IMAGE_PATH =
-
-INPUT_FILTER =
-
-FILTER_PATTERNS =
-
-FILTER_SOURCE_FILES = NO
-
-
-${sharp} configuration options related to source browsing
-
-SOURCE_BROWSER = NO
-
-INLINE_SOURCES = NO
-
-STRIP_CODE_COMMENTS = YES
-
-REFERENCED_BY_RELATION = NO
-
-REFERENCES_RELATION = NO
-
-REFERENCES_LINK_SOURCE = YES
-
-USE_HTAGS = NO
-
-VERBATIM_HEADERS = YES
-
-
-${sharp} configuration options related to the alphabetical class index
-
-ALPHABETICAL_INDEX = YES
-
-COLS_IN_ALPHA_INDEX = 5
-
-IGNORE_PREFIX =
-
-
-${sharp} configuration options related to the HTML output
-
-GENERATE_HTML = YES
-
-HTML_OUTPUT = html
-
-HTML_FILE_EXTENSION = .html
-
-HTML_HEADER =
-
-HTML_FOOTER =
-
-HTML_STYLESHEET =
-
-HTML_COLORSTYLE_HUE = 220
-
-HTML_COLORSTYLE_SAT = 100
-
-HTML_COLORSTYLE_GAMMA = 80
-
-HTML_TIMESTAMP = YES
-
-HTML_ALIGN_MEMBERS = YES
-
-HTML_DYNAMIC_SECTIONS = NO
-
-GENERATE_DOCSET = NO
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-GENERATE_HTMLHELP = NO
-
-CHM_FILE =
-
-HHC_LOCATION =
-
-GENERATE_CHI = NO
-
-CHM_INDEX_ENCODING =
-
-BINARY_TOC = NO
-
-TOC_EXPAND = NO
-
-GENERATE_QHP = NO
-
-QCH_FILE =
-
-QHP_NAMESPACE = org.doxygen.Project
-
-QHP_VIRTUAL_FOLDER = doc
-
-QHP_CUST_FILTER_NAME =
-
-QHP_CUST_FILTER_ATTRS =
-
-QHP_SECT_FILTER_ATTRS =
-
-QHG_LOCATION =
-
-GENERATE_ECLIPSEHELP = NO
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-DISABLE_INDEX = NO
-
-ENUM_VALUES_PER_LINE = 4
-
-GENERATE_TREEVIEW = NO
-
-USE_INLINE_TREES = NO
-
-TREEVIEW_WIDTH = 250
-
-EXT_LINKS_IN_WINDOW = NO
-
-FORMULA_FONTSIZE = 10
-
-FORMULA_TRANSPARENT = YES
-
-SEARCHENGINE = YES
-
-SERVER_BASED_SEARCH = NO
-
-
-${sharp} configuration options related to the LaTeX output
-
-GENERATE_LATEX = NO
-
-LATEX_OUTPUT = latex
-
-LATEX_CMD_NAME = latex
-
-MAKEINDEX_CMD_NAME = makeindex
-
-COMPACT_LATEX = NO
-
-PAPER_TYPE = a4wide
-
-EXTRA_PACKAGES =
-
-LATEX_HEADER =
-
-PDF_HYPERLINKS = YES
-
-USE_PDFLATEX = YES
-
-LATEX_BATCHMODE = NO
-
-LATEX_HIDE_INDICES = NO
-
-LATEX_SOURCE_CODE = NO
-
-
-${sharp} configuration options related to the RTF output
-
-GENERATE_RTF = NO
-
-RTF_OUTPUT = rtf
-
-COMPACT_RTF = NO
-
-RTF_HYPERLINKS = NO
-
-RTF_STYLESHEET_FILE =
-
-RTF_EXTENSIONS_FILE =
-
-
-${sharp} configuration options related to the man page output
-
-GENERATE_MAN = NO
-
-MAN_OUTPUT = man
-
-MAN_EXTENSION = .3
-
-MAN_LINKS = NO
-
-
-${sharp} configuration options related to the XML output
-
-GENERATE_XML = NO
-
-XML_OUTPUT = xml
-
-XML_SCHEMA =
-
-XML_DTD =
-
-XML_PROGRAMLISTING = YES
-
-
-${sharp} configuration options for the AutoGen Definitions output
-
-GENERATE_AUTOGEN_DEF = NO
-
-
-${sharp} configuration options related to the Perl module output
-
-GENERATE_PERLMOD = NO
-
-PERLMOD_LATEX = NO
-
-PERLMOD_PRETTY = YES
-
-PERLMOD_MAKEVAR_PREFIX =
-
-
-${sharp} Configuration options related to the preprocessor
-
-ENABLE_PREPROCESSING = YES
-
-MACRO_EXPANSION = NO
-
-EXPAND_ONLY_PREDEF = NO
-
-SEARCH_INCLUDES = YES
-
-INCLUDE_PATH =
-
-INCLUDE_FILE_PATTERNS =
-
-PREDEFINED =
-
-EXPAND_AS_DEFINED =
-
-SKIP_FUNCTION_MACROS = YES
-
-
-${sharp} Configuration::additions related to external references
-
-TAGFILES =
-
-GENERATE_TAGFILE =
-
-ALLEXTERNALS = NO
-
-EXTERNAL_GROUPS = YES
-
-PERL_PATH = /usr/bin/perl
-
-
-${sharp} Configuration options related to the dot tool
-
-CLASS_DIAGRAMS = YES
-
-MSCGEN_PATH =
-
-HIDE_UNDOC_RELATIONS = YES
-
-HAVE_DOT = NO
-
-DOT_NUM_THREADS = 0
-
-DOT_FONTNAME = FreeSans.ttf
-
-DOT_FONTSIZE = 10
-
-DOT_FONTPATH =
-
-CLASS_GRAPH = YES
-
-COLLABORATION_GRAPH = YES
-
-GROUP_GRAPHS = YES
-
-UML_LOOK = YES
-
-TEMPLATE_RELATIONS = NO
-
-INCLUDE_GRAPH = YES
-
-INCLUDED_BY_GRAPH = YES
-
-CALL_GRAPH = NO
-
-CALLER_GRAPH = NO
-
-GRAPHICAL_HIERARCHY = YES
-
-DIRECTORY_GRAPH = YES
-
-DOT_IMAGE_FORMAT = png
-
-DOT_PATH =
-
-DOTFILE_DIRS =
-
-DOT_GRAPH_MAX_NODES = 50
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-DOT_TRANSPARENT = NO
-
-DOT_MULTI_TARGETS = NO
-
-GENERATE_LEGEND = YES
-
-DOT_CLEANUP = YES
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl 2017-07-13 02:34:42 UTC (rev 752)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl 2017-07-13 03:19:17 UTC (rev 753)
@@ -26,8 +26,8 @@
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@/include
+STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@
+STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = NO
@@ -38,7 +38,11 @@
ALIASES =
TCL_SUBST =
OPTIMIZE_OUTPUT_FOR_C = NO
+#if( $tmpltHelper.isCpp(${rtcParam}) )
OPTIMIZE_OUTPUT_JAVA = NO
+#else
+OPTIMIZE_OUTPUT_JAVA = YES
+#end
OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
EXTENSION_MAPPING =
@@ -117,6 +121,8 @@
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.h \
*.hpp \
+ *.py \
+ *.idl \
*.doxy
RECURSIVE = YES
EXCLUDE = "@PROJECT_SOURCE_DIR@/cmake" \
@@ -128,9 +134,9 @@
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
-INPUT_FILTER =
+INPUT_FILTER = "nkf -w"
FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
+FILTER_SOURCE_FILES = YES
FILTER_SOURCE_PATTERNS =
USE_MDFILE_AS_MAINPAGE =
More information about the openrtm-commit
mailing list