From 58d774c9597d0b6c1a6cff9f2a5df8a723a49e55 Mon Sep 17 00:00:00 2001
From: Fabio Zadrozny <fabiofz@gmail.com>
Date: Sat, 19 Oct 2024 08:24:17 -0300
Subject: [PATCH] Vendor the javacc version used to build the parser.

---
 .../src/org/python/pydev/parser/grammar30/build.xml             | 2 +-
 .../src/org/python/pydev/parser/grammar310/build.xml            | 2 +-
 .../src/org/python/pydev/parser/grammar311/build.xml            | 2 +-
 .../src/org/python/pydev/parser/grammar312/build.xml            | 2 +-
 .../src/org/python/pydev/parser/grammar36/build.xml             | 2 +-
 .../src/org/python/pydev/parser/grammar38/build.xml             | 2 +-
 .../src/org/python/pydev/parser/grammar_fstrings/build.xml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/build.xml
index d49df38462..1ed2089d67 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"/>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/build.xml
index 5388831183..be9558737f 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"></property>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/build.xml
index b464dc8226..166641fd60 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"></property>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/build.xml
index c3244d59a0..66ea992387 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"></property>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar36/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar36/build.xml
index b289a31ddd..0f17dd932b 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar36/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar36/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"></property>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar38/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar38/build.xml
index 15e74e6988..75852b39ec 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar38/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar38/build.xml
@@ -1,7 +1,7 @@
 <project name="jython-parser" default="parser">
 
 	<property environment="env"></property>
-	<property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+	<property name="javaccHome" value="../../../../../../javacc"/>
 	<property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar_fstrings/build.xml b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar_fstrings/build.xml
index d7d3566c90..91c6b1fbe6 100644
--- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar_fstrings/build.xml
+++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar_fstrings/build.xml
@@ -3,7 +3,7 @@
 	
 
 	<property environment="env"/>
-    <property name="javaccHome" value="${env.GRAMMAR_JAVACC_DIR}"/>
+    <property name="javaccHome" value="../../../../../../javacc"/>
     <property name="python" value="${env.GRAMMAR_PYTHON_EXE}" />
     <property name="basedir" value="." />
     <property name="parser.dir" value="${basedir}" />