[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. b9cdc9b364e8ca56042bb29f8fe037da489df3c0
Niels Thykier
nthykier-guest at alioth.debian.org
Sun Feb 14 17:03:43 UTC 2010
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 b9cdc9b364e8ca56042bb29f8fe037da489df3c0 (commit)
from 3a7a9e85b9b31d0d965a7028d3540cee4cf40027 (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 b9cdc9b364e8ca56042bb29f8fe037da489df3c0
Author: Niels Thykier <niels at thykier.net>
Date: Sun Feb 14 18:03:30 2010 +0100
Applied all patches and added a new one to rename unix2dos to fromdos.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/series | 1 +
debian/patches/unix2dos.patch | 26 ++++++
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 -
18 files changed, 118 insertions(+), 80 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 4bafaf8..63eba8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ eclipse-emf-platform-docs-location.patch
eclipse-emf-symlinked-classpath.patch
eclipse-emf-build-props.patch
eclipse-emf-bundle-examples.patch
+unix2dos.patch
diff --git a/debian/patches/unix2dos.patch b/debian/patches/unix2dos.patch
new file mode 100644
index 0000000..0ef51e9
--- /dev/null
+++ b/debian/patches/unix2dos.patch
@@ -0,0 +1,26 @@
+diff --git a/org.eclipse.emf.doc/build/antJavadoc.sh b/org.eclipse.emf.doc/build/antJavadoc.sh
+index 2505a6f..2c73574 100644
+--- a/org.eclipse.emf.doc/build/antJavadoc.sh
++++ b/org.eclipse.emf.doc/build/antJavadoc.sh
+@@ -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' | dos2unix | 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' | fromdos | 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
+diff --git a/org.eclipse.xsd.doc/build/antJavadoc.sh b/org.eclipse.xsd.doc/build/antJavadoc.sh
+index 0273db5..b3b5fbd 100644
+--- a/org.eclipse.xsd.doc/build/antJavadoc.sh
++++ b/org.eclipse.xsd.doc/build/antJavadoc.sh
+@@ -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' | dos2unix | 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' | fromdos | 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
diff --git a/org.eclipse.emf.doc/build/antJavadoc.sh b/org.eclipse.emf.doc/build/antJavadoc.sh
index 2505a6f..2c73574 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' | dos2unix | 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' | fromdos | 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 $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+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/'`
### 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 $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/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 e162957..4564459 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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+ <unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
</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 10fd915..1958752 100644
--- a/org.eclipse.emf.example.installer/customBuildCallbacks.xml
+++ b/org.eclipse.emf.example.installer/customBuildCallbacks.xml
@@ -18,27 +18,79 @@
<!-- ===================================================================== -->
<target name="pre.build.jars">
- <!-- ${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/">
+ <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>
- </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" />
+ </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/">
+ <exclude name="**/.cvsignore" />
+ <exclude name="**/javaCompiler...args" />
+ <exclude name="**/build.xml" />
+ <exclude name="**/build/**" />
+ </fileset>
+ </copy>
</target>
<!-- ===================================================================== -->
diff --git a/org.eclipse.emf.examples.generator.validator/build.properties b/org.eclipse.emf.examples.generator.validator/build.properties
index 0f9e992..1feeabf 100644
--- a/org.eclipse.emf.examples.generator.validator/build.properties
+++ b/org.eclipse.emf.examples.generator.validator/build.properties
@@ -9,8 +9,4 @@ 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 acfb87b..4d634a9 100644
--- a/org.eclipse.emf.examples.library.edit/build.properties
+++ b/org.eclipse.emf.examples.library.edit/build.properties
@@ -7,7 +7,4 @@ 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 acfb87b..4d634a9 100644
--- a/org.eclipse.emf.examples.library.editor/build.properties
+++ b/org.eclipse.emf.examples.library.editor/build.properties
@@ -7,7 +7,4 @@ 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 cc2fcac..83b2176 100644
--- a/org.eclipse.emf.examples.library/build.properties
+++ b/org.eclipse.emf.examples.library/build.properties
@@ -7,7 +7,4 @@ 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 6c68cba..3cc02df 100644
--- a/org.eclipse.emf.exporter.html/build.properties
+++ b/org.eclipse.emf.exporter.html/build.properties
@@ -9,8 +9,4 @@ 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 07a88f2..c53cb54 100644
--- a/org.eclipse.emf.importer.java/build.properties
+++ b/org.eclipse.emf.importer.java/build.properties
@@ -6,7 +6,6 @@ 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 70f7b19..47c16e7 100644
--- a/org.eclipse.emf.java.edit/build.properties
+++ b/org.eclipse.emf.java.edit/build.properties
@@ -9,7 +9,4 @@ 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 95fe7f0..4306dcc 100644
--- a/org.eclipse.emf.java.editor/build.properties
+++ b/org.eclipse.emf.java.editor/build.properties
@@ -9,7 +9,4 @@ 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 bd1deee..1acca7c 100644
--- a/org.eclipse.emf.java/build.properties
+++ b/org.eclipse.emf.java/build.properties
@@ -9,7 +9,4 @@ 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 0273db5..b3b5fbd 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' | dos2unix | 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' | fromdos | 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 $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+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/'`
### 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 $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/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 4ddba25..81621c8 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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+ <unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
</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 01b7020..5e691d6 100644
--- a/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
+++ b/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
@@ -18,26 +18,15 @@
<!-- ===================================================================== -->
<target name="pre.build.jars">
- <!-- ${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/">
+ <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/">
<exclude name="**/.cvsignore" />
+ <exclude name="**/javaCompiler...args" />
+ <exclude name="**/build.xml" />
<exclude name="**/build/**" />
</fileset>
- </move>
-
- <delete dir="${build.result.folder}/examples/org.eclipse.mdt" />
+ </copy>
</target>
diff --git a/org.eclipse.xsd.example/build.properties b/org.eclipse.xsd.example/build.properties
index 7a99b4a..c4985b3 100644
--- a/org.eclipse.xsd.example/build.properties
+++ b/org.eclipse.xsd.example/build.properties
@@ -9,9 +9,6 @@ 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