aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-08-05 05:21:24 (EDT)
committerSzymon Brandys2013-08-05 05:23:50 (EDT)
commit1c1c55e8493cb620c3cc156962a249b452d21334 (patch)
treec6a714827f154d5bfc1917413ffe3e3f284ba396
parentf6b5e80f9197583e0102c5ca09331d2e2aea4f02 (diff)
downloadorg.eclipse.orion.client-1c1c55e8493cb620c3cc156962a249b452d21334.zip
org.eclipse.orion.client-1c1c55e8493cb620c3cc156962a249b452d21334.tar.gz
org.eclipse.orion.client-1c1c55e8493cb620c3cc156962a249b452d21334.tar.bz2
Bug 410798 - Add generating jsdoc step to Tycho build
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--pom.xml460
-rw-r--r--releng/org.eclipse.orion.client.releng/builder/orion.jsdoc.xml31
2 files changed, 266 insertions, 225 deletions
diff --git a/pom.xml b/pom.xml
index 7a3d9c3..627c441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,225 +1,235 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2013, SAP AG and others.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Matthias Sohn - initial implementation
--->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <groupId>org.eclipse.orion</groupId>
- <artifactId>org.eclipse.orion.client.parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Orion Client Parent</name>
-
- <mailingLists>
- <mailingList>
- <name>orion-dev Mailing List</name>
- <post>orion-dev@eclipse.org</post>
- <subscribe>https://dev.eclipse.org/mailman/listinfo/orion-dev</subscribe>
- <unsubscribe>https://dev.eclipse.org/mailman/listinfo/orion-dev</unsubscribe>
- <archive>http://dev.eclipse.org/mhonarc/lists/orion-dev</archive>
- </mailingList>
- </mailingLists>
-
- <issueManagement>
- <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Orion;classification=Eclipse</url>
- <system>Bugzilla</system>
- </issueManagement>
-
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <comments>
- All rights reserved.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.htm
- </comments>
- </license>
- </licenses>
-
- <properties>
- <orion-version>1.0.0-SNAPSHOT</orion-version>
- <tycho-version>0.17.0</tycho-version>
- <tycho-extras-version>0.17.0</tycho-extras-version>
- <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git</tycho.scmUrl>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java-version>1.6</java-version>
- <requirejsHome>${basedir}/target/requirejs/</requirejsHome>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>repo.eclipse.org</id>
- <name>Orion Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/orion-releases/</url>
- </repository>
- <snapshotRepository>
- <id>repo.eclipse.org</id>
- <name>Orion Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/orion-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.mozilla</groupId>
- <artifactId>rhino</artifactId>
- <version>1.7R4</version>
- </dependency>
- <dependency>
- <groupId>com.google.javascript</groupId>
- <artifactId>closure-compiler</artifactId>
- <version>v20130411</version>
- </dependency>
- </dependencies>
-
- <modules>
- <module>bundles/org.eclipse.orion.client.core</module>
- <module>bundles/org.eclipse.orion.client.editor</module>
- <module>bundles/org.eclipse.orion.client.git</module>
- <module>bundles/org.eclipse.orion.client.ui</module>
- <module>bundles/org.eclipse.orion.client.users</module>
-
- <module>releng/org.eclipse.orion.client.repository</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${java-version}</source>
- <target>${java-version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>${java-version}</source>
- <target>${java-version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>install-jar</id>
- <phase>verify</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${requirejsHome}/lib/</outputDirectory>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>verify</phase>
- <configuration>
- <tasks>
- <property name="builder"
- value="${basedir}/releng/org.eclipse.orion.client.releng/builder/"/>
- <property name="requirejsHome"
- value="${requirejsHome}"/>
- <property name="buildDirectory"
- value="${basedir}"/>
- <ant antfile="${basedir}/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml">
- <target name="download3rdPartyLibs"/>
- <target name="updateBuildLabel"/>
- <target name="requirejs"/>
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <format>'v'yyyyMMdd-HHmm</format>
- <sourceReferences>
- <generate>true</generate>
- </sourceReferences>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>ISO-8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013, SAP AG and others.
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Matthias Sohn - initial implementation
+-->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <groupId>org.eclipse.orion</groupId>
+ <artifactId>org.eclipse.orion.client.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Orion Client Parent</name>
+
+ <mailingLists>
+ <mailingList>
+ <name>orion-dev Mailing List</name>
+ <post>orion-dev@eclipse.org</post>
+ <subscribe>https://dev.eclipse.org/mailman/listinfo/orion-dev</subscribe>
+ <unsubscribe>https://dev.eclipse.org/mailman/listinfo/orion-dev</unsubscribe>
+ <archive>http://dev.eclipse.org/mhonarc/lists/orion-dev</archive>
+ </mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Orion;classification=Eclipse</url>
+ <system>Bugzilla</system>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>Eclipse Public License v1.0</name>
+ <comments>
+ All rights reserved.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.htm
+ </comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <orion-version>1.0.0-SNAPSHOT</orion-version>
+ <tycho-version>0.17.0</tycho-version>
+ <tycho-extras-version>0.17.0</tycho-extras-version>
+ <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git</tycho.scmUrl>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java-version>1.6</java-version>
+ <requirejsHome>${basedir}/target/requirejs/</requirejsHome>
+ <jsdocHome>${basedir}/target/jsdoc</jsdocHome>
+ </properties>
+
+ <distributionManagement>
+ <repository>
+ <id>repo.eclipse.org</id>
+ <name>Orion Repository - Releases</name>
+ <url>https://repo.eclipse.org/content/repositories/orion-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>repo.eclipse.org</id>
+ <name>Orion Repository - Snapshots</name>
+ <url>https://repo.eclipse.org/content/repositories/orion-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.mozilla</groupId>
+ <artifactId>rhino</artifactId>
+ <version>1.7R4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>v20130411</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>bundles/org.eclipse.orion.client.core</module>
+ <module>bundles/org.eclipse.orion.client.editor</module>
+ <module>bundles/org.eclipse.orion.client.git</module>
+ <module>bundles/org.eclipse.orion.client.ui</module>
+ <module>bundles/org.eclipse.orion.client.users</module>
+
+ <module>releng/org.eclipse.orion.client.repository</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${java-version}</source>
+ <target>${java-version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>${java-version}</source>
+ <target>${java-version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>install-jar</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${requirejsHome}/lib/</outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <configuration>
+ <tasks>
+ <!-- minify javascript -->
+ <property name="builder"
+ value="${basedir}/releng/org.eclipse.orion.client.releng/builder/"/>
+ <property name="requirejsHome"
+ value="${requirejsHome}"/>
+ <property name="buildDirectory"
+ value="${basedir}"/>
+ <ant antfile="${basedir}/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml">
+ <target name="download3rdPartyLibs"/>
+ <target name="updateBuildLabel"/>
+ <target name="requirejs"/>
+ </ant>
+
+ <!-- generate jsdocs -->
+ <property name="jsdocHome"
+ value="${jsdocHome}"/>
+ <ant antfile="${basedir}/releng/org.eclipse.orion.client.releng/builder/orion.jsdoc.xml">
+ <target name="download3rdPartyLibs"/>
+ <target name="jsdocs"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm</format>
+ <sourceReferences>
+ <generate>true</generate>
+ </sourceReferences>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-sourceref-jgit</artifactId>
+ <version>${tycho-extras-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/releng/org.eclipse.orion.client.releng/builder/orion.jsdoc.xml b/releng/org.eclipse.orion.client.releng/builder/orion.jsdoc.xml
new file mode 100644
index 0000000..8ab9ec7
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/orion.jsdoc.xml
@@ -0,0 +1,31 @@
+<project name="Orion JSDoc ant tasks" >
+
+ <target name="download3rdPartyLibs">
+ <mkdir dir="${jsdocHome}" />
+ <get src="https://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-2.4.0.zip"
+ dest="${jsdocHome}/jsdoc_toolkit-2.4.0.zip"
+ usetimestamp="true"
+ maxtime="30" />
+ <unzip src="${jsdocHome}/jsdoc_toolkit-2.4.0.zip"
+ dest="${jsdocHome}">
+ <cutdirsmapper dirs="2"/>
+ </unzip>
+ <delete dir="${jsdocHome}/jsdoc_toolkit-2.4.0"/>
+ </target>
+
+ <target name="jsdocs" if="jsdocHome" >
+ <java jar="${jsdocHome}/jsrun.jar" fork="true">
+ <arg line="${jsdocHome}/app/run.js -s -v -a " />
+ <arg value="-r=3" />
+ <arg value="-t=${jsdocHome}/templates/jsdoc" />
+ <!-- TODO: we should move the doc bundles from the server repository to the client repository
+ until this happens we dump the generated jsdocs here -->
+ <arg value="-d=${buildDirectory}/target/jsdoc.out" />
+ <arg value="${buildDirectory}/bundles/org.eclipse.orion.client.core/web/orion/" />
+ <arg value="${buildDirectory}/bundles/org.eclipse.orion.client.ui/web/orion/" />
+ <arg value="${buildDirectory}/bundles/org.eclipse.orion.client.editor/web/orion/" />
+ <arg value="${buildDirectory}/bundles/org.eclipse.orion.client.git/web/orion/" />
+ <arg value="${buildDirectory}/bundles/org.eclipse.orion.client.users/web/orion/" />
+ </java>
+ </target>
+</project>