summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-06-28 20:12:51 -0400
committerJames Moger <james.moger@gitblit.com>2011-06-28 20:12:51 -0400
commitd39680e9f54322ddcb40b00503a8ee30aee6c99c (patch)
treed3cc3883fd44e0547663ff8c45ae6c5b69f3ab6b /build.xml
parentd0e26353e62d17a1f6b765a71e9bb45b54806d70 (diff)
downloadgitblit-d39680e9f54322ddcb40b00503a8ee30aee6c99c.tar.gz
gitblit-d39680e9f54322ddcb40b00503a8ee30aee6c99c.zip
Changes for minor 0.5.1 release.v0.5.1
* Clarified SSL certificate generation and configuration in light of the hostname verificiation that JGit currently does despite the http.sslVerify=false setting. * Added some troubleshooting information related to filesystem permissions and reading repositories. * Switched from JavaService to Apache Commons Daemon. Not sure what happened to JavaService as it stopped working for me on Windows 7 with Java 1.6.0_26. Commons Daemon accomplishes the same thing and offers a nice service control utility.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml25
1 files changed, 18 insertions, 7 deletions
diff --git a/build.xml b/build.xml
index e1981a11..2ff62644 100644
--- a/build.xml
+++ b/build.xml
@@ -23,10 +23,6 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="buildinfo">
- <!-- build date -->
- <tstamp>
- <format property="gb.buildDate" pattern="yyyy-MM-dd" />
- </tstamp>
<!-- extract Gitblit version number from source code -->
<loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
@@ -42,7 +38,22 @@
</tokenfilter>
</filterchain>
</loadfile>
-
+
+ <!-- extract Gitblit version date from source code -->
+ <loadfile property="gb.versionDate" srcfile="${basedir}/src/com/gitblit/Constants.java">
+ <filterchain>
+ <linecontains>
+ <contains value="public static final String VERSION_DATE = " />
+ </linecontains>
+ <striplinebreaks />
+ <tokenfilter>
+ <replacestring from="public static final String VERSION_DATE = &quot;" to="" />
+ <replacestring from="&quot;;" to="" />
+ <trim />
+ </tokenfilter>
+ </filterchain>
+ </loadfile>
+
<!-- extract JGit version number from source code -->
<loadfile property="jgit.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
<filterchain>
@@ -229,7 +240,7 @@
<arg value="%WAR%=${distribution.warfile}" />
<arg value="--substitute" />
- <arg value="%BUILDDATE%=${gb.buildDate}" />
+ <arg value="%BUILDDATE%=${gb.versionDate}" />
<arg value="--substitute" />
<arg value="%JGIT%=${jgit.version}" />
@@ -424,7 +435,7 @@
<arg value="%WAR%=${distribution.warfile}" />
<arg value="--substitute" />
- <arg value="%BUILDDATE%=${gb.buildDate}" />
+ <arg value="%BUILDDATE%=${gb.versionDate}" />
<arg value="--substitute" />
<arg value="%JGIT%=${jgit.version}" />