Paul Martin
2016-03-31 10f798a1fab5f7b23f498e2746b1b6a50010a288
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" >
@@ -514,6 +513,8 @@
                  <page name="bugtraq" src="setup_bugtraq.mkd" />
                  <page name="mirrors" src="setup_mirrors.mkd" />
                  <page name="scaling" src="setup_scaling.mkd" />
                  <page name="fail2ban" src="setup_fail2ban.mkd" />
                  <page name="filestore (Git LFS)" src="setup_filestore.mkd" />
                  <divider />
                  <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
               </menu>
@@ -553,8 +554,6 @@
               <page name="release history" out="releases.html">
                  <template src="releasehistory.ftl" data="${releaselog}" />
               </page>
               <divider />
               <page name="roadmap" src="roadmap.mkd" />
            </menu>
            
            <menu name="downloads">
@@ -585,11 +584,13 @@
               <link name="Github" src="${project.scmUrl}" />
               <link name="Issues" src="${project.issuesUrl}" />
               <link name="Discussion" src="${project.forumUrl}" />
               <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" />
            </menu>
            <divider />
@@ -597,7 +598,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;" />
@@ -893,12 +894,11 @@
                  <link name="Github" src="${project.scmUrl}" />
                  <link name="Issues" src="${project.issuesUrl}" />
                  <link name="Discussion" src="${project.forumUrl}" />
                  <link name="Google+" src="${project.socialNetworkUrl}" />
                  <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />
               </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 +938,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>
@@ -1055,4 +1056,21 @@
      <mx:install />
   </target>
   
   <!--
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      Build Gitblit UI via npm
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <target name="buildUI" description="Build Gitblit UI via npm">
      <exec executable="npm" dir="src/main/js/" failonerror="true" vmlauncher="false" searchpath="true" >
         <arg value="install" />
      </exec>
      <exec executable="npm" dir="src/main/js/" failonerror="true" vmlauncher="false" searchpath="true" >
         <arg value="run" />
         <arg value="build" />
      </exec>
   </target>
</project>