Mercurial > hg > release > thermostat-1.2

changeset 1346:4e2e542944c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow building javadocs with make Reviewed-by: neugens, vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008700.html
author Omair Majid <omajid@redhat.com>
date Tue, 19 Nov 2013 19:37:34 -0500
parents 3aa499424889
children 20819761e99d
files Makefile pom.xml
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Nov 19 19:35:47 2013 -0500
+++ b/Makefile	Tue Nov 19 19:37:34 2013 -0500
@@ -2,6 +2,7 @@
 JAVAC           ?= javac
 MAVEN           ?= mvn
 SKIP_TESTS      ?= false
+BUILD_DOCS      ?= false
 REPO_LOC        ?= $(HOME)/.thermostat-build/mvn_repository/
 MAVEN_FLAGS     ?= 
 USE_VNC         ?= false
@@ -22,6 +23,10 @@
 	MAVEN_SKIP_TEST = -Dmaven.test.skip=true
 endif
 
+ifeq ($(BUILD_DOCS),true)
+    MAVEN_JAVADOC = javadoc:aggregate
+endif
+
 ifeq ($(USE_VNC),true)
 	DISPLAY = $(VNC_DISPLAY)
 endif
@@ -32,10 +37,10 @@
 all: clean-repo eclipse eclipse-test
 
 core:
-	$(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(MAVEN_SKIP_TEST) clean $(GOAL)
+	$(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(MAVEN_SKIP_TEST) clean $(GOAL) $(MAVEN_JAVADOC)
 
 core-install: create-repo-dir
-	$(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install
+	$(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install $(MAVEN_JAVADOC)
 
 copy-core-natives: core-install
 	if [ "_$(ARCH)" = "_x86_64" ]; then \
--- a/pom.xml	Tue Nov 19 19:35:47 2013 -0500
+++ b/pom.xml	Tue Nov 19 19:37:34 2013 -0500
@@ -218,6 +218,14 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+          <configuration>
+            <excludePackageNames>*.impl.*;*.internal.*</excludePackageNames>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
           <version>2.7</version>
           <configuration>