mirror of https://github.com/apache/lucene.git
LUCENE-2611: switched the code style file from a manually configured global style to an already-setup per-project code style; adjusted code style continuation indents; added groovy code style support.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074130 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe
parent
6f614bdf2a
commit
12c4c4e987
55
build.xml
55
build.xml
|
|
@ -83,19 +83,9 @@
|
||||||
</echo>
|
</echo>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<condition property="isMac"><os family="mac"/></condition>
|
<target name="idea" description="Setup IntelliJ IDEA configuration">
|
||||||
<condition property="isUnix"><os family="unix"/></condition>
|
|
||||||
<condition property="isWindows"><os family="windows"/></condition>
|
|
||||||
<property environment="env"/>
|
|
||||||
<target name="idea" depends="copy-idea-files,finish-idea-setup-windows,
|
|
||||||
finish-idea-setup-mac,
|
|
||||||
finish-idea-setup-unix"
|
|
||||||
description="Setup IntelliJ IDEA configuration files"/>
|
|
||||||
<target name="copy-idea-files">
|
|
||||||
<copy todir=".">
|
<copy todir=".">
|
||||||
<fileset dir="dev-tools/idea">
|
<fileset dir="dev-tools/idea"/>
|
||||||
<exclude name="Intellij-Lucene-Codestyle.xml"/>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
</copy>
|
||||||
<echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
|
<echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
|
||||||
<subant target="get-je-jar">
|
<subant target="get-je-jar">
|
||||||
|
|
@ -105,57 +95,18 @@
|
||||||
<subant target="get-db-jar">
|
<subant target="get-db-jar">
|
||||||
<fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
|
<fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
|
||||||
</subant>
|
</subant>
|
||||||
</target>
|
|
||||||
<target name="finish-idea-setup-windows" if="isWindows">
|
|
||||||
<echo>
|
<echo>
|
||||||
To install the Lucene/Solr codestyle file, copy
|
|
||||||
dev-tools\idea\Intellij-Lucene-Codestyle.xml to
|
|
||||||
${env.HOMEDRIVE}${env.HOMEPATH}\.IntelliJIdeaXX\config\codestyles\
|
|
||||||
where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
|
|
||||||
After restarting IntelliJ, select "Lucene"
|
|
||||||
from the dropdown list at:
|
|
||||||
Settings | Code Style | Use global settings | Scheme name
|
|
||||||
|
|
||||||
To complete IntelliJ IDEA setup, you must manually configure
|
To complete IntelliJ IDEA setup, you must manually configure
|
||||||
Project Structure | Project | Project SDK.
|
Project Structure | Project | Project SDK.
|
||||||
</echo>
|
</echo>
|
||||||
</target>
|
</target>
|
||||||
<target name="finish-idea-setup-mac" if="isMac">
|
<target name="clean-idea"
|
||||||
<echo>
|
|
||||||
To install the Lucene/Solr codestyle file, copy
|
|
||||||
dev-tools/idea/Intellij-Lucene-Codestyle.xml to
|
|
||||||
~/Library/Preferences/IntelliJXX/codestyles/
|
|
||||||
where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
|
|
||||||
After restarting IntelliJ, select "Lucene"
|
|
||||||
from the dropdown list at:
|
|
||||||
Settings | Code Style | Use global settings | Scheme name
|
|
||||||
|
|
||||||
To complete IntelliJ IDEA setup, you must manually configure
|
|
||||||
Project Structure | Project | Project SDK.
|
|
||||||
</echo>
|
|
||||||
</target>
|
|
||||||
<target name="finish-idea-setup-unix" if="isUnix">
|
|
||||||
<echo>
|
|
||||||
To install the Lucene/Solr codestyle file, copy
|
|
||||||
dev-tools/idea/Intellij-Lucene-Codestyle.xml to
|
|
||||||
~/.IntelliJIdeaXX/config/codestyles/
|
|
||||||
where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
|
|
||||||
After restarting IntelliJ, select "Lucene"
|
|
||||||
from the dropdown list at:
|
|
||||||
Settings | Code Style | Use global settings | Scheme name
|
|
||||||
|
|
||||||
To complete IntelliJ IDEA setup, you must manually configure
|
|
||||||
Project Structure | Project | Project SDK.
|
|
||||||
</echo>
|
|
||||||
</target>
|
|
||||||
<target name="clean-idea"
|
|
||||||
description="Removes all IntelliJ IDEA configuration files">
|
description="Removes all IntelliJ IDEA configuration files">
|
||||||
<delete dir=".idea" failonerror="true"/>
|
<delete dir=".idea" failonerror="true"/>
|
||||||
<delete failonerror="true">
|
<delete failonerror="true">
|
||||||
<fileset dir="." includes="*.iml,*.ipr,*.iws"/>
|
<fileset dir="." includes="*.iml,*.ipr,*.iws"/>
|
||||||
<fileset dir="solr" includes="**/*.iml"/>
|
<fileset dir="solr" includes="**/*.iml"/>
|
||||||
<fileset dir="lucene" includes="**/*.iml"/>
|
<fileset dir="lucene" includes="**/*.iml"/>
|
||||||
<fileset dir="modules" includes="**/*.iml"/>
|
|
||||||
</delete>
|
</delete>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CodeStyleSettingsManager">
|
||||||
|
<option name="PER_PROJECT_SETTINGS">
|
||||||
|
<value>
|
||||||
|
<option name="USE_SAME_INDENTS" value="true" />
|
||||||
|
<option name="OTHER_INDENT_OPTIONS">
|
||||||
|
<value>
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="2" />
|
||||||
|
<option name="USE_TAB_CHARACTER" value="false" />
|
||||||
|
<option name="SMART_TABS" value="false" />
|
||||||
|
<option name="LABEL_INDENT_SIZE" value="0" />
|
||||||
|
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
||||||
|
<option name="USE_RELATIVE_INDENTS" value="false" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="2" />
|
||||||
|
<option name="USE_TAB_CHARACTER" value="false" />
|
||||||
|
<option name="SMART_TABS" value="false" />
|
||||||
|
<option name="LABEL_INDENT_SIZE" value="0" />
|
||||||
|
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
||||||
|
<option name="USE_RELATIVE_INDENTS" value="false" />
|
||||||
|
</ADDITIONAL_INDENT_OPTIONS>
|
||||||
|
<ADDITIONAL_INDENT_OPTIONS fileType="java">
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="2" />
|
||||||
|
<option name="USE_TAB_CHARACTER" value="false" />
|
||||||
|
<option name="SMART_TABS" value="false" />
|
||||||
|
<option name="LABEL_INDENT_SIZE" value="0" />
|
||||||
|
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
||||||
|
<option name="USE_RELATIVE_INDENTS" value="false" />
|
||||||
|
</ADDITIONAL_INDENT_OPTIONS>
|
||||||
|
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="2" />
|
||||||
|
<option name="USE_TAB_CHARACTER" value="false" />
|
||||||
|
<option name="SMART_TABS" value="false" />
|
||||||
|
<option name="LABEL_INDENT_SIZE" value="0" />
|
||||||
|
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
||||||
|
<option name="USE_RELATIVE_INDENTS" value="false" />
|
||||||
|
</ADDITIONAL_INDENT_OPTIONS>
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<code_scheme name="Lucene" parent="Default">
|
|
||||||
<option name="JAVA_INDENT_OPTIONS">
|
|
||||||
<value>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="8" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="false" />
|
|
||||||
<option name="SMART_TABS" value="false" />
|
|
||||||
<option name="LABEL_INDENT_SIZE" value="0" />
|
|
||||||
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
<option name="JSP_INDENT_OPTIONS">
|
|
||||||
<value>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="8" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="false" />
|
|
||||||
<option name="SMART_TABS" value="false" />
|
|
||||||
<option name="LABEL_INDENT_SIZE" value="0" />
|
|
||||||
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
<option name="XML_INDENT_OPTIONS">
|
|
||||||
<value>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="8" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="false" />
|
|
||||||
<option name="SMART_TABS" value="false" />
|
|
||||||
<option name="LABEL_INDENT_SIZE" value="0" />
|
|
||||||
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
<option name="OTHER_INDENT_OPTIONS">
|
|
||||||
<value>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="8" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="false" />
|
|
||||||
<option name="SMART_TABS" value="false" />
|
|
||||||
<option name="LABEL_INDENT_SIZE" value="0" />
|
|
||||||
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
</code_scheme>
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue