diff -r 8329bfbe1b30 -r f8696e0ab9b7 bin/idea.sh
--- a/bin/idea.sh	Tue Jul 31 09:55:09 2018 -0400
+++ b/bin/idea.sh	Tue Jul 31 16:49:51 2018 +0100
@@ -68,9 +68,12 @@
 cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 
 MAKE_DIR="$SCRIPT_DIR/../make"
+SUPPORT_DIR="$SCRIPT_DIR/../build/.idea-support"
 IDEA_MAKE="$MAKE_DIR/idea"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
+mkdir -p $SUPPORT_DIR
+
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
 
 #init template variables
@@ -124,6 +127,11 @@
   echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
+# move build.xml out of .idea, see IDEA-189915
+IDEA_BUILD_OLD=$IDEA_BUILD
+IDEA_BUILD=$SUPPORT_DIR/build.xml
+mv $IDEA_BUILD_OLD $IDEA_BUILD
+
 SOURCE_FOLDER="      <sourceFolder url=\"file://\$MODULE_DIR\$/####\" isTestSource=\"false\" />"
 SOURCE_FOLDERS_DONE="false"