MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed updating from sources: Kotlin JARs should not be added download_kotlin.gant classpath because this may lock them and the scripts will fail to updated them

Browse Source
This commit is contained in:
nik
2015-11-18 17:21:14 +03:00
parent 949b38b886
commit edb76a898b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/gant.xml
+5 -4
View File
@@ -1,5 +1,6 @@
<project name="Test gant invocation from Ant script" default="doGant">
<project name="Test gant invocation from Ant script" default="doGant" xmlns:if="ant:if">
<dirname property="build.dir" file="${ant.file}"/>
<property name="include.kotlin.jars.to.classpath" value="true"/>
<property name="project.home" value="${build.dir}/.."/>
<property name="gant.home" value="${project.home}/build/lib/gant"/>
<property name="idea.lib" value="${project.home}/lib"/>
@@ -19,13 +20,13 @@
</fileset>
<pathelement path="${project.home}/build/groovy"/>
<fileset file="${project.home}/jps/lib/optimizedFileManager.jar"/>
<fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false">
<fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
<include name="*.jar"/>
</fileset>
<fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false">
<fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
<include name="kotlin-runtime.jar"/>
</fileset>
<fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false">
<fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
<include name="kotlin-plugin.jar"/>
</fileset>
<fileset dir="${idea.lib}">
build/update.xml
+1
View File
@@ -28,6 +28,7 @@
<java classname="org.apache.tools.ant.Main" fork="true" failonerror="true" dir="${project.home}">
<sysproperty key="workIdeaHome" value="${work.idea.home}"/>
<sysproperty key="gant.script" value="${project.home}/build/scripts/download_kotlin.gant"/>
<sysproperty key="include.kotlin.jars.to.classpath" value="false"/>
<classpath>
<fileset dir="${project.home}/lib/ant/lib">
<include name="*.jar"/>