From 859b0b845ab4c9a1b403799197d7b4f09da3ce0d Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 13 Sep 2013 00:56:03 +0400
Subject: [PATCH] Obtaining jflex from github. No IDEA checkout is necessary
 anymore.

---
 compiler/frontend/buildLexer.xml | 17 +++--------------
 grammar/buildGrammarLexer.xml    |  9 +++------
 update_dependencies.xml          |  7 +++++++
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend/buildLexer.xml b/compiler/frontend/buildLexer.xml
index b7539670c0d..0452dbdb961 100644
--- a/compiler/frontend/buildLexer.xml
+++ b/compiler/frontend/buildLexer.xml
@@ -1,22 +1,12 @@
 <project name="JetLexer" default="lexer">
     <property name="home" value="${basedir}"/>
-<!--
-    This script relies on a custom JFlex that is available in the sources of IntelliJ IDEA Community Edition
-    put the idea.properties file to the root directory of the frontend module, and put the following property there:
-
-       idea.home=../../../idea/src
-
-    where "../../../idea/src" is the relative location of the sources of IntelliJ IDEA Community
--->
-    <property file="${home}/idea.properties"/>
-
-    <property name="flex.base" value="${idea.home}/tools/lexer/jflex-1.4"/>
+    <property name="flex.base" value="${home}/../../dependencies/jflex"/>
     <property name="out.dir" value="${basedir}/tmpout"/>
 
     <macrodef name="flex">
       <attribute name="flexfile"/>
       <attribute name="destdir"/>
-      <attribute name="skeleton" default="${idea.home}/tools/lexer/idea-flex.skeleton"/>
+      <attribute name="skeleton" default="${flex.base}/idea-flex.skeleton"/>
       <sequential>
         <delete dir="${out.dir}"/>
         <mkdir dir="${out.dir}"/>
@@ -31,7 +21,7 @@
           <arg value="${out.dir}"/>
           <arg value="@{flexfile}"/>
           <classpath>
-            <pathelement location="${flex.base}/lib/JFlex.jar"/>
+            <pathelement location="${flex.base}/JFlex.jar"/>
           </classpath>
         </java>
         <move todir="@{destdir}">
@@ -44,7 +34,6 @@
     </macrodef>
 
     <target name="lexer">
-        <echo message="${flex.base}"/>
         <flex flexfile="${home}/src/org/jetbrains/jet/lexer/Jet.flex"
               destdir="${home}/src/org/jetbrains/jet/lexer/"/>
         <flex flexfile="${home}/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex"
diff --git a/grammar/buildGrammarLexer.xml b/grammar/buildGrammarLexer.xml
index be4f0db1fc8..c760bf3f503 100644
--- a/grammar/buildGrammarLexer.xml
+++ b/grammar/buildGrammarLexer.xml
@@ -1,14 +1,12 @@
 <project name="GrammarLexer" default="lexer">
     <property name="home" value="${basedir}"/>
-    <property file="${home}/../compiler/frontend/idea.properties"/>
-
-    <property name="flex.base" value="${idea.home}/tools/lexer/jflex-1.4"/>
+    <property name="flex.base" value="${home}/../dependencies/jflex"/>
     <property name="out.dir" value="${basedir}/tmpout"/>
 
     <macrodef name="flex">
       <attribute name="flexfile"/>
       <attribute name="destdir"/>
-      <attribute name="skeleton" default="${idea.home}/tools/lexer/idea-flex.skeleton"/>
+      <attribute name="skeleton" default="${flex.base}/idea-flex.skeleton"/>
       <sequential>
         <delete dir="${out.dir}"/>
         <mkdir dir="${out.dir}"/>
@@ -23,7 +21,7 @@
           <arg value="${out.dir}"/>
           <arg value="@{flexfile}"/>
           <classpath>
-            <pathelement location="${flex.base}/lib/JFlex.jar"/>
+            <pathelement location="${flex.base}/JFlex.jar"/>
           </classpath>
         </java>
         <move todir="@{destdir}">
@@ -36,7 +34,6 @@
     </macrodef>
 
     <target name="lexer">
-        <echo message="${flex.base}"/>
         <flex flexfile="${home}/src/org/jetbrains/jet/grammar/Grammar.flex"
               destdir="${home}//src/org/jetbrains/jet/grammar/"/>
     </target>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 2cbf4c98955..706d7c818c3 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -111,6 +111,13 @@
         <!-- dx.jar -->
         <get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/>
 
+        <!-- jflex 1.4 -->
+        <mkdir dir="dependencies/jflex"/>
+        <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/jflex-1.4/lib/JFlex.jar"
+             dest="dependencies/jflex/JFlex.jar" usetimestamp="true" />
+        <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/idea-flex.skeleton"
+             dest="dependencies/jflex/idea-flex.skeleton" usetimestamp="true" />
+
         <!-- jline -->
         <get-maven-library prefix="jline" lib="jline" version="2.9" target.jar.name.base="jline"/>