From ff3015527b89a29df0918b7f9ff76f4c983ca7d2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 12 Sep 2011 15:51:39 -0400
Subject: [PATCH] Adjustments to build script for missing build.properties (issue 18)
---
build.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index b3e9721..1025943 100644
--- a/build.xml
+++ b/build.xml
@@ -13,9 +13,19 @@
<property name="project.war.dir" value="${basedir}/war" />
<property name="project.site.dir" value="${basedir}/site" />
<property name="project.resources.dir" value="${basedir}/resources" />
+ <available property="hasBuildProps" file="${basedir}/build.properties"/>
- <!-- Load publication servers, paths, and credentials -->
- <loadproperties srcfile="${basedir}/build.properties" />
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Load build.properties, if available
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="buildprops" if="hasBuildProps">
+ <!-- Load publication servers, paths, and credentials -->
+ <loadproperties>
+ <file file="${basedir}/build.properties" />
+ </loadproperties>
+ </target>
<!--
@@ -23,7 +33,7 @@
Scrape the version info from code and setup the build properties
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="buildinfo">
+ <target name="buildinfo" depends="buildprops">
<!-- extract Gitblit version number from source code -->
<loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
--
Gitblit v1.9.1