James Moger
2011-07-05 ed21d23885c2f112e5c5650e9436870b1ac99392
build.xml
@@ -23,10 +23,6 @@
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <target name="buildinfo">
      <!-- build date -->
      <tstamp>
         <format property="gb.buildDate" pattern="yyyy-MM-dd" />
      </tstamp>
   
      <!-- extract Gitblit version number from source code -->
      <loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
@@ -42,7 +38,22 @@
            </tokenfilter>
         </filterchain>
      </loadfile>
      <!-- extract Gitblit version date from source code -->
      <loadfile property="gb.versionDate" srcfile="${basedir}/src/com/gitblit/Constants.java">
         <filterchain>
            <linecontains>
               <contains value="public static final String VERSION_DATE = " />
            </linecontains>
            <striplinebreaks />
            <tokenfilter>
               <replacestring from="public static final String VERSION_DATE = &quot;" to="" />
               <replacestring from="&quot;;" to="" />
               <trim />
            </tokenfilter>
         </filterchain>
      </loadfile>
      <!-- extract JGit version number from source code -->
      <loadfile property="jgit.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
         <filterchain>
@@ -83,11 +94,11 @@
      <delete dir="${project.build.dir}" />
      <mkdir dir="${project.build.dir}" />
      <javac srcdir="${basedir}/src" destdir="${project.build.dir}">
         <include name="com/gitblit/Build.java" />
         <include name="com/gitblit/build/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" />
      <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" />
      <!-- Compile Project -->
      <path id="master-classpath">
@@ -122,6 +133,10 @@
      <copy todir="${project.deploy.dir}">
         <fileset dir="${basedir}/distrib">
            <include name="**/*" />
         </fileset>
         <fileset dir="${basedir}">
            <include name="LICENSE" />
            <include name="NOTICE" />
         </fileset>
      </copy>
@@ -193,7 +208,7 @@
         </copy>
         <!-- Build deployment doc pages -->
         <java classpath="${project.build.dir}" classname="com.gitblit.BuildSite">
         <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">
            <classpath refid="master-classpath" />
            <arg value="--sourceFolder" />
            <arg value="${basedir}/docs" />
@@ -229,7 +244,7 @@
            <arg value="%WAR%=${distribution.warfile}" />
            <arg value="--substitute" />
            <arg value="%BUILDDATE%=${gb.buildDate}" />
            <arg value="%BUILDDATE%=${gb.versionDate}" />
            <arg value="--substitute" />
            <arg value="%JGIT%=${jgit.version}" />
@@ -260,6 +275,10 @@
         <fileset dir="${basedir}/src/WEB-INF">
             <include name="web.xml" />
         </fileset>
         <fileset dir="${basedir}">
            <include name="LICENSE" />
            <include name="NOTICE" />
         </fileset>
      </copy>
      
      <!-- Build the docs for the WAR build -->
@@ -268,7 +287,7 @@
      </antcall>
      
      <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties --> 
      <java classpath="${project.build.dir}" classname="com.gitblit.BuildWebXml">
      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">
         <classpath refid="master-classpath" />
         
         <arg value="--sourceFile" />
@@ -307,7 +326,7 @@
         <fileset dir="${project.build.dir}">
            <exclude name="WEB-INF/web.xml" />
            <exclude name="com/gitblit/tests/" />
            <exclude name="com/gitblit/Build*.class" />
            <exclude name="com/gitblit/build/**" />
            <exclude name="com/gitblit/GitBlitServer*.class" />
            <exclude name="com/gitblit/Launcher*.class" />
            <exclude name="com/gitblit/MakeCertificate*.class" />            
@@ -372,7 +391,7 @@
      </copy>
      <!-- Generate thumbnails of screenshots -->
      <java classpath="${project.build.dir}" classname="com.gitblit.BuildThumbnails">
      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildThumbnails">
         <classpath refid="master-classpath" />
            
         <arg value="--sourceFolder" />
@@ -394,7 +413,7 @@
      </copy>
      <!-- Build site pages -->
      <java classpath="${project.build.dir}" classname="com.gitblit.BuildSite">
      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">
         <classpath refid="master-classpath" />
         <arg value="--sourceFolder" />
         <arg value="${basedir}/docs" />
@@ -424,7 +443,7 @@
         <arg value="%WAR%=${distribution.warfile}" />
         <arg value="--substitute" />
         <arg value="%BUILDDATE%=${gb.buildDate}" />
         <arg value="%BUILDDATE%=${gb.versionDate}" />
         <arg value="--substitute" />
         <arg value="%JGIT%=${jgit.version}" />
@@ -465,7 +484,7 @@
          projectname="gitblit" 
          filename="${distribution.zipfile}" 
          targetfilename="gitblit-${gb.version}.zip"
          summary="Standalone, integrated Gitblit server v${gb.version}"
          summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"
          labels="Featured, Type-Package, OpSys-All" />
         
      <!-- Upload WAR file -->
@@ -475,7 +494,7 @@
           projectname="gitblit" 
           filename="${distribution.warfile}" 
           targetfilename="gitblit-${gb.version}.war"
           summary="Gitblit WAR v${gb.version} for your servlet container"
           summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"
           labels="Featured, Type-Package, OpSys-All" />
   </target>