[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. debian/2.5.0-1-2-g61b9955
Niels Thykier
nthykier at alioth.debian.org
Tue Aug 9 11:54:36 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse-emf - Plug-in for eclipse - Debian package.".
The branch, master has been updated
via 61b9955caf6d72969fa9e682d6485f598b84b786 (commit)
from df87378b440bc90dde48eff2e110ffe59205a074 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 61b9955caf6d72969fa9e682d6485f598b84b786
Author: Niels Thykier <niels at thykier.net>
Date: Tue Aug 9 13:48:59 2011 +0200
Unapplied patches and added a new one
-----------------------------------------------------------------------
Summary of changes:
debian/patches/Unchecked-generic-class-cast.patch | 13 +++
debian/patches/series | 1 +
debian/source/local-options | 1 +
org.eclipse.emf.doc/build/antJavadoc.sh | 12 ++--
org.eclipse.emf.doc/build/javadoc.xml.template | 2 +-
.../customBuildCallbacks.xml | 90 ++++---------------
.../build.properties | 4 +
.../build.properties | 3 +
.../build.properties | 3 +
org.eclipse.emf.examples.library/build.properties | 3 +
org.eclipse.emf.exporter.html/build.properties | 4 +
org.eclipse.emf.importer.java/build.properties | 1 +
org.eclipse.emf.java.edit/build.properties | 3 +
org.eclipse.emf.java.editor/build.properties | 3 +
org.eclipse.emf.java/build.properties | 3 +
org.eclipse.xsd.doc/build/antJavadoc.sh | 12 ++--
org.eclipse.xsd.doc/build/javadoc.xml.template | 2 +-
.../customBuildCallbacks.xml | 23 ++++--
org.eclipse.xsd.example/build.properties | 3 +
19 files changed, 95 insertions(+), 91 deletions(-)
diff --git a/debian/patches/Unchecked-generic-class-cast.patch b/debian/patches/Unchecked-generic-class-cast.patch
new file mode 100644
index 0000000..9b6202f
--- /dev/null
+++ b/debian/patches/Unchecked-generic-class-cast.patch
@@ -0,0 +1,13 @@
+diff --git a/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java b/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
+index cdbfae0..06be38d 100644
+--- a/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
++++ b/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
+@@ -73,7 +73,7 @@ class ContentHandlerRegistryReader extends RegistryReader
+ try
+ {
+ @SuppressWarnings("unchecked")
+- Class<ContentHandler> contributorHandlerClass = Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
++ Class<ContentHandler> contributorHandlerClass = (Class)Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
+ Map<String, String> parameters = new HashMap<String, String>();
+ for (IConfigurationElement parameter : element.getChildren("parameter"))
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 0e6af9b..ba86678 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Fedora-eclipse-emf-symlinked-classpath.patch
Fedora-eclipse-emf-build-props.patch
Fedora-eclipse-emf-bundle-examples.patch
unix2dos.patch
+Unchecked-generic-class-cast.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
diff --git a/org.eclipse.emf.doc/build/antJavadoc.sh b/org.eclipse.emf.doc/build/antJavadoc.sh
index 2c73574..2505a6f 100644
--- a/org.eclipse.emf.doc/build/antJavadoc.sh
+++ b/org.eclipse.emf.doc/build/antJavadoc.sh
@@ -12,9 +12,9 @@ pluginName="org.eclipse.emf";
debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
-#if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-#export PATH=${PATH}:${ANT_HOME}/bin
+if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
+if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
+export PATH=${PATH}:${ANT_HOME}/bin
# current directory - all but the name of this script, no trailing slash
currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
@@ -46,7 +46,7 @@ function groupPackage
done
fi
if [[ $debug -gt 1 ]]; then echo "[antJd] *.java in srcDir: "; echo "-----------------"; find $srcDir -type f -name '*.java'; echo "-----------------"; fi
- packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | fromdos | sort | uniq | xargs | sed -e 's/ /:/g'`;
+ packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
# packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);.*/\1/' | sort | uniq | xargs | sed -e 's/ /:/g'` # old way
if [[ $debug -gt 1 ]]; then echo "[antJd] packages1: "$packages; fi
packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`; # slash escape
@@ -94,13 +94,13 @@ groupPackage org.eclipse.emf.ant
# The directory of the plugins in the order they were built
excludes="resources.jar";
includes="${pluginName}";
-pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
### so that all classes/packages (and thus @links) can be resolved
# All the jars in the plugins directory
-classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
+classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
# Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
diff --git a/org.eclipse.emf.doc/build/javadoc.xml.template b/org.eclipse.emf.doc/build/javadoc.xml.template
index 4564459..e162957 100644
--- a/org.eclipse.emf.doc/build/javadoc.xml.template
+++ b/org.eclipse.emf.doc/build/javadoc.xml.template
@@ -12,7 +12,7 @@
<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
<target name="extractPlatformJavadoc" unless="platformJavadocExists">
- <unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
+ <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
diff --git a/org.eclipse.emf.example.installer/customBuildCallbacks.xml b/org.eclipse.emf.example.installer/customBuildCallbacks.xml
index 1958752..10fd915 100644
--- a/org.eclipse.emf.example.installer/customBuildCallbacks.xml
+++ b/org.eclipse.emf.example.installer/customBuildCallbacks.xml
@@ -18,79 +18,27 @@
<!-- ===================================================================== -->
<target name="pre.build.jars">
- <echo message="Copying example plugin projects ..."/>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.activities" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.activities/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.generator.validator" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.examples.generator.validator/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library.edit" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library.edit/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library.editor" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library.editor/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.exporter.html" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.exporter.html/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.java" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.java/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.java.edit" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.java.edit/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
- </copy>
- <copy todir="${build.result.folder}/examples/org.eclipse.emf.java.editor" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.emf.java.editor/">
+ <!-- ${build.result.folder} = /home/www-data/build/emf/downloads/drops/2.4.0/N200805051552/eclipse/plugins/org.eclipse.emf.example.installer -->
+ <property file="${build.result.folder}/../../../build.cfg" />
+ <condition property="exampleCVSTag" value="build_${buildTimestamp}" else="${branch}">
+ <istrue value="${tagBuild}"/>
+ </condition>
+ <echo message="Checking out org.eclipse.emf/org.eclipse.emf/examples from ${exampleCVSTag} ..."/>
+ <cvs failonerror="true" dest="${build.result.folder}/examples" cvsroot=":pserver:anonymous at dev.eclipse.org:/cvsroot/modeling">
+ <commandline>
+ <argument line="-Q export -r ${exampleCVSTag} org.eclipse.emf/org.eclipse.emf/examples" />
+ </commandline>
+ </cvs>
+
+ <move todir="${build.result.folder}/examples/" includeemptydirs="true">
+ <fileset dir="${build.result.folder}/examples/org.eclipse.emf/org.eclipse.emf/examples/">
<exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
</fileset>
- </copy>
+ </move>
+
+ <delete dir="${build.result.folder}/examples/org.eclipse.emf" />
+ <delete dir="${build.result.folder}/examples/org.eclipse.emf.examples" />
+ <delete dir="${build.result.folder}/examples/org.eclipse.emf.examples-feature" />
</target>
<!-- ===================================================================== -->
diff --git a/org.eclipse.emf.examples.generator.validator/build.properties b/org.eclipse.emf.examples.generator.validator/build.properties
index 1feeabf..0f9e992 100644
--- a/org.eclipse.emf.examples.generator.validator/build.properties
+++ b/org.eclipse.emf.examples.generator.validator/build.properties
@@ -9,4 +9,8 @@ exclude.. = **/doc-files/**
source.. = src/
output.. = bin/
src.includes = about.html,\
+ .classpath,\
+ .jetproperties,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.examples.library.edit/build.properties b/org.eclipse.emf.examples.library.edit/build.properties
index 4d634a9..acfb87b 100644
--- a/org.eclipse.emf.examples.library.edit/build.properties
+++ b/org.eclipse.emf.examples.library.edit/build.properties
@@ -7,4 +7,7 @@ bin.includes = icons/,\
source.. = src/
output.. = bin/
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.examples.library.editor/build.properties b/org.eclipse.emf.examples.library.editor/build.properties
index 4d634a9..acfb87b 100644
--- a/org.eclipse.emf.examples.library.editor/build.properties
+++ b/org.eclipse.emf.examples.library.editor/build.properties
@@ -7,4 +7,7 @@ bin.includes = icons/,\
source.. = src/
output.. = bin/
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.examples.library/build.properties b/org.eclipse.emf.examples.library/build.properties
index 83b2176..cc2fcac 100644
--- a/org.eclipse.emf.examples.library/build.properties
+++ b/org.eclipse.emf.examples.library/build.properties
@@ -7,4 +7,7 @@ bin.includes = model/,\
source.. = src/
output.. = bin/
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.exporter.html/build.properties b/org.eclipse.emf.exporter.html/build.properties
index 3cc02df..6c68cba 100644
--- a/org.eclipse.emf.exporter.html/build.properties
+++ b/org.eclipse.emf.exporter.html/build.properties
@@ -9,4 +9,8 @@ exclude.. = **/doc-files/**
source.. = src/
output.. = bin/
src.includes = about.html,\
+ .classpath,\
+ .jetproperties,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.importer.java/build.properties b/org.eclipse.emf.importer.java/build.properties
index c53cb54..07a88f2 100644
--- a/org.eclipse.emf.importer.java/build.properties
+++ b/org.eclipse.emf.importer.java/build.properties
@@ -6,6 +6,7 @@ bin.includes = about.html,\
META-INF/,\
ant_tasks/importer.java.tasks.jar
src.includes = about.html,\
+ examples/,\
readme.html
jars.compile.order = .,\
ant_tasks/importer.java.tasks.jar
diff --git a/org.eclipse.emf.java.edit/build.properties b/org.eclipse.emf.java.edit/build.properties
index 47c16e7..70f7b19 100644
--- a/org.eclipse.emf.java.edit/build.properties
+++ b/org.eclipse.emf.java.edit/build.properties
@@ -9,4 +9,7 @@ output.. = bin/
source.. = src/
exclude.. = **/doc-files/**
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.java.editor/build.properties b/org.eclipse.emf.java.editor/build.properties
index 4306dcc..95fe7f0 100644
--- a/org.eclipse.emf.java.editor/build.properties
+++ b/org.eclipse.emf.java.editor/build.properties
@@ -9,4 +9,7 @@ output.. = bin/
source.. = src/
exclude.. = **/doc-files/**
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.emf.java/build.properties b/org.eclipse.emf.java/build.properties
index 1acca7c..bd1deee 100644
--- a/org.eclipse.emf.java/build.properties
+++ b/org.eclipse.emf.java/build.properties
@@ -9,4 +9,7 @@ output.. = bin/
source.. = src/
exclude.. = **/doc-files/**
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
diff --git a/org.eclipse.xsd.doc/build/antJavadoc.sh b/org.eclipse.xsd.doc/build/antJavadoc.sh
index b3b5fbd..0273db5 100644
--- a/org.eclipse.xsd.doc/build/antJavadoc.sh
+++ b/org.eclipse.xsd.doc/build/antJavadoc.sh
@@ -12,9 +12,9 @@ pluginName="org.eclipse.xsd";
debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
-#if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-#export PATH=${PATH}:${ANT_HOME}/bin
+if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
+if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
+export PATH=${PATH}:${ANT_HOME}/bin
# current directory - all but the name of this script, no trailing slash
currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
@@ -46,7 +46,7 @@ function groupPackage
done
fi
if [[ $debug -gt 1 ]]; then echo "[antJd] *.java in srcDir: "; echo "-----------------"; find $srcDir -type f -name '*.java'; echo "-----------------"; fi
- packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | fromdos | sort | uniq | xargs | sed -e 's/ /:/g'`;
+ packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
# packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);.*/\1/' | sort | uniq | xargs | sed -e 's/ /:/g'` # old way
if [[ $debug -gt 1 ]]; then echo "[antJd] packages1: "$packages; fi
packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`; # slash escape
@@ -72,13 +72,13 @@ groupPackage org.eclipse.emf.mapping.xsd2ecore.editor
# The directory of the plugins in the order they were built
excludes="resources.jar";
includes="org.eclipse.xsd|org.eclipse.emf.mapping.xsd2ecore";
-pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
### so that all classes/packages (and thus @links) can be resolved
# All the jars in the plugins directory
-classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
+classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
if [ $debug -gt 1 ]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
# Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
diff --git a/org.eclipse.xsd.doc/build/javadoc.xml.template b/org.eclipse.xsd.doc/build/javadoc.xml.template
index 81621c8..4ddba25 100644
--- a/org.eclipse.xsd.doc/build/javadoc.xml.template
+++ b/org.eclipse.xsd.doc/build/javadoc.xml.template
@@ -12,7 +12,7 @@
<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
<target name="extractPlatformJavadoc" unless="platformJavadocExists">
- <unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
+ <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
diff --git a/org.eclipse.xsd.example.installer/customBuildCallbacks.xml b/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
index 5e691d6..01b7020 100644
--- a/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
+++ b/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
@@ -18,15 +18,26 @@
<!-- ===================================================================== -->
<target name="pre.build.jars">
- <echo message="Copying example plugin projects ..."/>
- <copy todir="${build.result.folder}/examples/org.eclipse.xsd.example" includeemptydirs="true" failonerror="true">
- <fileset dir="${build.result.folder}/../org.eclipse.xsd.example/">
+ <!-- ${build.result.folder} = /home/www-data/build/emf/downloads/drops/2.4.0/N200805051552/eclipse/plugins/org.eclipse.emf.example.installer -->
+ <property file="${build.result.folder}/../../../build.cfg" />
+ <condition property="exampleCVSTag" value="build_${buildTimestamp}" else="${branch}">
+ <istrue value="${tagBuild}"/>
+ </condition>
+ <echo message="Checking out org.eclipse.mdt/org.eclipse.xsd/examples from ${exampleCVSTag} ..."/>
+ <cvs failonerror="true" dest="${build.result.folder}/examples" cvsroot=":pserver:anonymous at dev.eclipse.org:/cvsroot/modeling">
+ <commandline>
+ <argument line="-Q export -r ${exampleCVSTag} org.eclipse.mdt/org.eclipse.xsd/examples" />
+ </commandline>
+ </cvs>
+
+ <move todir="${build.result.folder}/examples/" includeemptydirs="true">
+ <fileset dir="${build.result.folder}/examples/org.eclipse.mdt/org.eclipse.xsd/examples/">
<exclude name="**/.cvsignore" />
- <exclude name="**/javaCompiler...args" />
- <exclude name="**/build.xml" />
<exclude name="**/build/**" />
</fileset>
- </copy>
+ </move>
+
+ <delete dir="${build.result.folder}/examples/org.eclipse.mdt" />
</target>
diff --git a/org.eclipse.xsd.example/build.properties b/org.eclipse.xsd.example/build.properties
index c4985b3..7a99b4a 100644
--- a/org.eclipse.xsd.example/build.properties
+++ b/org.eclipse.xsd.example/build.properties
@@ -9,6 +9,9 @@ bin.includes = about.html,\
plugin.properties,\
META-INF/
src.includes = about.html,\
+ .classpath,\
+ .project,\
+ .settings/,\
build.properties
source.. = src/
output.. = bin/
hooks/post-receive
--
eclipse-emf - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list