summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbkolb2007-09-26 17:23:05 (EDT)
committerbkolb2007-09-26 17:23:05 (EDT)
commit3baad7752e73444b93baac0ada1573e4327e90a9 (patch)
treec41ebdd5b9fe6002968897dc7f47f832351c3bc2
parent6fac59a48c2cb99a80919cea3793b2a5f4c2a741 (diff)
downloadorg.eclipse.mwe-3baad7752e73444b93baac0ada1573e4327e90a9.zip
org.eclipse.mwe-3baad7752e73444b93baac0ada1573e4327e90a9.tar.gz
org.eclipse.mwe-3baad7752e73444b93baac0ada1573e4327e90a9.tar.bz2
updated doc
-rw-r--r--doc/org.eclipse.emf.mwe.doc/build.properties14
-rw-r--r--doc/org.eclipse.emf.mwe.doc/build.xml97
-rw-r--r--doc/org.eclipse.emf.mwe.doc/plugin.xml14
3 files changed, 75 insertions, 50 deletions
diff --git a/doc/org.eclipse.emf.mwe.doc/build.properties b/doc/org.eclipse.emf.mwe.doc/build.properties
index 9c86577..0c5277d 100644
--- a/doc/org.eclipse.emf.mwe.doc/build.properties
+++ b/doc/org.eclipse.emf.mwe.doc/build.properties
@@ -1 +1,13 @@
-custom = true
+output.. = bin/
+custom=true
+bin.includes = plugin.xml,\
+ META-INF/,\
+ *.xml,\
+ *.zip
+src.includes = toc.xml,\
+ *.zip,\
+ tocconcepts.xml,\
+ tocreference.xml,\
+ tocsamples.xml,\
+ plugin.xml,\
+ META-INF/ \ No newline at end of file
diff --git a/doc/org.eclipse.emf.mwe.doc/build.xml b/doc/org.eclipse.emf.mwe.doc/build.xml
index 56515a8..3d67875 100644
--- a/doc/org.eclipse.emf.mwe.doc/build.xml
+++ b/doc/org.eclipse.emf.mwe.doc/build.xml
@@ -1,37 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.emf.mwe.doc" default="build.jars" basedir=".">
+
+ <property file="${buildDirectory}/finalPluginsVersions.properties"/>
+ <property name="pluginVersion" value="${org.eclipse.emf.mwe.doc}"/>
- <property name="pluginVersion" value="2.3.0"/>
- <property name="projectName" value="mwe"/>
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
+ <property name="plugin" value="org.eclipse.emf.mwe"/>
+ <property name="docPlugin" value="org.eclipse.emf.mwe.doc"/>
+
+ <property name="filesToInclude" value="META-INF/**,about.html,about.ini,about.mappings,about.properties,modeling*.png,plugin.xml,plugin.properties,doc.zip,*.xml,index/**"/>
+ <property name="filesToExclude" value="**/*.dnx"/>
- <!-- Compiler settings -->
+ <!-- Compiler settings. -->
<property name="javacFailOnError" value="false"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="true"/>
- <property name="compilerArg" value=""/>
<property name="javacSource" value="1.5"/>
<property name="javacTarget" value="1.5"/>
+ <property name="compilerArg" value=""/>
<path id="path_bootclasspath">
<fileset dir="${java.home}/lib">
<include name="*.jar"/>
</fileset>
</path>
<property name="bootclasspath" refid="path_bootclasspath"/>
+
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
<property name="bundleBootClasspath" value="${bootclasspath}"/>
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
+ <property name="basearch" value="${arch}"/>
+ <property name="basenl" value="${nl}"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
<isset property="buildTempFolder"/>
</condition>
<property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.${projectName}.doc">
+ <condition property="build.result.folder" value="${pluginTemp}/${docPlugin}">
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
@@ -41,53 +48,58 @@
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+
</target>
- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.${projectName}.doc for an update site.">
+ <target name="build.update.jar" depends="init" description="Build the plug-in: ${plugin} for an update site.">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
- <zip destfile="${plugin.destination}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}.jar" basedir="${temp.folder}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}" filesonly="false" whenempty="skip" update="false"/>
+ <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.jar" basedir="${temp.folder}/${docPlugin}_${pluginVersion}" filesonly="false" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}"/>
- <copy todir="${destination.temp.folder}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}"
- includes="about.*,modeling*.png,plugin.*,toc*.xml,topics_*.xml,doc.zip,index/**,META-INF/**"/>
- </copy>
- <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}" version="${pluginVersion}.${forceContextQualifier}"/>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.${projectName}.doc.">
- <property name="eclipseDir" location="../.."/>
-
- <chmod perm="754" file="build/antJavadoc.sh"/>
- <exec executable="bash" dir="build">
- <arg line="./antJavadoc.sh ${eclipseDir}"/>
- </exec>
-
+ <target name="build.jars" depends="init" description="Build all the jars for the plug-in: ${docPlugin}.">
+ <!-- Execute a shell script that will create an ant javadoc script and then run it for us -->
+ <exec executable="sh">
+ <arg value="build/antJavadoc.sh"/>
+ <arg value="${eclipse.home}/../eclipse"/>
+ </exec>
+ <!--
<antcall target="build.index"/>
-
- <zip destfile="${build.result.folder}/doc.zip" compress="true">
- <zipfileset dir="css" prefix="css"/>
+ -->
+
+ <!-- Zip up all of the documentation artifacts - references(including javadoc), images, tutorials, etc. -->
+ <zip destfile="doc.zip" compress="true">
+ <!-- Add new folders for documentation zip here. -->
+ <zipfileset dir="references" prefix="references" excludes="**/impl,**/impl/**"/>
<zipfileset dir="images" prefix="images"/>
- <zipfileset dir="references" prefix="references"/>
<zipfileset dir="tutorials" prefix="tutorials"/>
+ <zipfileset dir="html" prefix="html"/>
</zip>
</target>
<target name="build.index" depends="init" description="Builds search index for the plug-in" if="eclipse.running">
<help.buildHelpIndex manifest="plugin.xml" destination="."/>
</target>
-
+
<target name="build.sources" depends="init">
</target>
-
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${docPlugin}_${pluginVersion}"/>
+ <copy todir="${destination.temp.folder}/${docPlugin}_${pluginVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}"
+ includes="${filesToInclude}"
+ excludes="${filesToExclude}"/>
+ </copy>
+ <eclipse.versionReplacer
+ path="${destination.temp.folder}/${docPlugin}_${pluginVersion}"
+ version="${pluginVersion}"/>
+ </target>
+
<target name="build.zips" depends="init">
</target>
@@ -97,18 +109,13 @@
<target name="gather.logs" depends="init" if="destination.temp.folder">
</target>
- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.${projectName}.doc of all the zips, jars and logs created.">
- <delete file="${plugin.destination}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}.jar"/>
- <delete file="${plugin.destination}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}.zip"/>
+ <target name="clean" depends="init" description="Clean the plug-in: ${docPlugin} of all the zips, jars and logs created.">
+ <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.jar"/>
+ <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.zip"/>
<delete dir="${temp.folder}"/>
</target>
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
- <eclipse.convertPath fileSystemPath="D:/eclipse/${projectName}/eclipse/plugins/org.eclipse.${projectName}.doc" property="resourcePath"/>
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
- </target>
-
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.${projectName}.doc.">
+ <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: ${docPlugin}.">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
@@ -122,8 +129,8 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log" />
</delete>
- <zip destfile="${plugin.destination}/org.eclipse.${projectName}.doc_${pluginVersion}.${forceContextQualifier}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>
-</project>
+</project> \ No newline at end of file
diff --git a/doc/org.eclipse.emf.mwe.doc/plugin.xml b/doc/org.eclipse.emf.mwe.doc/plugin.xml
index 28e7d93..cbf4c7b 100644
--- a/doc/org.eclipse.emf.mwe.doc/plugin.xml
+++ b/doc/org.eclipse.emf.mwe.doc/plugin.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.2"?>
<plugin>
+
<!-- ====================================================================== -->
<!-- Define primary TOC -->
<!-- ====================================================================== -->
+
<extension point="org.eclipse.help.toc">
<toc file="toc.xml" primary="true"/>
- <index path="index"/>
</extension>
<!-- ====================================================================== -->
@@ -22,9 +23,14 @@
<!-- ============================================================================= -->
<extension point="org.eclipse.pde.core.javadoc">
<javadoc path="doc.zip!/references/javadoc" archive="true">
- <!-- @pluginIDs@ -->
- <!-- list plugin IDs here, eg. <plugin id="org.eclipse.foo.bar"/> <plugin id="org.eclipse.foo.baz"/> -->
+ <plugin id="org.eclipse.emf.mwe.core"/>
+ <plugin id="org.eclipse.emf.mwe.utils"/>
+ <plugin id="org.eclipse.emf.mwe.ui"/>
+ <plugin id="org.eclipse.emf.mwe.ui.simpleEditor"/>
+ <plugin id="org.eclipse.emf.mwe.ui.wtpEditor"/>
</javadoc>
</extension>
+
+
</plugin>