From 0d3e3ca5b85d7e81066030a5081ea3a9cbe76607 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 21 Jul 2011 14:48:15 -0400 Subject: [PATCH] Rollback to Jetty 7.4.3 for now. --- build.xml | 568 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 521 insertions(+), 47 deletions(-) diff --git a/build.xml b/build.xml index 54cbaa2..c94cbe5 100644 --- a/build.xml +++ b/build.xml @@ -1,13 +1,93 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="gitblit" default="main" basedir="."> +<project name="gitblit" default="compile" basedir="."> + + <!-- Google Code upload task --> + <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" + classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/> <!-- 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" /> + <property name="project.deploy.dir" value="${basedir}/deploy" /> + <property name="project.war.dir" value="${basedir}/war" /> + <property name="project.site.dir" value="${basedir}/site" /> + <property name="project.resources.dir" value="${basedir}/resources" /> - <target name="main"> + <!-- Load publication servers, paths, and credentials --> + <loadproperties srcfile="${basedir}/build.properties" /> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Scrape the version info from code and setup the build properties + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildinfo"> + + <!-- extract Gitblit version number from source code --> + <loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java"> + <filterchain> + <linecontains> + <contains value="public static final String VERSION = " /> + </linecontains> + <striplinebreaks /> + <tokenfilter> + <replacestring from="public static final String VERSION = "" to="" /> + <replacestring from="";" to="" /> + <trim /> + </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 = "" to="" /> + <replacestring from="";" to="" /> + <trim /> + </tokenfilter> + </filterchain> + </loadfile> + + <!-- extract JGit version number from source code --> + <loadfile property="jgit.version" srcfile="${basedir}/src/com/gitblit/Constants.java"> + <filterchain> + <linecontains> + <contains value="public static final String JGIT_VERSION = " /> + </linecontains> + <striplinebreaks /> + <tokenfilter> + <replacestring from="public static final String JGIT_VERSION = "" to="" /> + <replacestring from="";" to="" /> + <trim /> + </tokenfilter> + </filterchain> + </loadfile> + <property name="distribution.zipfile" value="gitblit-${gb.version}.zip" /> + <property name="distribution.warfile" value="gitblit-${gb.version}.war" /> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Compile + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="compile" depends="buildinfo" description="Retrieves dependencies and compiles Gitblit from source"> + + <!-- 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. --> @@ -15,77 +95,471 @@ <delete dir="${project.build.dir}" /> <mkdir dir="${project.build.dir}" /> <javac srcdir="${basedir}/src" destdir="${project.build.dir}"> - <include name="com/gitblit/Build.java" /> + <include name="com/gitblit/build/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" /> + <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" /> <!-- Compile Project --> <path id="master-classpath"> - <fileset dir="${basedir}/lib"> - <include name="*.jar" /> - </fileset> <fileset dir="${basedir}/ext"> <include name="*.jar" /> </fileset> </path> - <javac destdir="${project.build.dir}"> + <javac destdir="${project.build.dir}" failonerror="false"> <src path="${basedir}/src" /> <classpath refid="master-classpath" /> </javac> <copy todir="${project.build.dir}"> <fileset dir="${basedir}/src" excludes="**/*.java,**/thumbs.db" /> </copy> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Build Gitblit GO + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildGO" depends="compile" description="Build Gitblit GO distribution"> + + <echo>Building Gitblit GO ${gb.version}</echo> + + <!-- Delete the deploy folder --> + <delete dir="${project.deploy.dir}" /> + + <!-- Create deployment folder structure --> + <mkdir dir="${project.deploy.dir}" /> + <copy todir="${project.deploy.dir}"> + <fileset dir="${basedir}/distrib"> + <include name="**/*" /> + </fileset> + <fileset dir="${basedir}"> + <include name="LICENSE" /> + <include name="NOTICE" /> + </fileset> + </copy> <!-- Build jar --> - <delete file="${project.jar}" /> - <jar index="true" jarfile="${project.jar}"> + <jar jarfile="${project.deploy.dir}/${project.jar}"> <fileset dir="${project.build.dir}"> <include name="**/*" /> + </fileset> + <fileset dir="${project.resources.dir}"> + <exclude name="thumbs.db" /> </fileset> <manifest> <attribute name="Main-Class" value="${project.mainclass}" /> </manifest> - <indexjars> - <fileset dir="${basedir}/lib" /> - </indexjars> </jar> - <!-- Delete the deploy folder --> - <delete dir="${basedir}/deploy" /> - - <!-- 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"> - <include name="**/*" /> - </fileset> - <fileset dir="${basedir}"> - <include name="*.cmd" /> - <include name="*.properties" /> - </fileset> - </copy> - - <!-- Create Zip deployment --> + <!-- Build the docs for the deploy --> + <antcall target="buildDocs" inheritall="true" inheritrefs="true"> + <param name="docs.output.dir" value="${project.deploy.dir}/docs" /> + </antcall> + + <!-- Create Zip deployment --> <zip destfile="${distribution.zipfile}"> - <fileset dir="${basedir}/deploy"> + <fileset dir="${project.deploy.dir}"> <include name="**/*" /> </fileset> </zip> - <!-- Delete the deploy folder --> - <delete dir="${basedir}/deploy" /> - - <!-- Cleanup builds --> - <delete> - <fileset dir="${basedir}"> - <include name="${project.jar}" /> - </fileset> - </delete> </target> -</project> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Build Gitblit Docs which are bundled with GO and WAR downloads + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildDocs"> + <!-- Build Docs --> + <mkdir dir="${docs.output.dir}" /> + <copy todir="${docs.output.dir}"> + <!-- Copy selected Gitblit resources --> + <fileset dir="${project.resources.dir}"> + <include name="background.png" /> + <include name="gitblit.css" /> + <include name="markdown.css" /> + <include name="gitblt_25.png" /> + <include name="gitblt-favicon.png" /> + <include name="lock_go_16x16.png" /> + <include name="lock_pull_16x16.png" /> + <include name="shield_16x16.png" /> + <include name="cold_16x16.png" /> + <include name="bug_16x16.png" /> + <include name="book_16x16.png" /> + <include name="blank.png" /> + </fileset> + + <!-- Copy Doc images --> + <fileset dir="${basedir}/docs"> + <include name="*.png" /> + </fileset> + </copy> + + <!-- Copy google-code-prettify --> + <mkdir dir="${docs.output.dir}/prettify" /> + <copy todir="${docs.output.dir}/prettify"> + <fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify"> + <exclude name="thumbs.db" /> + </fileset> + </copy> + + <!-- Build deployment doc pages --> + <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite"> + <classpath refid="master-classpath" /> + <arg value="--sourceFolder" /> + <arg value="${basedir}/docs" /> + + <arg value="--outputFolder" /> + <arg value="${docs.output.dir}" /> + + <arg value="--pageHeader" /> + <arg value="${basedir}/docs/doc_header.html" /> + + <arg value="--pageFooter" /> + <arg value="${basedir}/docs/doc_footer.html" /> + + <arg value="--skip" /> + <arg value="screenshots" /> + + <arg value="--skip" /> + <arg value="releases" /> + + <arg value="--alias" /> + <arg value="index=overview" /> + + <arg value="--alias" /> + <arg value="properties=gitblit.properties" /> + + <arg value="--substitute" /> + <arg value="%VERSION%=${gb.version}" /> + + <arg value="--substitute" /> + <arg value="%GO%=${distribution.zipfile}" /> + + <arg value="--substitute" /> + <arg value="%WAR%=${distribution.warfile}" /> + + <arg value="--substitute" /> + <arg value="%BUILDDATE%=${gb.versionDate}" /> + + <arg value="--substitute" /> + <arg value="%JGIT%=${jgit.version}" /> + + <arg value="--properties" /> + <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" /> + + <arg value="--nomarkdown" /> + <arg value="%BEGINCODE%:%ENDCODE%" /> + + <arg value="--substitute" /> + <arg value=""%BEGINCODE%=<pre class='prettyprint lang-java'>"" /> + + <arg value="--substitute" /> + <arg value="%ENDCODE%=</pre>" /> + + <arg value="--regex" /> + <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" /> + + </java> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Build Gitblit WAR + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildWAR" depends="compile" description="Build Gitblit WAR"> + + <echo>Building Gitblit WAR ${gb.version}</echo> + + <delete dir="${project.war.dir}" /> + + <!-- Copy web.xml and users.properties to WEB-INF --> + <copy todir="${project.war.dir}/WEB-INF"> + <fileset dir="${basedir}/distrib"> + <include name="users.properties" /> + </fileset> + <fileset dir="${basedir}/src/WEB-INF"> + <include name="web.xml" /> + </fileset> + <fileset dir="${basedir}"> + <include name="LICENSE" /> + <include name="NOTICE" /> + </fileset> + </copy> + + <!-- Build the docs for the WAR build --> + <antcall target="buildDocs" inheritall="true" inheritrefs="true"> + <param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" /> + </antcall> + + <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties --> + <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml"> + <classpath refid="master-classpath" /> + + <arg value="--sourceFile" /> + <arg value="${basedir}/src/WEB-INF/web.xml" /> + + <arg value="--destinationFile" /> + <arg value="${project.war.dir}/WEB-INF/web.xml" /> + + <arg value="--propertiesFile" /> + <arg value="${basedir}/distrib/gitblit.properties" /> + </java> + + <!-- Gitblit resources --> + <copy todir="${project.war.dir}"> + <fileset dir="${project.resources.dir}"> + <exclude name="thumbs.db" /> + </fileset> + </copy> + + <!-- Gitblit library dependencies --> + <mkdir dir="${project.war.dir}/WEB-INF/lib"/> + <copy todir="${project.war.dir}/WEB-INF/lib"> + <fileset dir="${basedir}/ext"> + <exclude name="*-sources.jar" /> + <exclude name="*-javadoc.jar" /> + <exclude name="jcommander*.jar" /> + <exclude name="jetty*.jar" /> + <exclude name="junit*.jar" /> + <exclude name="servlet*.jar" /> + </fileset> + </copy> + + <!-- Gitblit classes --> + <mkdir dir="${project.war.dir}/WEB-INF/classes"/> + <copy todir="${project.war.dir}/WEB-INF/classes"> + <fileset dir="${project.build.dir}"> + <exclude name="WEB-INF/web.xml" /> + <exclude name="com/gitblit/tests/" /> + <exclude name="com/gitblit/build/**" /> + <exclude name="com/gitblit/GitBlitServer*.class" /> + <exclude name="com/gitblit/Launcher*.class" /> + <exclude name="com/gitblit/MakeCertificate*.class" /> + </fileset> + </copy> + + <!-- Build the WAR file --> + <jar basedir="${project.war.dir}" destfile="${distribution.warfile}" compress="true" /> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Build the Gitblit Website + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildSite" depends="compile" description="Build the Gitblit website"> + + <echo>Building Gitblit Website ${gb.version}</echo> + + <!-- Build Site --> + <delete dir="${project.site.dir}" /> + <mkdir dir="${project.site.dir}" /> + <copy todir="${project.site.dir}"> + <!-- Copy selected Gitblit resources --> + <fileset dir="${project.resources.dir}"> + <include name="background.png" /> + <include name="gitblit.css" /> + <include name="markdown.css" /> + <include name="gitblt_25.png" /> + <include name="gitblt-favicon.png" /> + <include name="lock_go_16x16.png" /> + <include name="lock_pull_16x16.png" /> + <include name="shield_16x16.png" /> + <include name="cold_16x16.png" /> + <include name="bug_16x16.png" /> + <include name="book_16x16.png" /> + <include name="blank.png" /> + </fileset> + + <!-- Copy Doc images --> + <fileset dir="${basedir}/docs"> + <include name="*.png" /> + <include name="*.js" /> + </fileset> + </copy> + + <!-- Copy Fancybox --> + <mkdir dir="${project.site.dir}/fancybox" /> + <copy todir="${project.site.dir}/fancybox"> + <fileset dir="${basedir}/docs/fancybox"> + <exclude name="thumbs.db" /> + </fileset> + </copy> + + <!-- Copy google-code-prettify --> + <mkdir dir="${basedir}/src/com/gitblit/wicket/pages/prettify" /> + <copy todir="${project.site.dir}/prettify"> + <fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify"> + <exclude name="thumbs.db" /> + </fileset> + </copy> + + <!-- Generate thumbnails of screenshots --> + <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildThumbnails"> + <classpath refid="master-classpath" /> + + <arg value="--sourceFolder" /> + <arg value="${basedir}/docs/screenshots" /> + + <arg value="--destinationFolder" /> + <arg value="${project.site.dir}/thumbs" /> + + <arg value="--maximumDimension" /> + <arg value="250" /> + </java> + + <!-- Copy screenshots --> + <mkdir dir="${project.site.dir}/screenshots" /> + <copy todir="${project.site.dir}/screenshots"> + <fileset dir="${basedir}/docs/screenshots"> + <include name="*.png" /> + </fileset> + </copy> + + <!-- Build site pages --> + <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite"> + <classpath refid="master-classpath" /> + <arg value="--sourceFolder" /> + <arg value="${basedir}/docs" /> + + <arg value="--outputFolder" /> + <arg value="${project.site.dir}" /> + + <arg value="--pageHeader" /> + <arg value="${basedir}/docs/site_header.html" /> + + <arg value="--pageFooter" /> + <arg value="${basedir}/docs/site_footer.html" /> + + <arg value="--analyticsSnippet" /> + <arg value="${basedir}/docs/site_analytics.html" /> + + <arg value="--adSnippet" /> + <arg value="${basedir}/docs/site_ads.html" /> + + <arg value="--alias" /> + <arg value="index=overview" /> + + <arg value="--alias" /> + <arg value="properties=gitblit.properties" /> + + <arg value="--substitute" /> + <arg value="%VERSION%=${gb.version}" /> + + <arg value="--substitute" /> + <arg value="%GO%=${distribution.zipfile}" /> + + <arg value="--substitute" /> + <arg value="%WAR%=${distribution.warfile}" /> + + <arg value="--substitute" /> + <arg value="%BUILDDATE%=${gb.versionDate}" /> + + <arg value="--substitute" /> + <arg value="%JGIT%=${jgit.version}" /> + + <arg value="--properties" /> + <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" /> + + <arg value="--nomarkdown" /> + <arg value="%BEGINCODE%:%ENDCODE%" /> + + <arg value="--substitute" /> + <arg value=""%BEGINCODE%=<pre class='prettyprint lang-java'>"" /> + + <arg value="--substitute" /> + <arg value="%ENDCODE%=</pre>" /> + + <arg value="--regex" /> + <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" /> + + </java> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Compile from source, publish binaries, and build & deploy site + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="buildAll" depends="buildGO,buildWAR,buildSite"> + <!-- Cleanup --> + <delete dir="${project.build.dir}" /> + <delete dir="${project.war.dir}" /> + <delete dir="${project.deploy.dir}" /> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Publish binaries to Google Code + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="publishBinaries" depends="buildGO,buildWAR" description="Publish the Gitblit binaries to Google Code"> + + <echo>Uploading Gitblit ${gb.version} binaries</echo> + + <!-- Upload ZIP file --> + <gcupload + username="${googlecode.user}" + password="${googlecode.password}" + projectname="gitblit" + filename="${distribution.zipfile}" + targetfilename="gitblit-${gb.version}.zip" + summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)" + labels="Featured, Type-Package, OpSys-All" /> + + <!-- Upload WAR file --> + <gcupload + username="${googlecode.user}" + password="${googlecode.password}" + projectname="gitblit" + filename="${distribution.warfile}" + targetfilename="gitblit-${gb.version}.war" + summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)" + labels="Featured, Type-Package, OpSys-All" /> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Publish site to hosting service + 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)" > + + <echo>Uploading Gitblit ${gb.version} website</echo> + + <ftp server="${ftp.server}" + userid="${ftp.user}" + password="${ftp.password}" + remotedir="${ftp.dir}" + passive="true" + verbose="yes"> + <fileset dir="${project.site.dir}" /> + </ftp> + </target> + + + <!-- + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Compile from source, publish binaries, and build & deploy site + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --> + <target name="publishAll" depends="publishBinaries,publishSite"> + <!-- Cleanup --> + <delete dir="${project.build.dir}" /> + <delete dir="${project.war.dir}" /> + <delete dir="${project.deploy.dir}" /> + </target> +</project> \ No newline at end of file -- Gitblit v1.9.1