You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2011/07/22 18:54:53 UTC
svn commit: r1149650 - in /incubator/etch/trunk:
binding-cpp/compiler/build.xml build-support/dependencies.xml
build-support/etch.common.xml build-support/etch.includes.xml
build.dependencies build.properties build.xml
Author: fitzner
Date: Fri Jul 22 16:54:52 2011
New Revision: 1149650
URL: http://svn.apache.org/viewvc?rev=1149650&view=rev
Log:
ETCH-152 build system for build server integration
Add option for experimental builds, fix cpp compiler naming, add new setting property file
Added:
incubator/etch/trunk/build.properties
Modified:
incubator/etch/trunk/binding-cpp/compiler/build.xml
incubator/etch/trunk/build-support/dependencies.xml
incubator/etch/trunk/build-support/etch.common.xml
incubator/etch/trunk/build-support/etch.includes.xml
incubator/etch/trunk/build.dependencies
incubator/etch/trunk/build.xml
Modified: incubator/etch/trunk/binding-cpp/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/build.xml?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/build.xml (original)
+++ incubator/etch/trunk/binding-cpp/compiler/build.xml Fri Jul 22 16:54:52 2011
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations *
* under the License. *
-->
-<project name="etch-c-compiler" basedir="." default="help">
+<project name="etch-cpp-compiler" basedir="." default="help">
<description>Etch-to-CPP compiler implementation</description>
<property name="Etch.basedir" location="${basedir}/../.." />
<import file="${Etch.basedir}/build-support/etch.includes.xml" />
Modified: incubator/etch/trunk/build-support/dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/dependencies.xml?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/dependencies.xml (original)
+++ incubator/etch/trunk/build-support/dependencies.xml Fri Jul 22 16:54:52 2011
@@ -26,7 +26,8 @@
<!-- Load dependencies -->
<property file="${Etch.basedir}/build.dependencies" prefix="file" />
-
+ <property file="${Etch.basedir}/build.properties" prefix="file" />
+
<!-- Pull properties from commandline -->
<condition property="build.javacc.home" value="${javacc.home}" >
<isset property="javacc.home" />
Modified: incubator/etch/trunk/build-support/etch.common.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.common.xml?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.common.xml (original)
+++ incubator/etch/trunk/build-support/etch.common.xml Fri Jul 22 16:54:52 2011
@@ -31,6 +31,7 @@
<!-- Load Environment -->
<property environment="env" />
<property file="${Etch.basedir}/build.dependencies" prefix="file" />
+ <property file="${Etch.basedir}/build.properties" prefix="build" />
<!-- Pull properties from commandline -->
<condition property="build.skip.tests" value="${skip.tests}">
Modified: incubator/etch/trunk/build-support/etch.includes.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.includes.xml?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.includes.xml (original)
+++ incubator/etch/trunk/build-support/etch.includes.xml Fri Jul 22 16:54:52 2011
@@ -71,9 +71,10 @@
<target name="info" >
<!-- Info about build -->
<echo>
- =====================================
- Building ${ant.project.name}
- =====================================
+=====================================
+Buil : ${ant.project.name}
+Build-Type: ${build.type}
+=====================================
</echo>
</target>
@@ -147,7 +148,7 @@
</target>
<target name="do-publish">
- <!-- Use this target to publish the build
+ <!-- Use this target to publish the build
results but if the tests successfully
passed -->
<echo>No Publishing defined.</echo>
Modified: incubator/etch/trunk/build.dependencies
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.dependencies?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/build.dependencies (original)
+++ incubator/etch/trunk/build.dependencies Fri Jul 22 16:54:52 2011
@@ -39,8 +39,9 @@ ant-dotnet.lib=${env.ETCH_EXTERNAL_DEPEN
## CMake ANT support
ant-cmake.lib=${env.ETCH_EXTERNAL_DEPENDS}/apache-ant-cmake/1.0
-## include experimental bindings in build? (comment this to exclude)
-#include.experimental=true
+##
+## Settings
+##
## skip tests build? (comment this to exclude)
#skip.tests=true
Added: incubator/etch/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.properties?rev=1149650&view=auto
==============================================================================
--- incubator/etch/trunk/build.properties (added)
+++ incubator/etch/trunk/build.properties Fri Jul 22 16:54:52 2011
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one *
+# or more contributor license agreements. See the NOTICE file *
+# distributed with this work for additional information *
+# regarding copyright ownership. The ASF licenses this file *
+# to you under the Apache License, Version 2.0 (the *
+# "License"); you may not use this file except in compliance *
+# with the License. You may obtain a copy of the License at *
+# *
+# http://www.apache.org/licenses/LICENSE-2.0 *
+# *
+# Unless required by applicable law or agreed to in writing, *
+# software distributed under the License is distributed on an *
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+# KIND, either express or implied. See the License for the *
+# specific language governing permissions and limitations *
+# under the License. *
+
+##
+## Build Settings
+##
+
+# build type stable, experimental
+type=stable
Modified: incubator/etch/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.xml?rev=1149650&r1=1149649&r2=1149650&view=diff
==============================================================================
--- incubator/etch/trunk/build.xml (original)
+++ incubator/etch/trunk/build.xml Fri Jul 22 16:54:52 2011
@@ -158,16 +158,36 @@
<target name="component-bindings">
<!-- Bindings -->
- <build_component dir="binding-xml" />
+ <!-- Stable Bindings -->
+ <condition property="is-build-type-stable">
+ <or>
+ <equals arg1="${build.type}" arg2="stable" />
+ <equals arg1="${build.type}" arg2="experimental" />
+ </or>
+ </condition>
+ <antcall target="component-bindings-stable" />
+
+ <!-- Experimental Bindings -->
+ <condition property="is-build-type-experimental">
+ <equals arg1="${build.type}" arg2="experimental" />
+ </condition>
+ <antcall target="component-bindings-experimental" />
+ </target>
+
+ <target name="component-bindings-stable" if="is-build-type-stable">
+ <!-- Stable Bindings -->
<build_component dir="binding-java" />
<build_component dir="binding-csharp" />
<build_component dir="binding-c" />
</target>
- <target name="component-bindings-experimental" if="include.experimental">
+ <target name="component-bindings-experimental" if="is-build-type-experimental">
<!-- Experimental Bindings -->
<build_component dir="binding-cpp" />
<build_component dir="binding-go" />
+ <!--
+ <build_component dir="binding-xml" />
+ -->
</target>
<target name="component-examples" unless="build.skip.examples">