WAR/Express builds now copy bundled push scripts to configured scripts folder

James Moger

2012-01-06 e36d4de3a9dc55359f3b54dbf06adc8209d1028c

 build.xml

@@ -182,9 +182,11 @@
      </jar>



      <!-- Gitblit library dependencies -->

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

      <copy todir="${project.deploy.dir}/lib">

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

      <copy todir="${project.deploy.dir}/ext">

         <fileset dir="${basedir}/ext">

            <exclude name="junit*.jar" />

            <exclude name="commons-net*.jar" />

            <exclude name="*-sources.jar" />

            <exclude name="*-javadoc.jar" />

         </fileset>

@@ -195,11 +197,12 @@
         <param name="docs.output.dir" value="${project.deploy.dir}/docs" />

      </antcall>

      

      <!-- Copy the sample Groovy hook scripts -->

      <!-- Copy the supported Groovy hook scripts -->

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

      <copy todir="${project.deploy.dir}/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="**/*" />

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

         </fileset>

      </copy>

   

@@ -362,11 +365,12 @@
         <param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />

      </antcall>



      <!-- Copy the sample Groovy hook scripts -->

      <!-- Copy the supported Groovy hook scripts -->

      <mkdir dir="${project.war.dir}/WEB-INF/groovy" />

      <copy todir="${project.war.dir}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="**/*" />

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

         </fileset>

      </copy>



@@ -495,6 +499,15 @@
      <copy tofile="${deployments.root}/WEB-INF/reference.properties" 

         file="${basedir}/distrib/gitblit.properties"/>



      <!-- Copy the supported Groovy hook scripts -->

      <mkdir dir="${deployments.root}/WEB-INF/groovy" />

      <copy todir="${deployments.root}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

         </fileset>

      </copy>

					
      <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties -->

      <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->

      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">