Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/javadoc/CDO Generate JavaDocs.launch10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java10
4 files changed, 21 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/javadoc/CDO Generate JavaDocs.launch b/plugins/org.eclipse.emf.cdo.releng/javadoc/CDO Generate JavaDocs.launch
index afe180352e..aeb366d90c 100644
--- a/plugins/org.eclipse.emf.cdo.releng/javadoc/CDO Generate JavaDocs.launch
+++ b/plugins/org.eclipse.emf.cdo.releng/javadoc/CDO Generate JavaDocs.launch
@@ -2,8 +2,12 @@
<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="${workspace}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
@@ -12,6 +16,6 @@
<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/javadoc.ant}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant
index 6edf3de195..3cbd434240 100644
--- a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant
+++ b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadoc.ant
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
-<project name="JavaDoc" default="build.clean" basedir="..">
+<project name="JavaDoc" default="build.clean" basedir="../../..">
- <property name="releng.project" value="org.eclipse.emf.cdo.releng" />
+ <property name="releng.project" value="plugins/org.eclipse.emf.cdo.releng" />
<target name="assemble.options">
<java classname="org.eclipse.emf.cdo.releng.AssembleJavaDocOptions">
- <classpath path="org.eclipse.emf.cdo.releng/bin" />
+ <classpath path="plugins/org.eclipse.emf.cdo.releng/bin" />
<classpath>
<fileset dir="_target/plugins">
<include name="**/*.jar" />
@@ -15,19 +15,19 @@
</target>
<target name="clean" depends="assemble.options">
- <ant antfile="${releng.project}/javadocLib.ant" target="delegate">
+ <ant antfile="${releng.project}/javadoc/javadocLib.ant" target="delegate">
<property name="delegate.target" value="clean" />
</ant>
</target>
<target name="build" depends="assemble.options">
- <ant antfile="${releng.project}/javadocLib.ant" target="delegate">
+ <ant antfile="${releng.project}/javadoc/javadocLib.ant" target="delegate">
<property name="delegate.target" value="build" />
</ant>
</target>
<target name="build.clean" depends="assemble.options">
- <ant antfile="${releng.project}/javadocLib.ant" target="delegate">
+ <ant antfile="${releng.project}/javadoc/javadocLib.ant" target="delegate">
<property name="delegate.target" value="build.clean" />
</ant>
</target>
diff --git a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
index 2dc6cd7884..cae593ffdb 100644
--- a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
+++ b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
@@ -4,8 +4,8 @@
<!-- GENERATION WARNING -->
<property name="jdk.version" value="1.5.0" />
- <property name="emf.version" value="2.6.0" />
- <property name="platform.version" value="indigo" />
+ <property name="emf.version" value="2.7.0" />
+ <property name="platform.version" value="juno" />
<property name="javadoc.project" value="plugins/${PROJECT-NAME}" />
<property file="${javadoc.project}/plugin.properties" />
@@ -91,7 +91,7 @@
</replaceregexp>
<java classname="org.eclipse.emf.cdo.releng.MakeHrefsRelative" dir="${basedir}" fork="true">
- <classpath path="org.eclipse.emf.cdo.releng/bin" />
+ <classpath path="plugins/org.eclipse.emf.cdo.releng/bin" />
<arg value="${destdir}" />
</java>
</target>
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
index 5083ee83ff..8ba7c1b2c6 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
@@ -53,10 +53,10 @@ public class AssembleJavaDocOptions
public static void main(String[] args) throws Exception
{
- String workspacePath = args.length == 0 ? ".." : args[0];
- workspace = new File(workspacePath);
+ String workspacePath = args.length == 0 ? "../../.." : args[0];
+ workspace = new File(workspacePath).getCanonicalFile();
plugins = new File(workspace, "plugins");
- releng = new File(workspace, "org.eclipse.emf.cdo.releng");
+ releng = new File(plugins, "org.eclipse.emf.cdo.releng");
for (File plugin : plugins.listFiles())
{
@@ -267,7 +267,7 @@ public class AssembleJavaDocOptions
try
{
- out = new FileWriter(new File(releng, "javadocLib.ant"));
+ out = new FileWriter(new File(releng, "javadoc/javadocLib.ant"));
BufferedWriter writer = new BufferedWriter(out);
writer.write("<?xml version=\"1.0\"?>\n");
@@ -437,7 +437,7 @@ public class AssembleJavaDocOptions
try
{
- in = new FileReader(new File(releng, "javadocTemplate.ant"));
+ in = new FileReader(new File(releng, "javadoc/javadocTemplate.ant"));
BufferedReader reader = new BufferedReader(in);
String line;

Back to the top