mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Bug 537924: Unable to build javadoc maven target
Turns off doclint for Java 1.8 and greater because the javadocs are incomplete and won't build otherwise. Some files also had encoding issues with some characters which caused the javadoc build to fail, these characters have been replaced. Change-Id: I04690644bec6d7c3219cb0438cb3db6593fefd3a Signed-off-by: Hansruedi Patzen <hansruedi.patzen@hsr.ch>
This commit is contained in:
parent
1983d41afb
commit
cb47ef4c65
4 changed files with 14 additions and 4 deletions
|
@ -160,7 +160,7 @@ class MacroDefinitionRule implements IPredicateRule {
|
|||
|
||||
protected boolean isValidCharacter(int c) {
|
||||
// From GNUMakefile manual:
|
||||
// A variable name may be any sequence of characters not containing ‘:’, ‘#’, ‘=’, or leading or trailing whitespace.
|
||||
// A variable name may be any sequence of characters not containing ':', '#', '=', or leading or trailing whitespace.
|
||||
// However, variable names containing characters other than letters, numbers, and underscores should be avoided,
|
||||
// as they may be given special meanings in the future, and with some shells they cannot be passed through the environment to a sub-make
|
||||
return !Character.isWhitespace(c) && c != ':' && c != '#' && c != '=';
|
||||
|
|
|
@ -201,7 +201,7 @@ public class GCCErrorParserTests extends GenericErrorParserTests {
|
|||
public void testGccErrorMessages_RequiredFromHere() throws IOException {
|
||||
runParserTest(
|
||||
new String[] {
|
||||
"utils/bar.hpp:61:7: required from ‘static void OpenCVUtils::show_contours_d(std::string, cv::Mat&, const std::vector<std::vector<cv::Point_<_Tp> > >&, bool, const Scalar&, int, int, int) [with T = int; std::string = std::basic_string<char>; cv::Scalar = cv::Scalar_<double>]’",
|
||||
"utils/bar.hpp:61:7: required from 'static void OpenCVUtils::show_contours_d(std::string, cv::Mat&, const std::vector<std::vector<cv::Point_<_Tp> > >&, bool, const Scalar&, int, int, int) [with T = int; std::string = std::basic_string<char>; cv::Scalar = cv::Scalar_<double>]'",
|
||||
"utils/foo.cpp:117:96: required from here",
|
||||
},
|
||||
0, // errors
|
||||
|
@ -212,7 +212,7 @@ public class GCCErrorParserTests extends GenericErrorParserTests {
|
|||
"foo.cpp",
|
||||
},
|
||||
new String[] {
|
||||
"required from ‘static void OpenCVUtils::show_contours_d(std::string, cv::Mat&, const std::vector<std::vector<cv::Point_<_Tp> > >&, bool, const Scalar&, int, int, int) [with T = int; std::string = std::basic_string<char>; cv::Scalar = cv::Scalar_<double>]’",
|
||||
"required from 'static void OpenCVUtils::show_contours_d(std::string, cv::Mat&, const std::vector<std::vector<cv::Point_<_Tp> > >&, bool, const Scalar&, int, int, int) [with T = int; std::string = std::basic_string<char>; cv::Scalar = cv::Scalar_<double>]'",
|
||||
"required from here",
|
||||
},
|
||||
new String[] {GCC_ERROR_PARSER_ID}
|
||||
|
|
|
@ -320,7 +320,7 @@ public class LlvmToolOptionPathUtil {
|
|||
return configurations;
|
||||
}
|
||||
//info can be null for projects without build info. For example, when creating a project
|
||||
//from Import >�C/C++ Executable
|
||||
//from Import > C/C++ Executable
|
||||
if(info == null) {
|
||||
return configurations;
|
||||
}
|
||||
|
|
10
pom.xml
10
pom.xml
|
@ -268,6 +268,16 @@
|
|||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
<profiles>
|
||||
<!-- Turn off doclint because javadocs are incomplete -->
|
||||
<profile>
|
||||
<id>disable-java8-doclint</id>
|
||||
<activation>
|
||||
<jdk>[1.8,)</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<doclint>none</doclint>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>cdtRepo</id>
|
||||
<repositories>
|
||||
|
|
Loading…
Add table
Reference in a new issue