Polish GitblitPanel. Exclude the manager from GO and WAR builds.

James Moger

2011-10-17 44f2dad1f1d3a9ee2b22f213e806d5ef415769b0

 build.xml

@@ -85,7 +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="rpcclient.zipfile" value="rpcclient-${gb.version}.zip" />

      <property name="manager.zipfile" value="manager-${gb.version}.zip" />

   </target>

   

   

@@ -162,6 +162,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" />

@@ -210,6 +211,7 @@
               <include name="book_16x16.png" />

               <include name="blank.png" />

               <include name="federated_16x16.png" />

               <include name="arrow_page.png" />

            </fileset>



            <!-- Copy Doc images -->

@@ -266,7 +268,7 @@
            <arg value="%FEDCLIENT%=${fedclient.zipfile}" />



            <arg value="--substitute" />

            <arg value="%RPCCLIENT%=${rpcclient.zipfile}" />

            <arg value="%MANAGER%=${manager.zipfile}" />



            <arg value="--substitute" />

            <arg value="%BUILDDATE%=${gb.versionDate}" />

@@ -364,6 +366,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" />            

@@ -416,13 +419,13 @@


   <!-- 

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

      Build the stand-alone, Gitblit RPC Client

      Build the stand-alone, Gitblit Manager

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="buildRpcClient" depends="compile" description="Builds the stand-alone Gitblit RPC client">

      <echo>Building Gitblit RPC Client ${gb.version}</echo>

   <target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">

      <echo>Building Gitblit Manager ${gb.version}</echo>

   

      <genjar jarfile="rpcclient.jar">

      <genjar jarfile="manager.jar">

         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/lock_go_16x16.png" />

@@ -433,8 +436,9 @@
         <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.GitblitClientLauncher" />

         <class name="com.gitblit.client.GitblitManagerLauncher" />

         <classfilter>

            <exclude name="org.apache." />

            <exclude name="org.bouncycastle." />

@@ -445,17 +449,17 @@
         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

            <attribute name="Main-Class" value="com.gitblit.client.GitblitClientLauncher" />

            <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 rpc client zip file -->

      <zip destfile="${rpcclient.zipfile}">

      <!-- Build the Manager zip file -->

      <zip destfile="${manager.zipfile}">

         <fileset dir="${basedir}">

            <include name="rpcclient.jar" />				
            <include name="manager.jar" />				
         </fileset>         

      </zip>

   </target>

@@ -489,6 +493,7 @@
            <include name="book_16x16.png" />

            <include name="blank.png" />

            <include name="federated_16x16.png" />

            <include name="arrow_page.png" />

         </fileset>



         <!-- Copy Doc images -->

@@ -576,7 +581,7 @@
         <arg value="%FEDCLIENT%=${fedclient.zipfile}" />



         <arg value="--substitute" />

         <arg value="%RPCCLIENT%=${rpcclient.zipfile}" />

         <arg value="%MANAGER%=${manager.zipfile}" />



         <arg value="--substitute" />

         <arg value="%BUILDDATE%=${gb.versionDate}" />

@@ -608,7 +613,7 @@
      Compile from source, publish binaries, and build & deploy site

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="buildAll" depends="buildGO,buildWAR,buildFederationClient,buildRpcClient,buildSite">		
   <target name="buildAll" depends="buildGO,buildWAR,buildFederationClient,buildManager,buildSite">		
      <!-- Cleanup -->

      <delete dir="${project.build.dir}" />

      <delete dir="${project.war.dir}" />

@@ -621,7 +626,7 @@
      Publish binaries to Google Code

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="publishBinaries" depends="buildGO,buildWAR,buildFederationClient,buildRpcClient" 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>

      

@@ -655,14 +660,14 @@
         summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"

         labels="Featured, Type-Package, OpSys-All" />



      <!-- Upload RpcClient -->

      <!-- Upload Manager -->

      <gcupload 

         username="${googlecode.user}" 

         password="${googlecode.password}" 

         projectname="gitblit" 

         filename="${rpcclient.zipfile}" 
         targetfilename="rpcclient-${gb.version}.zip"

         summary="Gitblit RPC Client v${gb.version} (Swing tool to clone repositories and remotely administer a Gitblit server)"

         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>



@@ -699,4 +704,4 @@
      <delete dir="${project.war.dir}" />

      <delete dir="${project.deploy.dir}" />

   </target>

</project>
</project>