This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipse-wtp.
commit 109e4d7891cad2279ec605038f15944834db20bd Author: Emmanuel Bourg <[email protected]> Date: Fri Nov 4 17:05:09 2016 +0100 Fixed the compatibility with the latest version of JFlex --- debian/changelog | 1 + debian/control | 2 +- debian/patches/jflex-compatibility.patch | 126 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 5 files changed, 130 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1793f01..3abedd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ eclipse-wtp (3.6.3-2) UNRELEASED; urgency=medium * Team upload. + * Fixed the compatibility with the latest version of JFlex * Standards-Version updated to 3.9.8 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 34ec3a6..d382aea 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 10), libxml-commons-resolver1.1-java (>= 1.2-7), javahelper (>= 0.31), dita-ot, - jflex, + jflex (>= 1.6), cup, jikespg, xml-core, diff --git a/debian/patches/jflex-compatibility.patch b/debian/patches/jflex-compatibility.patch new file mode 100644 index 0000000..bd078b7 --- /dev/null +++ b/debian/patches/jflex-compatibility.patch @@ -0,0 +1,126 @@ +Description: Fixes the compatibility with the latest version of JFlex in Debian +Author: Emmanuel Bourg <ebourg@âpache.org> +Forwarded: no +--- a/org.eclipse.wst.xml.core/DevTimeSupport/buildParser.xml ++++ b/org.eclipse.wst.xml.core/DevTimeSupport/buildParser.xml +@@ -3,7 +3,7 @@ + + <!-- Note: for Eclipse env., the JFlex 1.4 jar should be added + to the ant global entries --> +- <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" /> ++ <taskdef classname="jflex.anttask.JFlexTask" name="jflex" /> + + <target name="init"> + <property name="src.file" value="XMLHeadTokenizer.jFlex"/> +@@ -25,8 +25,9 @@ + verbose="true" + nobak="true" + time="on" ++ legacydot="on" + /> + </target> + + +-</project> +\ No newline at end of file ++</project> +--- a/org.eclipse.wst.xml.xpath2.processor/build.xml ++++ b/org.eclipse.wst.xml.xpath2.processor/build.xml +@@ -20,10 +20,10 @@ + Build File for Compiler Project + </description> + +- <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpath="${basedir}/lib/JFlex.jar" /> ++ <taskdef classname="jflex.anttask.JFlexTask" name="jflex" classpath="${basedir}/lib/JFlex.jar" /> + + <target name="generate_parser"> +- <jflex file="grammars/xpath.lex" destdir="grammars/generated"/> ++ <jflex file="grammars/xpath.lex" destdir="grammars/generated" legacydot="on"/> + <copy tofile="${basedir}/src/org/eclipse/wst/xml/xpath2/processor/internal/XPathFlex.java" file="grammars/generated/org/eclipse/wst/xml/xpath2/processor/internal/XPathFlex.java"/> + <replaceregexp file="${basedir}/src/org/eclipse/wst/xml/xpath2/processor/internal/XPathFlex.java" + match="sym.EOF" +--- a/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer/XMLHeadTokenizer.jFlex ++++ b/org.eclipse.wst.sse.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer/XMLHeadTokenizer.jFlex +@@ -145,7 +145,6 @@ + %unicode + %ignorecase + //%debug +-%switch + %buffer 8192 + + UTF16BE = \xFE\xFF +@@ -257,4 +256,4 @@ + // this rule always in effect + <<EOF>> {hasMore = false; return EncodingParserConstants.EOF;} + +- +\ No newline at end of file ++ +--- a/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex ++++ b/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XMLHeadTokenizer.jFlex +@@ -141,7 +141,6 @@ + %unicode + %ignorecase + //%debug +-%switch + %buffer 8192 + + UTF16BE = \xFE\xFF +@@ -251,4 +250,4 @@ + // this rule always in effect + <<EOF>> {hasMore = false; return EncodingParserConstants.EOF;} + +- +\ No newline at end of file ++ +--- a/org.eclipse.wst.xml.core/DevTimeSupport/buildNames.xml ++++ b/org.eclipse.wst.xml.core/DevTimeSupport/buildNames.xml +@@ -3,7 +3,7 @@ + + <!-- Note: for Eclipse env., the JFlex 1.4 jar should be added + to the ant global entries --> +- <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" /> ++ <taskdef classname="jflex.anttask.JFlexTask" name="jflex" /> + + <target name="init"> + <property name="src.file" value="XML10Names.jFlex"/> +@@ -25,8 +25,9 @@ + verbose="true" + nobak="true" + time="on" ++ legacydot="on" + /> + </target> + + +-</project> +\ No newline at end of file ++</project> +--- a/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex ++++ b/org.eclipse.wst.xml.core/DevTimeSupport/HeadParsers/XML10Names.jFlex +@@ -15,7 +15,6 @@ + + %% + +-%table + %public + %final + %class XML10Names +--- a/org.eclipse.wst.sse.core/DevTimeSupport/build.xml ++++ b/org.eclipse.wst.sse.core/DevTimeSupport/build.xml +@@ -42,7 +42,7 @@ + </target> + + <target name="run-jflex" depends="init"> +- <java classname="JFlex.Main" maxmemory="${jflex.maxmemory}" fork="yes" > ++ <java classname="jflex.Main" maxmemory="${jflex.maxmemory}" fork="yes" > + <arg line="${src.dir}/${src.file} ${jflex.opt}"/> + <classpath> + <pathelement location="${jflex.jar}"/> +@@ -72,4 +72,4 @@ + </target> + + +-</project> +\ No newline at end of file ++</project> diff --git a/debian/patches/series b/debian/patches/series index 3e3a218..4da92cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ rhino-1.7R4-compatibility.patch genmodel-customizations.patch dont-use-org.eclipse.equinox.bidi.patch unversioned-com.ibm.icu.patch +jflex-compatibility.patch diff --git a/debian/rules b/debian/rules index 3ba994e..0959477 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ override_jh_compilefeatures: # Regenerate CSSTokenizer cd debian/.eclipse-build/org.eclipse.wst.sse.core/DevTimeSupport && \ - CLASSPATH=/usr/share/java/JFlex.jar ant CSSTokenizer + CLASSPATH=/usr/share/java/jflex.jar ant CSSTokenizer # Regenerate xpath2 parser cd debian/.eclipse-build/org.eclipse.wst.xml.xpath2.processor && ant generate_parser -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
