Merge pull request #278 from mrjoel/mrjoel-addversiontojarfilename

James Moger

2015-06-30 bebc2e8c8eb66cbb49998fceef01cdde8e0dc934

 build.xml

@@ -8,7 +8,7 @@
      documentation @ http://gitblit.github.io/moxie

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

   -->

   <property name="moxie.version" value="0.9.3" />

   <property name="moxie.version" value="0.9.4" />

   <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />

   <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />

   <property name="moxie.dir" value="${user.home}/.moxie" />

@@ -82,10 +82,9 @@
         <fileset dir="${project.distrib.dir}/data" />

      </copy>

      

      <!-- copy gitblit.properties to the source directory.

           this file is only used for parsing setting descriptions. -->

      <copy tofile="${project.src.dir}/reference.properties" overwrite="true"

         file="${project.distrib.dir}/data/gitblit.properties" />

      <!-- copy defaults.properties to the source directory -->

      <copy tofile="${project.src.dir}/defaults.properties" overwrite="true"

         file="${project.distrib.dir}/data/defaults.properties" />



      <!-- copy clientapps.json to the source directory.

           this file is only used if a local file is not provided. -->

@@ -102,8 +101,8 @@
   -->

   <target name="compile" depends="setup" description="compiles Gitblit from source">

      

      <!-- Generate the Keys class from the properties file -->

      <mx:keys propertiesfile="${project.distrib.dir}/data/gitblit.properties"

      <!-- Generate the Keys class from the defaults.properties file -->

      <mx:keys propertiesfile="${project.distrib.dir}/data/defaults.properties"

             outputclass="com.gitblit.Keys"

             todir="${project.src.dir}" />



@@ -262,7 +261,7 @@
      </mx:webxml>



      <!-- Gitblit jar -->

      <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />

      <mx:jar destfile="${webinf}/lib/gitblit-${project.version}.jar" includeresources="false" />



      <!-- Build the WAR file -->

      <mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" >

@@ -588,6 +587,10 @@
               <link name="Google+" src="${project.socialNetworkUrl}" />

               <link name="Twitter" src="https://twitter.com/gitblit" />

               <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />

                    <divider />

               <link name="Gitblit Tickets screencast" src="https://vimeo.com/86164723" />

               <link name="Gitblit SSH and Plugin Management asciicast" src="https://asciinema.org/a/9342" />

                    <link name="GitMinutes #29: James Moger on Gitblit" src="http://episodes.gitminutes.com/2014/05/gitminutes-29-james-moger-on-gitblit.html" />

               <divider />

               <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />

               <link name="@JamesMoger" src="https://twitter.com/JamesMoger" />

@@ -597,7 +600,7 @@
         

         <replace token="%GCURL%" value="${gc.url}" />

         

         <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

         <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />

         

         <regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

         <regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />

@@ -898,7 +901,7 @@
               </menu>

            </structure>

            

            <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

            <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />

            

            <regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

            <regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />

@@ -938,6 +941,7 @@
            <fileset dir="${project.distrib.dir}/data">

               <include name="users.conf" />

               <include name="projects.conf" />

               <include name="defaults.properties" />

               <include name="gitblit.properties" />               

            </fileset>

         </copy>