From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.

---
 build.xml |   78 ++++++++++++++++++++++++++++++---------
 1 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/build.xml b/build.xml
index 54cbaa2..a25ba32 100644
--- a/build.xml
+++ b/build.xml
@@ -4,10 +4,33 @@
 	<!-- Project Properties -->
 	<property name="project.jar" value="gitblit.jar" />
 	<property name="project.mainclass" value="com.gitblit.Launcher" />
-	<property name="distribution.zipfile" value="gitblit.zip" />
 	<property name="project.build.dir" value="${basedir}/build" />
 
 	<target name="main">
+
+		<!-- extract version number from source code -->
+		<loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
+			<filterchain>
+				<linecontains>
+					<contains value="public final static String VERSION = " />
+				</linecontains>
+				<striplinebreaks />
+				<tokenfilter>
+					<replacestring from="public final static String VERSION = &quot;" to="" />
+					<replacestring from="&quot;;" to="" />
+					<trim />
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+		<echo>Building Git:Blit ${gb.version}</echo>
+
+		<!-- copy required distribution files to project folder -->
+		<copy todir="${basedir}" overwrite="false">
+			<fileset dir="${basedir}/distrib">
+				<include name="gitblit.properties" />
+				<include name="users.properties" />
+			</fileset>
+		</copy>
 
 		<!-- Compile the build tool and execute it.
 			 This downloads missing compile-time dependencies from Maven. -->
@@ -16,14 +39,13 @@
 		<mkdir dir="${project.build.dir}" />
 		<javac srcdir="${basedir}/src" destdir="${project.build.dir}">
 			<include name="com/gitblit/Build.java" />
+			<include name="com/gitblit/Constants.java" />
+			<include name="com/gitblit/utils/StringUtils.java" />
 		</javac>
 		<java classpath="${project.build.dir}" classname="com.gitblit.Build" />
 
 		<!-- Compile Project -->
 		<path id="master-classpath">
-			<fileset dir="${basedir}/lib">
-				<include name="*.jar" />
-			</fileset>
 			<fileset dir="${basedir}/ext">
 				<include name="*.jar" />
 			</fileset>
@@ -38,16 +60,13 @@
 
 		<!-- Build jar -->
 		<delete file="${project.jar}" />
-		<jar index="true" jarfile="${project.jar}">
+		<jar jarfile="${project.jar}">
 			<fileset dir="${project.build.dir}">
 				<include name="**/*" />
 			</fileset>
 			<manifest>
 				<attribute name="Main-Class" value="${project.mainclass}" />
 			</manifest>
-			<indexjars>
-				<fileset dir="${basedir}/lib" />
-			</indexjars>
 		</jar>
 
 		<!-- Delete the deploy folder -->
@@ -56,22 +75,14 @@
 		<!-- Create deployment folder structure -->
 		<mkdir dir="${basedir}/deploy" />
 		<copy todir="${basedir}/deploy" file="${project.jar}" />
-		<copy todir="${basedir}/deploy/lib">
-			<fileset dir="${basedir}/lib">
-				<include name="**/*.jar" />
-			</fileset>
-		</copy>
 		<copy todir="${basedir}/deploy">
-			<fileset dir="${basedir}/service">
+			<fileset dir="${basedir}/distrib">
 				<include name="**/*" />
-			</fileset>
-			<fileset dir="${basedir}">
-				<include name="*.cmd" />
-				<include name="*.properties" />
 			</fileset>
 		</copy>
 
 		<!-- Create Zip deployment -->
+		<property name="distribution.zipfile" value="gitblit-${gb.version}.zip" />
 		<zip destfile="${distribution.zipfile}">
 			<fileset dir="${basedir}/deploy">
 				<include name="**/*" />
@@ -87,5 +98,36 @@
 				<include name="${project.jar}" />
 			</fileset>
 		</delete>
+
+		<!-- Build Site -->
+		<delete dir="${basedir}/site" />
+		<mkdir dir="${basedir}/site" />
+		<copy todir="${basedir}/site">
+			<fileset dir="${basedir}/src/com/gitblit/wicket/resources">
+				<include name="background.png" />
+				<include name="gitblit.css" />
+				<include name="markdown.css" />
+				<include name="gitblt_25.png" />
+				<include name="gitblt-favicon.png" />
+			</fileset>
+			<fileset dir="${basedir}/docs">
+				<include name="*.png" />
+			</fileset>
+		</copy>
+		<java classpath="${project.build.dir}" classname="com.gitblit.BuildSite">
+			<classpath refid="master-classpath" />
+			<arg value="--sourceFolder" />
+			<arg value="${basedir}/docs" />
+			
+			<arg value="--outputFolder" />
+			<arg value="${basedir}/site" />
+
+			<arg value="--pageHeader" />
+			<arg value="${basedir}/docs/page_header.html" />
+
+			<arg value="--pageFooter" />
+			<arg value="${basedir}/docs/page_footer.html" />
+		</java>
+
 	</target>
 </project>

--
Gitblit v1.9.1