Move jflex download out from update_dependencies, add lexer (ant) tasks to frontend project

build.gradle.kts

@@ -17,7 +17,8 @@ buildscript {
             "https://plugins.gradle.org/m2")
             "https://plugins.gradle.org/m2",
             "http://dl.bintray.com/kotlin/kotlinx",
-            "https://repo.gradle.org/gradle/libs-releases-local") // for native-platform
+            "https://repo.gradle.org/gradle/libs-releases-local", // for native-platform
+            "https://jetbrains.bintray.com/intellij-third-party-dependencies") // for jflex
 
     extra["repos"] = repos
 
@@ -131,6 +132,7 @@ extra["versions.ant-launcher"] = "1.8.0"
 extra["versions.robolectric"] = "3.1"
 extra["versions.org.springframework"] = "4.2.0.RELEASE"
 extra["versions.idea.NodeJS"] = "172.3757.32"
+extra["versions.jflex"] = "1.7.0"
 
 val markdownVer =  "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin"
 extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])"

compiler/frontend/build.gradle.kts

@@ -3,6 +3,8 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+val jflexPath by configurations.creating
+
 dependencies {
     compile(project(":core:descriptors"))
     compile(project(":core:deserialization"))
@@ -11,9 +13,15 @@ dependencies {
     compile(project(":compiler:resolution"))
     compile(projectDist(":kotlin-script-runtime"))
     compile(commonDep("io.javaslang","javaslang"))
+    jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
+
+ant.importBuild("buildLexer.xml")
+
+ant.properties["builddir"] = buildDir.absolutePath
+ant.properties["flex.classpath"] = jflexPath.asPath

compiler/frontend/buildLexer.xml

@@ -1,12 +1,13 @@
 <project name="KotlinLexer" default="lexer">
     <property name="home" value="${basedir}"/>
-    <property name="flex.base" value="${home}/../../dependencies/jflex"/>
-    <property name="out.dir" value="${basedir}/tmpout"/>
+    <property name="builddir" value="${basedir}/build"/>
+    <property name="flex.classpath" value="${home}/../../dependencies/jflex/JFlex.jar"/>
+    <property name="out.dir" value="${builddir}/tmpout"/>
 
     <macrodef name="flex">
       <attribute name="flexfile"/>
       <attribute name="destdir"/>
-      <attribute name="skeleton" default="${flex.base}/idea-flex.skeleton"/>
+      <attribute name="skeleton" default="${builddir}/idea-flex.skeleton"/>
       <sequential>
         <delete dir="${out.dir}"/>
         <mkdir dir="${out.dir}"/>
@@ -20,7 +21,7 @@
           <arg value="${out.dir}"/>
           <arg value="@{flexfile}"/>
           <classpath>
-            <pathelement location="${flex.base}/JFlex.jar"/>
+            <pathelement path="${flex.classpath}"/>
           </classpath>
         </java>
         <move todir="@{destdir}">
@@ -32,7 +33,16 @@
       </sequential>
     </macrodef>
 
-    <target name="lexer">
+    <target name="check-idea-flex.skeleton.exists">
+        <available file="${builddir}/idea-flex.skeleton" property="skjeleton.exisits"/>
+    </target>
+
+    <target name="get-idea-flex.skeleton.if.not.exists" depends="check-idea-flex.skeleton.exists" unless="skjeleton.exisits">
+        <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/idea-flex.skeleton"
+             dest="${builddir}/idea-flex.skeleton" usetimestamp="true"/>
+    </target>
+
+    <target name="lexer" depends="get-idea-flex.skeleton.if.not.exists">
         <flex flexfile="${home}/src/org/jetbrains/kotlin/lexer/Kotlin.flex"
               destdir="${home}/src/org/jetbrains/kotlin/lexer/"/>
 

update_dependencies.xml

@@ -133,12 +133,6 @@
         <delete dir="${dependencies}/dx-src" failonerror="false"/>
         <untar src="${dependencies}/download/${android-sources.tgz}" dest="${dependencies}/dx-src" compression="gzip"/>
 
-        <mkdir dir="${dependencies}/jflex"/>
-        <get src="https://jetbrains.bintray.com/intellij-third-party-dependencies/org/jetbrains/intellij/deps/jflex/jflex/1.7.0/jflex-1.7.0.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="org/jline" lib="jline" version="3.3.1" target.jar.name.base="jline3"/>