lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1524903 - in /lucene/dev/trunk: build.xml dev-tools/idea/.idea/misc.xml
Date Fri, 20 Sep 2013 05:23:41 GMT
Author: sarowe
Date: Fri Sep 20 05:23:41 2013
New Revision: 1524903

URL: http://svn.apache.org/r1524903
Log:
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

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/dev-tools/idea/.idea/misc.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1524903&r1=1524902&r2=1524903&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Sep 20 05:23:41 2013
@@ -240,16 +240,33 @@
     <property file="${user.home}/lucene.build.properties"/>
     <property file="${user.home}/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=".">
       <fileset dir="dev-tools/idea"/>
       <filterset begintoken="@" endtoken="@">
         <filter token="idea.jdk" value="${idea.jdk}"/>
       </filterset>
     </copy>
+    <antcall target="-post-idea-instructions"/>
+  </target>
+  
+  <target name="-post-idea-instructions" unless="idea.jdk.is.set">
     <echo>
-      To complete IntelliJ IDEA setup, you must manually configure
-      File | Project Structure | Project | Project SDK.
+To complete IntelliJ IDEA setup, you must manually configure
+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>
   </target>
 

Modified: lucene/dev/trunk/dev-tools/idea/.idea/misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/misc.xml?rev=1524903&r1=1524902&r2=1524903&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/misc.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/misc.xml Fri Sep 20 05:23:41 2013
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7"/>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" @idea.jdk@
/>
 </project>
 



Mime
View raw message