Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-14 07:38:23 -0400
committerEike Stepper2012-10-14 07:38:23 -0400
commit4b2f6d102c4020f241e22e4068b97a19d5ee0fe9 (patch)
tree4eef85283199fbc91643758c25ee8c76e2afe999
parent0beb23958361b4f7e57fb2e613ca1159237d728c (diff)
downloadcdo-4b2f6d102c4020f241e22e4068b97a19d5ee0fe9.tar.gz
cdo-4b2f6d102c4020f241e22e4068b97a19d5ee0fe9.tar.xz
cdo-4b2f6d102c4020f241e22e4068b97a19d5ee0fe9.zip
[391874] [Releng] Generate API reports during Hudson build
https://bugs.eclipse.org/bugs/show_bug.cgi?id=391874
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/buckminster.cspex11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml30
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/Simulate Hudson Build.launch18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target7
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/api_reports.ant19
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/config.url2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant37
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/p2.index3
8 files changed, 61 insertions, 66 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
index 9cfa47704f..4bd5668463 100644
--- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
+++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
+
<cs:dependencies>
<cs:dependency name="org.eclipse.emf.cdo.site" componentType="eclipse.feature"/>
<cs:dependency name="org.eclipse.emf.cdo.releng.release" componentType="osgi.bundle"/>
@@ -43,4 +44,14 @@
<cs:dependency name="javax.persistence" componentType="eclipse.feature"/>
<cs:dependency name="javax.annotation" componentType="osgi.bundle"/>
</cs:dependencies>
+
+ <cs:actions>
+ <cs:public name="generate.api.reports" actor="ant" always="true">
+ <cs:actorProperties>
+ <cs:property key="buildFile" value="${releng}/hudson/api_reports.ant"/>
+ <cs:property key="targets" value="main"/>
+ </cs:actorProperties>
+ </cs:public>
+ </cs:actions>
+
</cs:cspecExtension> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 7c420e2df1..a102c3cd8e 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -416,15 +416,12 @@
<target name="provision"
depends="-init.tools,-init.buildinfos,-init.workspace"
- description="Imports projects and binaries">
+ description="Imports projects and binaries and set up API baseline">
<echo message="Importing projects into ${ws}" />
<echo message="Importing binaries into ${tp}" />
-
<mkdir dir="${tp}" />
<buckminster command="import">
<cmdargs>
- <!--<jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=/shared/common/jdk-1.6.0_26.x86_64/bin" />-->
-
<arg value="-B" />
<arg value="${hudson.WORKSPACE}/bom.xml" />
@@ -435,6 +432,14 @@
<arg value="${basedir}/build.mspec" />
</cmdargs>
</buckminster>
+
+ <echo message="Setting API baseline to /opt/public/modeling/emf/cdo/api_baseline" />
+ <buckminster command="addbaseline">
+ <cmdargs>
+ <arg value="-A" />
+ <arg value="CDO Baseline" />
+ </cmdargs>
+ </buckminster>
</target>
<!-- ===== -->
@@ -455,6 +460,7 @@
<include name="*.help/bin/**" />
</fileset>
</delete>
+ <antcall target="-generate.api" />
</target>
<!-- ======= -->
@@ -476,8 +482,6 @@
</pathconvert>
<echoproperties destfile="${result}/all.properties" />
- <!--<copy file="${releng}/hudson/p2.index" tofile="${site.p2.dir}/p2.index" />-->
-
<copy todir="${hudson.WORKSPACE}"
overwrite="true"
includeemptydirs="true"
@@ -540,6 +544,20 @@
</if>
</target>
+ <!-- ============ -->
+ <!-- Generate API -->
+ <!-- ============ -->
+
+ <target name="-generate.api">
+ <echo message="Generating API reports" />
+ <buckminster command="perform">
+ <cmdargs>
+ <arg value="org.eclipse.emf.cdo.releng#generate.api.reports" />
+ <arg value="-Dresult=${result}" />
+ </cmdargs>
+ </buckminster>
+ </target>
+
<!-- ============== -->
<!-- Generate Help -->
<!-- ============== -->
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/Simulate Hudson Build.launch b/plugins/org.eclipse.emf.cdo.releng/hudson/Simulate Hudson Build.launch
deleted file mode 100644
index 67b02cf0f2..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/Simulate Hudson Build.launch
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/hudson&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.releng/hudson/hudson.ant"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_23"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.releng"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.emf.cdo.releng/hudson/hudson.ant}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target b/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target
new file mode 100644
index 0000000000..cc38a2e9b0
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="CDO Baseline" sequenceNumber="0">
+ <locations>
+ <location path="/opt/public/modeling/emf/cdo/api_baseline" type="Directory"/>
+ </locations>
+</target>
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/api_reports.ant b/plugins/org.eclipse.emf.cdo.releng/hudson/api_reports.ant
new file mode 100644
index 0000000000..d55c00b141
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/hudson/api_reports.ant
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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:
+ Eike Stepper - initial API and implementation
+-->
+<project name="API Reports" default="main">
+
+ <target name="main">
+ <apitooling.analysis baseline="CDO Baseline" profile="${git.clone}" report="${result}/analysis" />
+ <apitooling.analysis_reportconversion xmlfiles="${result}/analysis" htmlfiles="${result}/analysis/html" />
+ </target>
+
+</project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/config.url b/plugins/org.eclipse.emf.cdo.releng/hudson/config.url
deleted file mode 100644
index 00b3320ef7..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/config.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://hudson.eclipse.org/hudson/job/emf-cdo-integration/config.xml
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant b/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant
deleted file mode 100644
index a98a8f0f03..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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:
- Eike Stepper - initial API and implementation
--->
-<project name="Hudson" basedir=".." default="hudson">
-
- <property name="hudson.root" value="/develop/ws/cdo/releng/hudson" />
- <property name="checkout" value="/develop/ws/cdo" />
- <property name="platform" value="Windows" />
- <property name="build.trigger" value="user estepper" />
-
- <property name="hudson.BUILD_TYPE" value="N" />
- <property name="hudson.LOGLEVEL" value="INFO" />
- <property name="hudson.CLEAN_TOOLS" value="false" />
- <property name="hudson.CLEAN_TP" value="false" />
- <property name="hudson.GENERATE_PRODUCTS" value="false" />
- <property name="hudson.JOB_NAME" value="emf-cdo-integration" />
- <property name="hudson.BUILD_NUMBER" value="1" />
- <property name="hudson.WORKSPACE" value="${hudson.root}" />
- <property name="hudson.HUDSON_URL" value="file://${hudson.root}" />
- <property name="hudson.JOB_URL" value="${hudson.HUDSON_URL}/jobs/${hudson.JOB_NAME}" />
- <property name="hudson.BUILD_URL" value="${hudson.JOB_URL}/${hudson.BUILD_NUMBER}" />
- <property name="hudson.BUILD_ID" value="2011-07-14_23-29-20" />
- <property name="hudson.SVN_REVISION" value="0815" />
-
- <target name="hudson">
- <ant antfile="${basedir}/build.xml" target="site.p2" inheritall="true" dir="${basedir}" />
- </target>
-
-</project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/p2.index b/plugins/org.eclipse.emf.cdo.releng/hudson/p2.index
deleted file mode 100644
index 9b3d00b865..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/p2.index
+++ /dev/null
@@ -1,3 +0,0 @@
-version = 1
-metadata.repository.factory.order = content.jar,\!
-artifact.repository.factory.order = artifacts.jar,\!

Back to the top