Move some properties to begin of build files, so its easier to understand what can be changed.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1621118 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -27,6 +27,21 @@
   <!-- include version number from property file (includes "version.*" properties) -->
   <loadproperties srcFile="lucene/version.properties"/>
 
+  <!-- define here, as common-build is not included! TODO: maybe include into a property file like the version? -->
+  <property name="python32.exe" value="python3.2" />
+
+  <!-- other settings: -->
+  <property name="tests.heap-dump-dir" location="heapdumps"/>
+  
+  <property name="maven-build-dir" value="maven-build"/>
+  <property name="maven-version" value="2.2.1"/>
+  <property name="maven.dependencies.filters.file" location="lucene/build/maven.dependencies.filters.properties"/>
+
+  <property name="fakeRelease" location="lucene/build/fakeRelease"/>
+  <property name="fakeReleaseTmp" location="lucene/build/fakeReleaseTmp"/>
+  <property name="fakeReleaseVersion" value="${version.base}"/>
+  <property name="smokeTestRelease.testArgs" value=""/>
+
   <target name="-projecthelp">
     <java fork="false" classname="org.apache.tools.ant.Main" taskname="-">
       <arg value="-projecthelp"/>
@@ -39,8 +54,6 @@
     <subant buildpath="lucene" target="test-help" inheritall="false" failonerror="true"/>
   </target>
 
-  <property name="tests.heap-dump-dir" location="heapdumps"/>
-  
   <target name="precommit" description="Run basic checks before committing"
           depends="check-svn-working-copy,validate,documentation-lint"/>
 
@@ -147,11 +160,6 @@
     </subant>
   </target>
 
-  <property name="maven-build-dir" value="maven-build"/>
-  <property name="maven-version" value="2.2.1"/>
-
-  <property name="maven.dependencies.filters.file" location="lucene/build/maven.dependencies.filters.properties"/>
-
   <target name="get-maven-poms" depends="resolve" 
           description="Copy Maven POMs from dev-tools/maven/ to maven-build/">
     <ant dir="lucene" target="-get-maven-poms" inheritall="false"/>
@@ -365,13 +373,6 @@ File | Project Structure | Platform Settings | SDKs):
     </subant>
   </target>
 
-  <!-- define here, as common-build is not included! -->
-  <property name="python32.exe" value="python3.2" />
-  <property name="fakeRelease" location="lucene/build/fakeRelease"/>
-  <property name="fakeReleaseTmp" location="lucene/build/fakeReleaseTmp"/>
-  <property name="fakeReleaseVersion" value="${version.base}"/>
-  <property name="smokeTestRelease.testArgs" value=""/>
-
   <target name="-load-env">
      <!-- load the properties only here, so not on every invocation /usr/bin/env is called: -->
      <property environment="env"/>

extra-targets.xml

@@ -25,6 +25,8 @@
   
   <import file="lucene/common-build.xml"/>
 
+  <property name="svnkit.version" value="1.8.5"/>
+
   <target name="-run-test">
     <mkdir dir="lucene/build" />
     <tempfile property="tests.totals.tmpfile"
@@ -92,8 +94,6 @@
     <svn-checker failonmodifications="true"/>
   </target>
   
-  <property name="svnkit.version" value="1.8.5"/>
-
   <macrodef xmlns:ivy="antlib:org.apache.ivy.ant" name="svn-checker">
     <attribute name="failonmodifications" default="true"/> <!-- false if file modifications are allowed -->
     <sequential>

lucene/common-build.xml

@@ -27,11 +27,7 @@
   </description>
 
   <dirname file="${ant.file.common}" property="common.dir"/>
-  <property name="dev-tools.dir" location="${common.dir}/../dev-tools"/>
-  <property name="prettify.dir" location="${common.dir}/tools/prettify"/>
-  <property name="maven.build.dir" location="${build.dir}/maven"/>
-  <property name="license.dir" location="${common.dir}/licenses"/>
-
+  
   <!-- Give user a chance to override without editing this file
       (and without typing -D each time it compiles it -->
   <property file="${user.home}/lucene.build.properties"/>
@@ -39,6 +35,11 @@
   <property file="${basedir}/build.properties"/>
   <property file="${common.dir}/build.properties"/>
 
+  <property name="dev-tools.dir" location="${common.dir}/../dev-tools"/>
+  <property name="prettify.dir" location="${common.dir}/tools/prettify"/>
+  <property name="maven.build.dir" location="${build.dir}/maven"/>
+  <property name="license.dir" location="${common.dir}/licenses"/>
+
   <tstamp>
     <format property="current.year" pattern="yyyy"/>
     <format property="DSTAMP" pattern="yyyy-MM-dd"/>