James Moger
2012-09-27 efb1137546de9a32bfa23aeda9edd7dc4f597d05
build.xml
@@ -117,12 +117,21 @@
      <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" />         
      </javac>
      <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" />
      <java classpath="${project.build.dir}" classname="com.gitblit.build.Build">
         <syspropertyset id="proxy.properties">
            <propertyref prefix="java.net.useSystemProxies"/>
            <propertyref prefix="http."/>
            <propertyref prefix="https."/>
            <propertyref prefix="ftp."/>
            <propertyref prefix="socksProxy"/>
         </syspropertyset>
      </java>
      <!-- Compile Project -->
      <path id="master-classpath">
@@ -131,7 +140,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>
@@ -197,11 +206,14 @@
         <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" />
            <include name="protect-refs.groovy" />
            <include name="localclone.groovy" />
         </fileset>
      </copy>
   
@@ -226,9 +238,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" />
@@ -364,11 +375,14 @@
         <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" />
            <include name="protect-refs.groovy" />
            <include name="localclone.groovy" />
         </fileset>
      </copy>
@@ -403,6 +417,7 @@
            <exclude name="jetty*.jar" />
            <exclude name="junit*.jar" />
            <exclude name="servlet*.jar" />
            <exclude name="javax.servlet*.jar" />
         </fileset>
      </copy>
@@ -414,6 +429,7 @@
            <exclude name="com/gitblit/tests/" />
            <exclude name="com/gitblit/build/**" />
            <exclude name="com/gitblit/client/**" />
            <exclude name="com/gitblit/AddIndexedBranch*.class" />
            <exclude name="com/gitblit/GitBlitServer*.class" />
            <exclude name="com/gitblit/Launcher*.class" />
            <exclude name="com/gitblit/MakeCertificate*.class" />
@@ -443,6 +459,7 @@
            <exclude name="org.slf4j." />
            <exclude name="com.beust." />
            <exclude name="com.google." />
            <exclude name="com.unboundid." />
         </classfilter>
         <classpath refid="master-classpath" />
         <manifest>
@@ -497,6 +514,16 @@
      <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" />
            <include name="protect-refs.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">
@@ -529,12 +556,12 @@
            <exclude name="jetty*.jar" />
            <exclude name="junit*.jar" />
            <exclude name="servlet*.jar" />
            <exclude name="javax.servlet*.jar" />
         </fileset>
      </copy>
      <!-- Gitblit classes -->
      <mkdir dir="${deployments.root}/WEB-INF/classes"/>
      <copy todir="${deployments.root}/WEB-INF/classes">
      <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">
         <fileset dir="${project.build.dir}">
            <exclude name="WEB-INF/" />
            <exclude name="com/gitblit/tests/" />
@@ -544,7 +571,7 @@
            <exclude name="com/gitblit/Launcher*.class" />
            <exclude name="com/gitblit/MakeCertificate*.class" />
         </fileset>
      </copy>
      </jar>
      <!-- Build Express Zip file -->
      <zip destfile="${express.zipfile}">
@@ -566,7 +593,9 @@
         <resource file="${basedir}/src/com/gitblit/client/splash.png" />
         <resource file="${basedir}/resources/gitblt-favicon.png" />
         <resource file="${basedir}/resources/gitweb-favicon.png" />
         <resource file="${basedir}/resources/git-orange-16x16.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" />
@@ -583,6 +612,7 @@
         <resource file="${basedir}/resources/commit_merge_16x16.png" />
         <resource file="${basedir}/resources/blank.png" />
         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />
         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />
         <class name="com.gitblit.client.GitblitManagerLauncher" />
         <classfilter>
@@ -592,6 +622,7 @@
            <exclude name="org.slf4j." />
            <exclude name="com.beust." />
            <exclude name="com.google." />
            <exclude name="com.unboundid." />
         </classfilter>
         <classpath refid="master-classpath" />
         <manifest>
@@ -678,6 +709,9 @@
               <include name="rome*.jar" />
               <exclude name="rome*-sources.jar" />
               <exclude name="rome*-javadoc.jar" />
               <include name="jdom*.jar" />
               <exclude name="jdom*-sources.jar" />
               <exclude name="jdom*-javadoc.jar" />
            </fileset>
         </zip>
      </target>
@@ -698,9 +732,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" />
@@ -846,13 +879,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>
@@ -925,7 +978,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>