James Moger
2011-10-23 fe326255202dcfac8b0991ca9d28e3cf4bcc4fe6
build.xml
@@ -85,6 +85,7 @@
      <property name="distribution.zipfile" value="gitblit-${gb.version}.zip" />
      <property name="distribution.warfile" value="gitblit-${gb.version}.war" />
      <property name="fedclient.zipfile" value="fedclient-${gb.version}.zip" />
      <property name="manager.zipfile" value="manager-${gb.version}.zip" />
   </target>
   
   
@@ -102,6 +103,11 @@
            <include name="users.properties" />
         </fileset>
      </copy>
      <!-- copy gitblit.properties to the WEB-INF folder.
           this file is only used for parsing setting descriptions. -->
      <copy todir="${basedir}/src/WEB-INF" overwrite="true"
         file="${basedir}/distrib/gitblit.properties" />
      <!-- Compile the build tool and execute it.
          This downloads missing compile-time dependencies from Maven. -->
@@ -161,6 +167,7 @@
      <jar jarfile="${project.deploy.dir}/${project.jar}">
         <fileset dir="${project.build.dir}">
            <include name="**/*" />
            <exclude name="com/gitblit/client/**" />
         </fileset>
         <fileset dir="${project.resources.dir}">
            <exclude name="thumbs.db" />
@@ -196,10 +203,10 @@
         <copy todir="${docs.output.dir}">
            <!-- Copy selected Gitblit resources -->
            <fileset dir="${project.resources.dir}">
               <include name="background.png" />
               <include name="gitblit.css" />
               <include name="bootstrap.130.css" />
               <include name="bootstrap.gb.css" />
               <include name="markdown.css" />
               <include name="gitblt_25.png" />
               <include name="gitblt_25_white.png" />
               <include name="gitblt-favicon.png" />
               <include name="lock_go_16x16.png" />
               <include name="lock_pull_16x16.png" />
@@ -209,6 +216,7 @@
               <include name="book_16x16.png" />
               <include name="blank.png" />
               <include name="federated_16x16.png" />
               <include name="arrow_page.png" />
            </fileset>
            <!-- Copy Doc images -->
@@ -265,6 +273,9 @@
            <arg value="%FEDCLIENT%=${fedclient.zipfile}" />
            <arg value="--substitute" />
            <arg value="%MANAGER%=${manager.zipfile}" />
            <arg value="--substitute" />
            <arg value="%BUILDDATE%=${gb.versionDate}" />
            <arg value="--substitute" />
@@ -300,10 +311,11 @@
      
      <delete dir="${project.war.dir}" />      
      <!-- Copy web.xml and users.properties to WEB-INF -->
      <!-- Copy web.xml, users.properties, and gitblit.properties to WEB-INF -->
      <copy todir="${project.war.dir}/WEB-INF">
         <fileset dir="${basedir}/distrib">
             <include name="users.properties" />
            <include name="gitblit.properties" />
         </fileset>
         <fileset dir="${basedir}/src/WEB-INF">
             <include name="web.xml" />
@@ -360,6 +372,7 @@
            <exclude name="WEB-INF/web.xml" />
            <exclude name="com/gitblit/tests/" />
            <exclude name="com/gitblit/build/**" />
            <exclude name="com/gitblit/client/**" />
            <exclude name="com/gitblit/GitBlitServer*.class" />
            <exclude name="com/gitblit/Launcher*.class" />
            <exclude name="com/gitblit/MakeCertificate*.class" />            
