From 619216fca4e3a9161c7c1d3014db05fc331eeec4 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 29 Jan 2015 16:12:01 -0500 Subject: [PATCH] Add build flag (-DskipDoc) to be able to skip building documentation Building documentation can take several minutes and is often not necessary. I suggest that we leave it on by default so that people building locally still get a full, consistent build of CDT but that it should be possible to skip it on demand. My build time went from 4:14s to 1:45s (without running tests). Change-Id: Ic7c4535f3faf82080534d39ccbe6f452d8b52317 Signed-off-by: Marc-Andre Laperle --- build/org.eclipse.cdt.autotools.docs/pom.xml | 82 +++++++++++-------- .../pom.xml | 76 ++++++++++------- doc/org.eclipse.cdt.doc.isv/pom.xml | 75 ++++++++++------- doc/org.eclipse.cdt.doc.user/pom.xml | 75 ++++++++++------- 4 files changed, 182 insertions(+), 126 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml index 879c4b3ebe3..7ffb3abb18b 100644 --- a/build/org.eclipse.cdt.autotools.docs/pom.xml +++ b/build/org.eclipse.cdt.autotools.docs/pom.xml @@ -14,39 +14,49 @@ 2.0.2-SNAPSHOT org.eclipse.cdt.autotools.docs eclipse-plugin - - - - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho-extras-version} - - -application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.ant.core - eclipse-plugin - - - - - - - eclipse-run - - compile - - - - - - \ No newline at end of file + + + + build-doc + + + !skipDoc + + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-extras-version} + + -application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index + + + org.apache.ant + eclipse-plugin + + + org.eclipse.help.base + eclipse-plugin + + + org.eclipse.ant.core + eclipse-plugin + + + + + + + eclipse-run + + compile + + + + + + + + diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml index 9508c587a22..f4bee761cc5 100644 --- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml +++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml @@ -31,36 +31,52 @@ - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho-extras-version} - - -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.ant.core - eclipse-plugin - - - - - - - eclipse-run - - compile - - - + + + + build-doc + + + !skipDoc + + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-extras-version} + + -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index + + + org.apache.ant + eclipse-plugin + + + org.eclipse.help.base + eclipse-plugin + + + org.eclipse.ant.core + eclipse-plugin + + + + + + + eclipse-run + + compile + + + + + + + + diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index 291f890a33d..36927f9169d 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -31,36 +31,51 @@ - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho-extras-version} - - -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.pde.core - eclipse-plugin - - - - - - - eclipse-run - - compile - - - + + + + build-doc + + + !skipDoc + + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-extras-version} + + -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml + + + org.apache.ant + eclipse-plugin + + + org.eclipse.help.base + eclipse-plugin + + + org.eclipse.pde.core + eclipse-plugin + + + + + + + eclipse-run + + compile + + + + + + + diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml index 6ef850ee96d..5da7a6d9526 100644 --- a/doc/org.eclipse.cdt.doc.user/pom.xml +++ b/doc/org.eclipse.cdt.doc.user/pom.xml @@ -31,36 +31,51 @@ - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho-extras-version} - - -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.ant.core - eclipse-plugin - - - - - - - eclipse-run - - compile - - - + + + + build-doc + + + !skipDoc + + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-extras-version} + + -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index + + + org.apache.ant + eclipse-plugin + + + org.eclipse.help.base + eclipse-plugin + + + org.eclipse.ant.core + eclipse-plugin + + + + + + + eclipse-run + + compile + + + + + + +