mrbytes
2012-08-14 975f7c55eea0c20a686d860b67b9a0d5fc3130bb
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>
@@ -203,6 +203,8 @@
         <fileset dir="${basedir}/groovy">
            <include name="sendmail.groovy" />
            <include name="jenkins.groovy" />
            <include name="protect-refs.groovy" />
            <include name="localclone.groovy" />
         </fileset>
      </copy>
   
@@ -227,9 +229,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" />
@@ -371,6 +372,8 @@
         <fileset dir="${basedir}/groovy">
            <include name="sendmail.groovy" />
            <include name="jenkins.groovy" />
            <include name="protect-refs.groovy" />
            <include name="localclone.groovy" />
         </fileset>
      </copy>
@@ -405,6 +408,7 @@
            <exclude name="jetty*.jar" />
            <exclude name="junit*.jar" />
            <exclude name="servlet*.jar" />
            <exclude name="javax.servlet*.jar" />
         </fileset>
      </copy>
@@ -416,6 +420,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" />
@@ -445,6 +450,7 @@
            <exclude name="org.slf4j." />
            <exclude name="com.beust." />
            <exclude name="com.google." />
            <exclude name="com.unboundid." />
         </classfilter>
         <classpath refid="master-classpath" />
         <manifest>
@@ -505,6 +511,7 @@
         <fileset dir="${basedir}/groovy">
            <include name="sendmail.groovy" />
            <include name="jenkins.groovy" />
            <include name="protect-refs.groovy" />
         </fileset>
      </copy>
               
@@ -540,12 +547,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/" />
@@ -555,7 +562,7 @@
            <exclude name="com/gitblit/Launcher*.class" />
            <exclude name="com/gitblit/MakeCertificate*.class" />
         </fileset>
      </copy>
      </jar>
      <!-- Build Express Zip file -->
      <zip destfile="${express.zipfile}">
@@ -577,7 +584,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" />
@@ -594,6 +603,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>
@@ -603,6 +613,7 @@
            <exclude name="org.slf4j." />
            <exclude name="com.beust." />
            <exclude name="com.google." />
            <exclude name="com.unboundid." />
         </classfilter>
         <classpath refid="master-classpath" />
         <manifest>
@@ -689,6 +700,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>
@@ -709,9 +723,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 +870,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 +969,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>
@@ -962,4 +995,4 @@
      <delete dir="${project.war.dir}" />
      <delete dir="${project.deploy.dir}" />
   </target>
</project>
</project>