@@ -409,6 +422,57 @@
      </zip>
   </target>
   <!--
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      Build the stand-alone, Gitblit Manager
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">
      <echo>Building Gitblit Manager ${gb.version}</echo>
      <genjar jarfile="manager.jar">
         <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/user_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" />
         <resource file="${basedir}/resources/shield_16x16.png" />
         <resource file="${basedir}/resources/federated_16x16.png" />
         <resource file="${basedir}/resources/cold_16x16.png" />
         <resource file="${basedir}/resources/book_16x16.png" />
         <resource file="${basedir}/resources/bug_16x16.png" />
         <resource file="${basedir}/resources/blank.png" />
         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />
         <class name="com.gitblit.client.GitblitManagerLauncher" />
         <classfilter>
            <exclude name="org.apache." />
            <exclude name="org.bouncycastle." />
            <exclude name="org.eclipse." />
            <exclude name="org.slf4j." />
            <exclude name="com.beust." />
            <exclude name="com.google." />
         </classfilter>
         <classpath refid="master-classpath" />
         <manifest>
            <attribute name="Main-Class" value="com.gitblit.client.GitblitManagerLauncher" />
            <attribute name="SplashScreen-Image" value="splash.png" />
            <attribute name="Specification-Version" value="${gb.version}" />
            <attribute name="Release-Date" value="${gb.versionDate}" />
         </manifest>
      </genjar>
      <!-- Build the Manager zip file -->
      <zip destfile="${manager.zipfile}">
         <fileset dir="${basedir}">
            <include name="manager.jar" />
         </fileset>
      </zip>
   </target>
      
   <!-- 
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -425,10 +489,10 @@
      <copy todir="${project.site.dir}">
         <!-- Copy selected Gitblit resources -->
         <fileset dir="${project.resources.dir}">
            <include name="background.png" />
            <include name="gitblit.css" />
            <include name="bootstrap.130.css" />
            <include name="bootstrap.gb.css" />
            <include name="markdown.css" />
            <include name="gitblt_25.png" />
            <include name="gitblt_25_white.png" />
            <include name="gitblt-favicon.png" />
            <include name="lock_go_16x16.png" />
            <include name="lock_pull_16x16.png" />
@@ -438,6 +502,7 @@
            <include name="book_16x16.png" />
            <include name="blank.png" />
            <include name="federated_16x16.png" />
            <include name="arrow_page.png" />
         </fileset>
         <!-- Copy Doc images -->
@@ -525,6 +590,9 @@
         <arg value="%FEDCLIENT%=${fedclient.zipfile}" />
         <arg value="--substitute" />
         <arg value="%MANAGER%=${manager.zipfile}" />
         <arg value="--substitute" />
         <arg value="%BUILDDATE%=${gb.versionDate}" />
         <arg value="--substitute" />
@@ -554,7 +622,7 @@
      Compile from source, publish binaries, and build & deploy site
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <target name="buildAll" depends="buildGO,buildWAR,buildFederationClient,buildSite">
   <target name="buildAll" depends="buildGO,buildWAR,buildFederationClient,buildManager,buildSite">
      <!-- Cleanup -->
      <delete dir="${project.build.dir}" />
      <delete dir="${project.war.dir}" />
@@ -567,7 +635,7 @@
      Publish binaries to Google Code
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <target name="publishBinaries" depends="buildGO,buildWAR" description="Publish the Gitblit binaries to Google Code">
   <target name="publishBinaries" depends="buildGO,buildWAR,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code">
      
      <echo>Uploading Gitblit ${gb.version} binaries</echo>
      
@@ -599,6 +667,16 @@
         filename="${fedclient.zipfile}" 
         targetfilename="fedclient-${gb.version}.zip"
         summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"
         labels="Featured, Type-Package, OpSys-All" />
      <!-- Upload Manager -->
      <gcupload
         username="${googlecode.user}"
         password="${googlecode.password}"
         projectname="gitblit"
         filename="${manager.zipfile}"
         targetfilename="manager-${gb.version}.zip"
         summary="Gitblit Manager v${gb.version} (Swing tool to remotely administer a Gitblit server)"
         labels="Featured, Type-Package, OpSys-All" />
   </target>
@@ -635,4 +713,4 @@
      <delete dir="${project.war.dir}" />
      <delete dir="${project.deploy.dir}" />
   </target>
</project>
</project>