Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

touge: build enhancements

  • Loading branch information...
commit 0ad14be7734e4d856015cefaa3a6ab1ea98c47a4 1 parent 7f1dc73
Ken Gilmer authored November 05, 2011
29  build.xml
... ...
@@ -1,7 +1,26 @@
1 1
 <project name="org.touge">
2  
-	<property name="target" value="jar"></property>
3  
-	<property name="product.dir" location="${basedir}" />
4  
-
5  
-	<ant dir="org.touge.restclient" target="${target}"/>
6  
-	<ant dir="org.touge.osgiutil" target="${target}"/>	
  2
+	<property name="ant-build-common.dir" location="${basedir}/ant-build-common"></property>
  3
+	<property name="deps" location="${basedir}/deps" />
  4
+	<property name="dist" location="${basedir}/dist" />
  5
+	
  6
+	<target name="clean">
  7
+		<property name="target" value="clean"></property>
  8
+		<antcall target="call-children"></antcall>
  9
+	</target>
  10
+	
  11
+	<target name="clobber">
  12
+		<property name="target" value="clobber"></property>
  13
+		<antcall target="call-children"></antcall>
  14
+		<delete dir="${ant-build-common.dir}" />
  15
+	</target>
  16
+	
  17
+	<target name="jar">
  18
+		<property name="target" value="jar"></property>
  19
+		<antcall target="call-children"></antcall>
  20
+	</target>
  21
+	
  22
+	<target name="call-children">
  23
+		<ant dir="org.touge.restclient" target="${target}"/>
  24
+		<ant dir="org.touge.osgiutil" target="${target}"/>			
  25
+	</target>
7 26
 </project>
12  org.touge.osgiutil/build.xml
@@ -20,10 +20,10 @@
20 20
 		</exec>		
21 21
 	</target>
22 22
 
23  
-	<exec executable="/usr/bin/git">
24  
-		<arg line="clone" />
25  
-		<arg line="git://github.com/kgilmer/ant-build-common.git" />
26  
-		<arg line="/tmp/ant-build-common" />
27  
-	</exec>
28  
-	<import file="/tmp/ant-build-common/build-common.xml"/>
  23
+	<property name="ant-build-common.dir" location="/tmp/ant-build-common"></property>
  24
+	<echo message="Importing ant-build-common in ${ant.project.name}."></echo>
  25
+	<exec executable="/bin/sh">
  26
+	  <arg line='-c "git clone git://github.com/kgilmer/ant-build-common.git ${ant-build-common.dir} 2&gt; /dev/null"'/>
  27
+	</exec>	
  28
+	<import file="${ant-build-common.dir}/build-common.xml"/>
29 29
 </project>
12  org.touge.restclient/build.xml
@@ -29,10 +29,10 @@
29 29
 		</exec>
30 30
 	</target>
31 31
 
32  
-	<exec executable="/usr/bin/git">
33  
-		<arg line="clone" />
34  
-		<arg line="git://github.com/kgilmer/ant-build-common.git" />
35  
-		<arg line="/tmp/ant-build-common" />
36  
-	</exec>
37  
-	<import file="/tmp/ant-build-common/build-common.xml"/>	
  32
+	<property name="ant-build-common.dir" location="/tmp/ant-build-common"></property>
  33
+	<echo message="Importing ant-build-common in ${ant.project.name}."></echo>
  34
+	<exec executable="/bin/sh">
  35
+	  <arg line='-c "git clone git://github.com/kgilmer/ant-build-common.git ${ant-build-common.dir} 2&gt; /dev/null"'/>
  36
+	</exec>	
  37
+	<import file="${ant-build-common.dir}/build-common.xml"/>
38 38
 </project>

0 notes on commit 0ad14be

Please sign in to comment.
Something went wrong with that request. Please try again.