rm GitRevTask

The releaseNr is now set to a static value in build.properties. We
can increment it there manually and eventually switch to another
version number scheme if we like.

1 files changed, 2 insertions, 49 deletions

diff --git a/build.xml b/build.xml
index 4ce3d5377..886b4bae9 100644
--- a/build.xml
+++ b/build.xml
@@ -54,9 +54,6 @@
   <property name="defaults" location="defaults"/>
   <property name="RDFaParser" location="RDFaParser"/>
 
-  <!-- pseudo default releaseNr as fallback --> 
-  <property name="releaseNr" value="9000" />
-  
   <!-- defining all needed directory names for packing search widget-->
   <property name="jquery" location="htroot/jquery/"/>
   <property name="portalsearch" location="htroot/portalsearch/"/>
@@ -97,44 +94,12 @@
     -->
     <ivy:retrieve conf="compile" pathid="compile.path" pattern="${ivy.lib.dir}/[artifact]-[revision].[ext]" />
     <ivy:retrieve conf="test" pathid="test.path" pattern="${libt}/[artifact]-[revision].[ext]" />
-    <ivy:retrieve conf="libbuild" pathid="libbuild.path" pattern="${libbuild}/[artifact]-[revision].[ext]" />
     <property name="target-resolve-already-run" value="true" />
   </target>
 
-  <target name="buildGitRevTask" depends="resolve">
-    <!-- <delete file="${libbuild}/GitRevTask.jar" failonerror="false" /> deleted via clean no need to do it all the time -->
-    <javac srcdir="${libbuild}/GitRevTask" includeantruntime="true" encoding="UTF-8" classpathref="libbuild.path">
-    </javac>
-    <jar destfile="${libbuild}/GitRevTask.jar" basedir="${libbuild}/GitRevTask">
-      <manifest>
-        <attribute name="Main-Class" value="GitRevTask"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="determineGitRevision" if="isGit" depends="buildGitRevTask">
-      <taskdef resource="GitRevTask.properties">
-        <classpath>
-            <pathelement location="${libbuild}/GitRevTask.jar" />
-            <pathelement location="${libbuild}/org.eclipse.jgit-4.5.0.201609210915-r.jar" />
-            <!-- Next are the jgit dependencies -->
-            <pathelement location="${libbuild}/httpclient-4.3.6.jar" />
-            <pathelement location="${libbuild}/JavaEWAH-0.7.9.jar" />
-            <pathelement location="${libbuild}/jsch-0.1.53.jar" />
-            <pathelement location="${libbuild}/slf4j-api-1.7.2.jar" />
-        </classpath>
-      </taskdef>
-      <gitRev repoPath="${yacyroot}" branchprop="branch" revprop="releaseNr" dateprop="DSTAMP" />
-  </target>
-
-  <!-- reading the build properties from file -->
-  <target name="readBuildProperties" depends="determineGitRevision">
-    <!-- loading some property values from file -->
-    <loadproperties srcFile="build.properties" />
-  </target>
-
   <!-- initializing all needed variables -->
-  <target name="init" depends="readBuildProperties">
+  <target name="init">
+    <loadproperties srcFile="build.properties" />
     <mkdir dir="${data}"/>
     <mkdir dir="${release}"/>
 
@@ -242,13 +207,6 @@
                      includes="**/*"/>
           </copy>
 
-      <!-- copy build libs -->
-          <copy todir="${release_main}/libbuild">
-            <fileset dir="${libbuild}" 
-                     includes="**/*"
-                       excludes="**/target/**"/>
-          </copy>
-
     <!-- copy configuration files -->
     <copy todir="${release_main}">
       <fileset dir=".">
@@ -442,16 +400,11 @@
     <delete dir="${release_main}" failonerror="false"/>
     <delete file="${build}/log4j.properties" failonerror="false"/>
     <delete file="${lib}/yacycore.jar" failonerror="false"/>
-    <delete file="${lib}/svnRevNr.jar" failonerror="false"/> <!-- @TODO: obsolete, never generated -->
-    <delete file="${libbuild}/svnRevNr.jar" failonerror="false"/> <!-- @TODO: obsolete, never generated -->
-    <delete file="${libbuild}/GitRevTask.jar" failonerror="false"/>    
     <delete failonerror="false">
       <fileset dir="${src}" includes="**/*.class" />
       <fileset dir="${build}" includes="**/*.class" />
       <fileset dir="${htroot}" includes="**/*.class" />
       <fileset dir="test/" includes="**/*.class" />
-      <fileset dir="${libbuild}/svnRevNr" includes="**/*.class" /> <!-- @TODO: obsolete, never generated -->
-      <fileset dir="${libbuild}/GitRevTask" includes="**/*.class" />
       <fileset dir="." includes="TEST-*" />
     </delete>
     <delete dir="test/DATA" failonerror="false"/>