integrate doc plugin/feature to mvn build

Signed-off-by: wyan <[email protected]>
franczx · May 6, 2015 · 718ce10 · 718ce10
1 parent 98e7493
commit 718ce10
Show file tree

Hide file tree

Showing 7 changed files with 162 additions and 21 deletions.
diff --git a/docs/org.eclipse.birt.chart.doc.isv/BuildChartISVDoc.xml b/docs/org.eclipse.birt.chart.doc.isv/BuildChartISVDoc.xml
@@ -193,11 +193,13 @@
 
  <!-- Generate the JavaDoc.
  -->
- <target name="Javadoc">
- <echo message="generating javadoc for chart"/>
- <antcall target = "chartJavadoc"/>
- <antcall target = "chartuiJavadoc"/>
- <antcall target = "chartscriptJavadoc"/>
+ <target name="Javadoc" depends="chartJavadoc, chartuiJavadoc, chartscriptJavadoc">
+ <echo message="generating javadoc for chart"/>
+ <!--
+ <antcall target = "chartJavadoc"/>
+ <antcall target = "chartuiJavadoc"/>
+ <antcall target = "chartscriptJavadoc"/>
+ -->
  <!-- replace onLoad="top.loadFrames()" with onLoad="", this javascript messes things up with viewvc params -->
  <replace file="chart/api/index.html">
  <replacetoken><![CDATA[onLoad="top.loadFrames()"]]></replacetoken>

diff --git a/docs/org.eclipse.birt.chart.doc.isv/pom.xml b/docs/org.eclipse.birt.chart.doc.isv/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
  <groupId>org.eclipse.birt</groupId>
@@ -12,4 +11,75 @@
  <artifactId>org.eclipse.birt.chart.doc.isv</artifactId>
  <version>4.5.0-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.chart.engine</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.chart.ui</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.chart.reportitem</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="chart.src.dir" location="${basedir}/../../chart/"/>
+ <ant antfile="${basedir}/BuildChartISVDoc.xml" target="Javadoc">
+ <reference refid="maven.compile.classpath" torefid="class.path"/>
+ <property name="BranchVersion" value="${project.version}"/>
+ <property name="chartengine.dir" value="${chart.src.dir}/org.eclipse.birt.chart.engine"/>
+ <property name="chartengine.ext.dir" value="${chart.src.dir}/org.eclipse.birt.chart.engine.extension"/>
+ <property name="chartexamples.dir" value="${chart.src.dir}/org.eclipse.birt.chart.examples"/>
+ <property name="chartui.dir" value="${chart.src.dir}/org.eclipse.birt.chart.ui"/>
+ <property name="chartreportitem.dir" value="${chart.src.dir}/org.eclipse.birt.chart.reportitem"/>
+ <property name="model.dir" value="${chart.src.dir}/org.eclipse.birt.report.model"/>
+ </ant>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <ant antfile="${basedir}/BuildChartISVDoc.xml" target="Clean"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
 </project>
diff --git a/docs/org.eclipse.birt.doc.isv/BuildISVDoc.xml b/docs/org.eclipse.birt.doc.isv/BuildISVDoc.xml
@@ -184,13 +184,15 @@
  </target>
 
  <!-- Generate the JavaDoc. -->
- <target name="Javadoc">
- <echo message="generating javadoc for birt"/>
+ <target name="Javadoc" depends="engineJavadoc, engineScriptJavadoc, modelJavadoc, coreJavadoc, coreuiJavadoc">
+ <echo message="generating javadoc for birt"/>
+ <!--
  <antcall target = "engineJavadoc"/>
  <antcall target = "engineScriptJavadoc"/>
  <antcall target = "modelJavadoc"/>
  <antcall target = "coreJavadoc"/>
- <antcall target = "coreuiJavadoc"/>
+ <antcall target = "coreuiJavadoc"/>
+ -->
  <!-- replace onLoad="top.loadFrames()" with onLoad="", this javascript messes things up with in eclipse help -->
  <replace file="engine/api/index.html">
  <replacetoken><![CDATA[onLoad="top.loadFrames()"]]></replacetoken>

diff --git a/docs/org.eclipse.birt.doc.isv/build.properties b/docs/org.eclipse.birt.doc.isv/build.properties
@@ -8,11 +8,9 @@ bin.includes = META-INF/,\
  notices.html,\
  plugin.xml,\
  RefToc.xml,\
- data/,\
  doc/,\
  engine/,\
  enginescript/,\
- oda/,\
  model/,\
  core/,\
  coreui/,\

diff --git a/docs/org.eclipse.birt.doc.isv/pom.xml b/docs/org.eclipse.birt.doc.isv/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
  <groupId>org.eclipse.birt</groupId>
@@ -12,4 +11,80 @@
  <artifactId>org.eclipse.birt.doc.isv</artifactId>
  <version>4.5.0-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.core</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.core.ui</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.report.model</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.birt.report.engine</id>
+ <versionRange>1.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="core.src.dir" location="${basedir}/../../core/"/>
+ <property name="engine.src.dir" location="${basedir}/../../engine/"/>
+ <property name="model.src.dir" location="${basedir}/../../model/"/>
+ <ant antfile="${basedir}/BuildISVDoc.xml" target="Javadoc">
+ <reference refid="maven.compile.classpath" torefid="class.path"/>
+ <property name="BranchVersion" value="${project.version}"/>
+ <property name="core.dir" value="${core.src.dir}/org.eclipse.birt.core"/>
+ <property name="core.ui.dir" value="${core.src.dir}/org.eclipse.birt.core.ui"/>
+ <property name="engine.dir" value="${engine.src.dir}/org.eclipse.birt.report.engine"/>
+ <property name="model.dir" value="${model.src.dir}/org.eclipse.birt.report.model"/>
+ </ant>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <ant antfile="${basedir}/BuildISVDoc.xml" target="cleanBuild"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
 </project>
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -15,12 +15,10 @@
  <packaging>pom</packaging>
 
  <modules>
- <!--
  <module>org.eclipse.birt.chart.cshelp</module>
  <module>org.eclipse.birt.chart.doc.isv</module>
  <module>org.eclipse.birt.cshelp</module>
  <module>org.eclipse.birt.doc</module>
  <module>org.eclipse.birt.doc.isv</module>
- -->
  </modules>
-</project>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
@@ -15,19 +15,15 @@
  <packaging>pom</packaging>
 
  <modules>
- <!--
  <module>org.eclipse.birt.chart.cshelp.feature</module>
  <module>org.eclipse.birt.chart.doc.isv.feature</module>
  <module>org.eclipse.birt.cshelp.feature</module>
  <module>org.eclipse.birt.doc.feature</module>
  <module>org.eclipse.birt.doc.isv.feature</module>
- -->
  <module>org.eclipse.birt.nl.feature</module>
  <module>org.eclipse.birt.rcp.nl.feature</module>
  <module>org.eclipse.birt.wtp.nl.feature</module>
- <!--
  <module>org.eclipse.birt.sdk.feature</module>
- -->
  <module>org.eclipse.birt.testhelper.feature</module>
  <module>org.eclipse.birt.tests.feature</module>
  <module>org.eclipse.birt.chart.feature</module>