[bluecove] r3016 committed - build-master native.build.skip=true

1 view
Skip to first unread message

codesite...@google.com

unread,
Sep 14, 2009, 12:54:03 PM9/14/09
to bluecove...@googlegroups.com
Revision: 3016
Author: skarzhevskyy
Date: Mon Sep 14 09:52:56 2009
Log: build-master native.build.skip=true
http://code.google.com/p/bluecove/source/detail?r=3016

Modified:
/trunk/bluecove/pom.xml
/trunk/bluecove-bluez/pom.xml
/trunk/bluecove-gpl/pom.xml
/trunk/pom.xml

=======================================
--- /trunk/bluecove/pom.xml Fri Aug 7 09:44:14 2009
+++ /trunk/bluecove/pom.xml Mon Sep 14 09:52:56 2009
@@ -115,7 +115,6 @@
</dependencies>

<properties>
- <native.build.skip>false</native.build.skip>

<native.source.dir>${basedir}/src/main/c/intelbth</native.source.dir>
</properties>

@@ -542,9 +541,13 @@
<!-- cruisecontrol -->

<profile>
- <!-- build master is now Linux x86-64; Idealy would be nice to
split project to platform dependant modules -->
+ <!-- build master is now Linux; Idealy would be nice to split
project to platform dependant modules -->
<id>build-master</id>

+ <properties>
+ <native.build.skip>true</native.build.skip>
+ </properties>
+
<repositories>
<repository>
<id>pyx4j.com-cruisecontrol-shared-http</id>
=======================================
--- /trunk/bluecove-bluez/pom.xml Sun Sep 13 12:35:59 2009
+++ /trunk/bluecove-bluez/pom.xml Mon Sep 14 09:52:56 2009
@@ -297,7 +297,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <tasks unless="native.build.skip">
<ant
antfile="${basedir}/build.xml" target="compile-native-lib">
<property name="basedir"
value="${basedir}"/>
<property name="buildEnv"
value="${buildEnv}"/>
@@ -370,6 +370,10 @@
<!-- build master takes Linux 32 and x86-64 builds from
repository; Idealy would be nice to split project to platform dependant
modules -->
<id>build-master</id>

+ <properties>
+ <native.build.skip>true</native.build.skip>
+ </properties>
+
<repositories>
<repository>
<id>pyx4j.com-cruisecontrol-shared-http</id>
=======================================
--- /trunk/bluecove-gpl/pom.xml Sun Sep 13 12:55:10 2009
+++ /trunk/bluecove-gpl/pom.xml Mon Sep 14 09:52:56 2009
@@ -208,7 +208,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <tasks unless="native.build.skip">
<ant
antfile="${basedir}/build.xml" target="compile-native-lib">
<property name="basedir"
value="${basedir}"/>
<property name="buildEnv"
value="${buildEnv}"/>
@@ -281,6 +281,10 @@
<!-- build master takes Linux 32 and x86-64 builds from
repository; Idealy would be nice to split project to platform dependant
modules -->
<id>build-master</id>

+ <properties>
+ <native.build.skip>true</native.build.skip>
+ </properties>
+
<repositories>
<repository>
<id>pyx4j.com-cruisecontrol-shared-http</id>
=======================================
--- /trunk/pom.xml Fri Aug 7 09:44:14 2009
+++ /trunk/pom.xml Mon Sep 14 09:52:56 2009
@@ -229,6 +229,8 @@
<javaRunTimeJar>${java.home}/lib/rt.jar</javaRunTimeJar>

<javaRunTimeSecurityJar>${java.home}/lib/jsse.jar</javaRunTimeSecurityJar>

+ <native.build.skip>false</native.build.skip>
+

<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
</properties>

Reply all
Reply to author
Forward
0 new messages