Build infrastructure improvements. Setting to show remote branches.

James Moger

2011-05-04 cf9550d8df51d927c63176675280d69b86e7a6e2

 build.xml

@@ -16,14 +16,13 @@
      <mkdir dir="${project.build.dir}" />

      <javac srcdir="${basedir}/src" destdir="${project.build.dir}">

         <include name="com/gitblit/Build.java" />

         <include name="com/gitblit/Constants.java" />

         <include name="com/gitblit/utils/StringUtils.java" />

      </javac>

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



      <!-- Compile Project -->

      <path id="master-classpath">

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

            <include name="*.jar" />

         </fileset>

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

            <include name="*.jar" />

         </fileset>

@@ -34,21 +33,17 @@
      </javac>

      <copy todir="${project.build.dir}">

         <fileset dir="${basedir}/src" excludes="**/*.java,**/thumbs.db" />

         <fileset dir="${basedir}/resources" excludes="**/thumbs.db" />

      </copy>



      <!-- Build jar -->

      <delete file="${project.jar}" />

      <jar index="true" jarfile="${project.jar}">

      <jar jarfile="${project.jar}">

         <fileset dir="${project.build.dir}">

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

         </fileset>

         <manifest>

            <attribute name="Main-Class" value="${project.mainclass}" />

         </manifest>

         <indexjars>

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

         </indexjars>

      </jar>



      <!-- Delete the deploy folder -->

@@ -57,11 +52,6 @@
      <!-- Create deployment folder structure -->

      <mkdir dir="${basedir}/deploy" />

      <copy todir="${basedir}/deploy" file="${project.jar}" />

      <copy todir="${basedir}/deploy/lib">

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

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

         </fileset>

      </copy>

      <copy todir="${basedir}/deploy">

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

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