Moved distribution files. Revised build script. Security revisions.

James Moger

2011-05-12 f988253399ee475aa4f4e60adb95a220f8f88d21

 build.xml

@@ -3,12 +3,35 @@


   <!-- Project Properties -->

   <property name="project.jar" value="gitblit.jar" />

   <property name="project.mainclass" value="com.gitblit.Launcher" />

   <property name="distribution.zipfile" value="gitblit.zip" />

   <property name="project.mainclass" value="com.gitblit.Launcher" />	
   <property name="project.build.dir" value="${basedir}/build" />



   <target name="main">



			
      <!-- extract version number from source code -->

      <loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">

         <filterchain>

            <linecontains>

                 <contains value="public final static String VERSION = "/>

             </linecontains>

            <striplinebreaks/>

            <tokenfilter>				    
               <replacestring from="public final static String VERSION = &quot;" to=""/>

               <replacestring from="&quot;;" to=""/>

               <trim />

            </tokenfilter>

         </filterchain>

      </loadfile>

      <echo>Building Git:Blit ${gb.version}</echo>

		
      <!-- copy required distribution files to project folder -->

      <copy todir="${basedir}" overwrite="false">

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

            <include name="gitblit.properties" />

            <include name="users.properties" />

         </fileset>

      </copy>

		
      <!-- Compile the build tool and execute it.

          This downloads missing compile-time dependencies from Maven. -->



@@ -16,14 +39,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 +56,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,22 +75,14 @@
      <!-- 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">

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

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

         </fileset>

         <fileset dir="${basedir}">

            <include name="*.cmd" />

            <include name="*.properties" />

         </fileset>

      </copy>



      <!-- Create Zip deployment -->

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

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

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

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