From 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 31 Jan 2012 09:35:30 -0500
Subject: [PATCH] Merge pull request #6 from lemval/master
---
build.xml | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index 4d326ea..d286288 100644
--- a/build.xml
+++ b/build.xml
@@ -182,9 +182,11 @@
</jar>
<!-- Gitblit library dependencies -->
- <mkdir dir="${project.deploy.dir}/lib"/>
- <copy todir="${project.deploy.dir}/lib">
+ <mkdir dir="${project.deploy.dir}/ext"/>
+ <copy todir="${project.deploy.dir}/ext">
<fileset dir="${basedir}/ext">
+ <exclude name="junit*.jar" />
+ <exclude name="commons-net*.jar" />
<exclude name="*-sources.jar" />
<exclude name="*-javadoc.jar" />
</fileset>
@@ -195,11 +197,12 @@
<param name="docs.output.dir" value="${project.deploy.dir}/docs" />
</antcall>
- <!-- Copy the sample Groovy hook scripts -->
+ <!-- Copy the supported Groovy hook scripts -->
<mkdir dir="${project.deploy.dir}/groovy" />
<copy todir="${project.deploy.dir}/groovy">
<fileset dir="${basedir}/groovy">
- <include name="**/*" />
+ <include name="sendmail.groovy" />
+ <include name="jenkins.groovy" />
</fileset>
</copy>
@@ -362,11 +365,12 @@
<param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />
</antcall>
- <!-- Copy the sample Groovy hook scripts -->
+ <!-- Copy the supported Groovy hook scripts -->
<mkdir dir="${project.war.dir}/WEB-INF/groovy" />
<copy todir="${project.war.dir}/WEB-INF/groovy">
<fileset dir="${basedir}/groovy">
- <include name="**/*" />
+ <include name="sendmail.groovy" />
+ <include name="jenkins.groovy" />
</fileset>
</copy>
@@ -495,6 +499,15 @@
<copy tofile="${deployments.root}/WEB-INF/reference.properties"
file="${basedir}/distrib/gitblit.properties"/>
+ <!-- Copy the supported Groovy hook scripts -->
+ <mkdir dir="${deployments.root}/WEB-INF/groovy" />
+ <copy todir="${deployments.root}/WEB-INF/groovy">
+ <fileset dir="${basedir}/groovy">
+ <include name="sendmail.groovy" />
+ <include name="jenkins.groovy" />
+ </fileset>
+ </copy>
+
<!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties -->
<!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">
@@ -565,6 +578,7 @@
<resource file="${basedir}/resources/gitblt-favicon.png" />
<resource file="${basedir}/resources/gitweb-favicon.png" />
<resource file="${basedir}/resources/user_16x16.png" />
+ <resource file="${basedir}/resources/users_16x16.png" />
<resource file="${basedir}/resources/settings_16x16.png" />
<resource file="${basedir}/resources/lock_go_16x16.png" />
<resource file="${basedir}/resources/lock_pull_16x16.png" />
@@ -844,13 +858,33 @@
<delete dir="${project.express.dir}" />
</target>
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Update the gh-pages branch with the current site
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="updateGhPages" depends="buildSite">
+ <!-- Build gh-pages branch -->
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages">
+ <classpath refid="master-classpath" />
+ <arg value="--sourceFolder" />
+ <arg value="${basedir}/site" />
+
+ <arg value="--repository" />
+ <arg value="${basedir}" />
+
+ <arg value="--obliterate" />
+ </java>
+ </target>
+
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Publish binaries to Google Code
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code">
+ <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">
<echo>Uploading Gitblit ${gb.version} binaries</echo>
@@ -923,7 +957,7 @@
You must add ext/commons-net-1.4.0.jar to your ANT classpath.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="publishSite" depends="buildSite" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >
+ <target name="publishSite" depends="buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >
<echo>Uploading Gitblit ${gb.version} website</echo>
--
Gitblit v1.9.1