Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorEd Merks2018-01-28 09:11:37 +0000
committerEd Merks2018-01-28 09:11:37 +0000
commit9011b7e203335a29e3e2cbc3166754ad52243e9f (patch)
tree2c05060a67831ac9d4c345a2842cbac853c1ecac /releng
parent03b33214ea462d74bd90df7d92af62d28bcf1b9d (diff)
downloadorg.eclipse.emf-9011b7e203335a29e3e2cbc3166754ad52243e9f.tar.gz
org.eclipse.emf-9011b7e203335a29e3e2cbc3166754ad52243e9f.tar.xz
org.eclipse.emf-9011b7e203335a29e3e2cbc3166754ad52243e9f.zip
[Releng] Enable informational Javadoc warnings and fix them
Also include a runtime workspace launch. It's important to exclude RAP features from the self-hosted launch.
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.releng/EMF.setup20
-rw-r--r--releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGenerator.java14
-rw-r--r--releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java2
-rw-r--r--releng/org.eclipse.emf.site/Runtime Workspace.launch127
4 files changed, 153 insertions, 10 deletions
diff --git a/releng/org.eclipse.emf.releng/EMF.setup b/releng/org.eclipse.emf.releng/EMF.setup
index 08820a925..0aaa5be52 100644
--- a/releng/org.eclipse.emf.releng/EMF.setup
+++ b/releng/org.eclipse.emf.releng/EMF.setup
@@ -128,6 +128,26 @@
key="/instance/org.eclipse.wst.xml.core/lineWidth"
value="180"/>
</setupTask>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.jdt.core">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.invalidJavadoc"
+ value="info"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.invalidJavadocTags"
+ value="enabled"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility"
+ value="private"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription"
+ value="no_tag"/>
+ </setupTask>
</setupTask>
<setupTask
xsi:type="jdt:JRETask"
diff --git a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGenerator.java b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGenerator.java
index 5b74787f6..6194658a3 100644
--- a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGenerator.java
+++ b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGenerator.java
@@ -16,7 +16,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import java.net.URISyntaxException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
@@ -162,7 +161,6 @@ public class UpdateSiteGenerator
*
* @param source the source repository.
* @param buildType the {@code publish.build.type}.
- * @param buildTimestamp the {@code publish.build.timestamp}.
* @return the destination location at the repository was promoted.
* @throws Exception
*/
@@ -181,7 +179,7 @@ public class UpdateSiteGenerator
*
* @param source the source repository location.
* @param destination the destination repository location.
- * @param buildType the {@link publish.build.type}.
+ * @param buildType the {@code publish.build.type}.
* @return the destination location at the repository was mirrored.
* @throws Exception
*/
@@ -337,7 +335,7 @@ public class UpdateSiteGenerator
/**
* Returns the destination folder for the given build type and whether it is a latest composite or not.
*
- * @param buildType the {@link publish.build.type}.
+ * @param buildType the {@code publish.build.type}.
* @param latest whether this is a composite for the latest build.
* @return the destination folder.
*
@@ -356,7 +354,7 @@ public class UpdateSiteGenerator
/**
* Creates a composite update that references the given source repositories, at a location determined by the build type and the latest indicator.
* @param sources the source repositories.
- * @param buildType the {@link publish.build.type}.
+ * @param buildType the {@code publish.build.type}.
* @param latest whether is is a composite refering to the latest.
*
* @throws Exception
@@ -447,8 +445,6 @@ public class UpdateSiteGenerator
* @param sourceURI the source URI.
* @param targetURI the target URI.
* @return the relative URI.
- *
- * @throws URISyntaxException
*/
private static URI relativize(URI sourceURI, URI targetURI)
{
@@ -471,7 +467,7 @@ public class UpdateSiteGenerator
}
/**
- * Produces the {@link .xml.zx} forms as well as the {@code p2.index}.
+ * Produces the {@code .xml.zx} forms as well as the {@code p2.index}.
*
* @param targetRepository
*/
@@ -1179,7 +1175,7 @@ public class UpdateSiteGenerator
* Populates the IDs with the information from {@code about.mappings} for the branding plugin with the give UI ID.
* @param ids the IDs to populate.
* @param iuID the ID of a branding plugin.
- * @param idPattern the pattern for finding the ID in the {@link about.mappings}
+ * @param idPattern the pattern for finding the ID in the {@code about.mappings}
* @param validIDPattern the pattern for validating and extracting the ID.
* @param prefix the prefix that will be prepended to the ID.
*/
diff --git a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java
index 151626e86..f524ae936 100644
--- a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java
+++ b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java
@@ -273,7 +273,7 @@ public class UpdateSiteGeneratorTest
* If {@code publish.clean} is 'true",
* it deletes older builds to ensure that each milestone build has the same newest version of the {@code org.eclipse.emf.sdk.feature.group} installable unit.
* In other words, milestone builds are delete as soon as there is a milestome build a newer version of EMF,
- * as opposed to deleting all the milestone builds after a release build, which would leave the {@link milestone} and {@link milestone/latest} empty.
+ * as opposed to deleting all the milestone builds after a release build, which would leave the {@code milestone} and {@code milestone/latest} empty.
*
* @throws Exception
*/
diff --git a/releng/org.eclipse.emf.site/Runtime Workspace.launch b/releng/org.eclipse.emf.site/Runtime Workspace.launch
new file mode 100644
index 000000000..cc78966e2
--- /dev/null
+++ b/releng/org.eclipse.emf.site/Runtime Workspace.launch
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<setAttribute key="additional_plugins">
+<setEntry value="org.eclipse.equinox.ds:1.5.100.v20171221-2204:default:true"/>
+</setAttribute>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Runtime Workspace"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-workspace"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.emf.examples.generator.validator=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<setAttribute key="selected_features">
+<setEntry value="org.eclipse.e4.rcp.source:default"/>
+<setEntry value="org.eclipse.e4.rcp:default"/>
+<setEntry value="org.eclipse.ecf.core.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.core.feature:default"/>
+<setEntry value="org.eclipse.ecf.core.ssl.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.feature:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.ssl.feature.source:default"/>
+<setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
+<setEntry value="org.eclipse.egit:default"/>
+<setEntry value="org.eclipse.emf.codegen.ecore.ui:default"/>
+<setEntry value="org.eclipse.emf.codegen.ecore:default"/>
+<setEntry value="org.eclipse.emf.codegen.ui:default"/>
+<setEntry value="org.eclipse.emf.codegen:default"/>
+<setEntry value="org.eclipse.emf.common.ui:default"/>
+<setEntry value="org.eclipse.emf.common:default"/>
+<setEntry value="org.eclipse.emf.converter:default"/>
+<setEntry value="org.eclipse.emf.databinding.edit:default"/>
+<setEntry value="org.eclipse.emf.databinding:default"/>
+<setEntry value="org.eclipse.emf.doc:default"/>
+<setEntry value="org.eclipse.emf.ecore.edit:default"/>
+<setEntry value="org.eclipse.emf.ecore.editor:default"/>
+<setEntry value="org.eclipse.emf.ecore.xcore.lib:default"/>
+<setEntry value="org.eclipse.emf.ecore.xcore.sdk:default"/>
+<setEntry value="org.eclipse.emf.ecore.xcore.ui:default"/>
+<setEntry value="org.eclipse.emf.ecore.xcore:default"/>
+<setEntry value="org.eclipse.emf.ecore:default"/>
+<setEntry value="org.eclipse.emf.edit.ui:default"/>
+<setEntry value="org.eclipse.emf.edit:default"/>
+<setEntry value="org.eclipse.emf.mapping.ecore.editor:default"/>
+<setEntry value="org.eclipse.emf.mapping.ecore:default"/>
+<setEntry value="org.eclipse.emf.mapping.ui:default"/>
+<setEntry value="org.eclipse.emf.mapping:default"/>
+<setEntry value="org.eclipse.emf.mwe2.language.sdk:default"/>
+<setEntry value="org.eclipse.emf.mwe2.launcher.source:default"/>
+<setEntry value="org.eclipse.emf.mwe2.launcher:default"/>
+<setEntry value="org.eclipse.emf.mwe2.runtime.sdk:default"/>
+<setEntry value="org.eclipse.emf.oda.ecore.ui:default"/>
+<setEntry value="org.eclipse.emf.oda.ecore:default"/>
+<setEntry value="org.eclipse.emf.oda.sdk:default"/>
+<setEntry value="org.eclipse.emf.oda:default"/>
+<setEntry value="org.eclipse.emf.sdk:default"/>
+<setEntry value="org.eclipse.emf:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
+<setEntry value="org.eclipse.help.source:default"/>
+<setEntry value="org.eclipse.help:default"/>
+<setEntry value="org.eclipse.jdt.source:default"/>
+<setEntry value="org.eclipse.jdt:default"/>
+<setEntry value="org.eclipse.jgit:default"/>
+<setEntry value="org.eclipse.pde.source:default"/>
+<setEntry value="org.eclipse.pde:default"/>
+<setEntry value="org.eclipse.platform.source:default"/>
+<setEntry value="org.eclipse.platform:default"/>
+<setEntry value="org.eclipse.rcp.source:default"/>
+<setEntry value="org.eclipse.rcp:default"/>
+<setEntry value="org.eclipse.sdk:default"/>
+<setEntry value="org.eclipse.xsd.doc:default"/>
+<setEntry value="org.eclipse.xsd.ecore.converter:default"/>
+<setEntry value="org.eclipse.xsd.edit:default"/>
+<setEntry value="org.eclipse.xsd.editor:default"/>
+<setEntry value="org.eclipse.xsd.mapping.editor:default"/>
+<setEntry value="org.eclipse.xsd.mapping:default"/>
+<setEntry value="org.eclipse.xsd.sdk:default"/>
+<setEntry value="org.eclipse.xsd:default"/>
+<setEntry value="org.eclipse.xtend.sdk:default"/>
+<setEntry value="org.eclipse.xtext.docs:default"/>
+<setEntry value="org.eclipse.xtext.examples:default"/>
+<setEntry value="org.eclipse.xtext.redist:default"/>
+<setEntry value="org.eclipse.xtext.runtime:default"/>
+<setEntry value="org.eclipse.xtext.sdk:default"/>
+<setEntry value="org.eclipse.xtext.ui:default"/>
+<setEntry value="org.eclipse.xtext.xbase.lib:default"/>
+<setEntry value="org.eclipse.xtext.xbase:default"/>
+<setEntry value="org.eclipse.xtext.xtext.ui:default"/>
+</setAttribute>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>

Back to the top