James Moger
2012-03-19 f03763b00e90d284b5392c7b3f44a9f6070e1e97
build.xml
@@ -117,7 +117,7 @@
      <delete dir="${project.build.dir}" />
      <mkdir dir="${project.build.dir}" />
      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}">
      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">
         <include name="com/gitblit/build/Build.java" />         
         <include name="com/gitblit/Constants.java" />
         <include name="com/gitblit/utils/StringUtils.java" />         
@@ -131,7 +131,7 @@
         </fileset>
         <pathelement path="${project.build.dir}" />            
      </path>
      <javac debug="true" destdir="${project.build.dir}" failonerror="false">
      <javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">
         <src path="${basedir}/src" />
         <classpath refid="master-classpath" />
      </javac>
@@ -227,9 +227,8 @@
         <copy todir="${docs.output.dir}">
            <!-- Copy selected Gitblit resources -->
            <fileset dir="${project.resources.dir}">
               <include name="bootstrap.140.css" />
               <include name="bootstrap.gb.css" />
               <include name="markdown.css" />
               <include name="bootstrap/**/*" />
               <include name="gitblit.css" />
               <include name="gitblt_25_white.png" />
               <include name="gitblt-favicon.png" />
               <include name="lock_go_16x16.png" />
@@ -578,6 +577,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" />
@@ -709,9 +709,8 @@
      <copy todir="${project.site.dir}">
         <!-- Copy selected Gitblit resources -->
         <fileset dir="${project.resources.dir}">
            <include name="bootstrap.140.css" />
            <include name="bootstrap.gb.css" />
            <include name="markdown.css" />
            <include name="bootstrap/**/*" />
            <include name="gitblit.css" />
            <include name="gitblt_25_white.png" />
            <include name="gitblt-favicon.png" />
            <include name="lock_go_16x16.png" />
@@ -857,13 +856,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>
@@ -936,7 +955,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>