From 9be337b389f9edb4c5761fca2c34104ca43c5b08 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 16 Dec 2011 21:18:59 -0500 Subject: [PATCH] Switch GO to monolithic build for installations without internet connection --- build.xml | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index bd25e6c..c540075 100644 --- a/build.xml +++ b/build.xml @@ -181,6 +181,15 @@ </manifest> </jar> + <!-- Gitblit library dependencies --> + <mkdir dir="${project.deploy.dir}/lib"/> + <copy todir="${project.deploy.dir}/lib"> + <fileset dir="${basedir}/ext"> + <exclude name="*-sources.jar" /> + <exclude name="*-javadoc.jar" /> + </fileset> + </copy> + <!-- Build the docs for the deploy --> <antcall target="buildDocs" inheritall="true" inheritrefs="true"> <param name="docs.output.dir" value="${project.deploy.dir}/docs" /> @@ -459,7 +468,7 @@ Build a Gitblit filesystem for deployment to RedHat OpenShif Expresst ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <target name="buildOpenShift" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express"> + <target name="buildExpress" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express"> <echo>Building Gitblit Express for RedHat OpenShift ${gb.version}</echo> <delete dir="${project.express.dir}" /> @@ -825,7 +834,7 @@ Compile from source, publish binaries, and build & deploy site ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <target name="buildAll" depends="buildGO,buildWAR,buildOpenShift,buildFederationClient,buildManager,buildApiLibrary,buildSite"> + <target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite"> <!-- Cleanup --> <delete dir="${project.build.dir}" /> <delete dir="${project.war.dir}" /> @@ -839,7 +848,7 @@ Publish binaries to Google Code ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <target name="publishBinaries" depends="buildGO,buildWAR,buildOpenShift,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code"> + <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code"> <echo>Uploading Gitblit ${gb.version} binaries</echo> @@ -938,4 +947,4 @@ <delete dir="${project.war.dir}" /> <delete dir="${project.deploy.dir}" /> </target> -</project> +</project> -- Gitblit v1.9.1