azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obtaining jflex from github. No IDEA checkout is necessary anymore.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-09-13 00:56:03 +04:00
parent 8ffee527d7
commit 859b0b845a
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/buildLexer.xml
+3 -14
View File
@@ -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"
grammar/buildGrammarLexer.xml
+3 -6
View File
@@ -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>
update_dependencies.xml
+7
View File
@@ -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"/>