Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Intellij config: JDK setup: add missing interpolation marker in dev-tools/idea/.idea/misc.xml; dont print out follow-on instructions if ${idea.jdk} is defined; and when follow-on instructions are printed, show how to avoid the need to manually configure the JDK 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1524903 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-09-20 05:23:41 +00:00
parent 344d4357e3
commit c9dc2be5ff
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.xml
View File

@ -240,16 +240,33 @@
<property file="${user.home}/lucene.build.properties"/> <property file="${user.home}/lucene.build.properties"/>
<property file="${user.home}/build.properties"/> <property file="${user.home}/build.properties"/>
<property file="lucene/build.properties"/> <property file="lucene/build.properties"/>
<property name="idea.jdk" value=""/> <!-- Define ${idea.jdk} if it's not in any *build.properties file --> <condition property="idea.jdk.is.set">
<isset property="idea.jdk"/>
</condition>
<!-- Define ${idea.jdk} if it's not in any *build.properties file -->
<property name="idea.jdk" value=""/>
<copy todir="."> <copy todir=".">
<fileset dir="dev-tools/idea"/> <fileset dir="dev-tools/idea"/>
<filterset begintoken="@" endtoken="@"> <filterset begintoken="@" endtoken="@">
<filter token="idea.jdk" value="${idea.jdk}"/> <filter token="idea.jdk" value="${idea.jdk}"/>
</filterset> </filterset>
</copy> </copy>
<antcall target="-post-idea-instructions"/>
</target>
<target name="-post-idea-instructions" unless="idea.jdk.is.set">
<echo> <echo>
To complete IntelliJ IDEA setup, you must manually configure To complete IntelliJ IDEA setup, you must manually configure
File | Project Structure | Project | Project SDK. File | Project Structure | Project | Project SDK.
You won't have to do this in the future if you define property
$${idea.jdk}, e.g. in ~/lucene.build.properties, ~/build.properties
or lucene/build.properties, with a value consisting of the
following two XML attributes/values (adjust values according to
JDKs you have defined locally - see
File | Project Structure | Platform Settings | SDKs):
idea.jdk = project-jdk-name="1.7" project-jdk-type="JavaSDK"
</echo> </echo>
</target> </target>

2
dev-tools/idea/.idea/misc.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7"/> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" @idea.jdk@ />
</project> </project>