You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/08/28 13:30:16 UTC
svn commit: r1621119 - in /lucene/dev/branches/branch_4x: ./ build.xml
extra-targets.xml lucene/ lucene/common-build.xml
Author: uschindler
Date: Thu Aug 28 11:30:15 2014
New Revision: 1621119
URL: http://svn.apache.org/r1621119
Log:
Merged revision(s) 1621118 from lucene/dev/trunk:
Move some properties to begin of build files, so its easier to understand what can be changed.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/extra-targets.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1621119&r1=1621118&r2=1621119&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Thu Aug 28 11:30:15 2014
@@ -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 Sett
</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"/>
Modified: lucene/dev/branches/branch_4x/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/extra-targets.xml?rev=1621119&r1=1621118&r2=1621119&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/extra-targets.xml (original)
+++ lucene/dev/branches/branch_4x/extra-targets.xml Thu Aug 28 11:30:15 2014
@@ -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>
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1621119&r1=1621118&r2=1621119&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Thu Aug 28 11:30:15 2014
@@ -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"/>