cleanup

dist-utils/antbuild/build.xml

@@ -57,14 +57,6 @@
                  <git:pull />
                  <git:checkout branchName="tags/${exist.tag}" />
             </git:git>
-            <!-- alternative with exec:
-            <exec executable="git" dir="${exist.dest}">
-               <arg value="checkout"/>
-               <arg value="master"/>
-           </exec>
-           <exec executable="git" dir="${exist.dest}">
-               <arg value="pull"/>
-           </exec -->
           </then>
           <else>
             <echo message="cloning exist git repository"/>
@@ -115,7 +107,6 @@
         <copy todir="${exist.dist}/autodeploy">
             <fileset dir="${exist.dest}/autodeploy/" includes="*.xar"/>
             <fileset dir="${sade.src}/build" includes="*.xar"/>
-          <!--   <fileset dir="${markdown.dest}/build" includes="*.xar"/> -->
         </copy>
         <antcall target="eXistconfig"/>
 
@@ -129,11 +120,6 @@
 -->
         <antcall target="rdf-indexer" />
         <antcall target="fontane-lucene-analyzer" />
-
-        <!-- add bin/sade.sh symlink for backwards compatibility / does not work with tar / zip-->
-        <!--symlink link="${exist.dist}/bin/sade.sh" resource="../tools/wrapper/bin/exist.sh"/>
-        <symlink link="${exist.dist}/bin/sade.bat" resource="../tools/wrapper/bin/exist.bat"/-->
-
         <antcall target="fontane-static" />
         <antcall target="tgz" />
         <antcall target="textgrid-tgz" />
@@ -157,11 +143,6 @@
            <!--pathelement path="${java.class.path}"/-->
          </classpath>
        </java>
-
-    	 <!--exec executable="${exist.dest}/build.sh">
-    	    <arg value="all"/>
-    	    <arg value="dist"/>
-    	  </exec-->
     </target>
 
     <target name="tgz">
@@ -169,44 +150,15 @@
         <delete dir="${build.dir}/sade" />
         <!-- i had never expect the move of exist.dist in here! -->
         <move file="${exist.dist}" toFile="${build.dir}/sade" />
-        <!-- tar destfile="${sade.tgz.file}" compression="gzip" longfile="gnu">
-            <tarfileset dir="${build.dir}" filemode="755">
-                <include name="sade/**/*.sh"/>
-                <include name="sade/tools/wrapper/bin/**"/>
-            </tarfileset>
-            <tarfileset dir="${build.dir}" includes="sade/**">
-                <exclude name="sade/**/*.sh"/>
-                <exclude name="sade/tools/wrapper/bin/**" />
-                <!-/-exclude name="sade/extensions/**" />
-                <exclude name="sade/src/**" /-/->
-            </tarfileset>
-        </tar -->
     </target>
 
     <target name="textgrid-tgz" depends="textgrid-sade-connector">
-      <!-- had a dependency on textgrid-default-project?  -->
         <delete file="${tgsade.tgz.file}" />
-        <!--delete dir="${build.dir}/sade" /-->
-        <!--move file="${exist.dist}" toFile="${build.dir}/sade" /-->
-
         <move todir="${build.dir}/sade/autodeploy">
           <fileset dir="${tg.sadeconnect.dest}/build">
             <include name="*.xar"/>
           </fileset>
         </move>
-
-        <!-- tar destfile="${tgsade.tgz.file}" compression="gzip" longfile="gnu">
-            <tarfileset dir="${build.dir}" filemode="755">
-                <include name="sade/**/*.sh"/>
-                <include name="sade/tools/wrapper/bin/**"/>
-            </tarfileset>
-            <tarfileset dir="${build.dir}" includes="sade/**">
-                <exclude name="sade/**/*.sh"/>
-                <exclude name="sade/tools/wrapper/bin/**" />
-                <!-/-exclude name="sade/extensions/**" />
-                <exclude name="sade/src/**" /-/->
-            </tarfileset>
-        </tar-->
     </target>
 
     <target name="textgrid-default-project" depends="ant-dependencies">
@@ -292,13 +244,9 @@
         <available file="${fontane.static.dest}" type="dir" />
         <then>
           <echo message="git pull" />
-          <exec executable="git" dir="${fontane.static.dest}">
-             <arg value="checkout"/>
-             <arg value="master"/>
-         </exec>
-          <exec executable="git" dir="${fontane.static.dest}">
-             <arg value="pull"/>
-         </exec>
+          <git:git directory="${fontane.static.dest}" verbose="false">
+               <git:pull/>
+          </git:git>
         </then>
         <else>
           <echo message="git clone ${fontane.static.git}"/>
@@ -317,18 +265,7 @@
         </copy>
     </target>
 
-    <!--target name="project-data">
-      <echo message="current dir: ${basedir}" />
-      <echo message="git pull ./../../../SADE-Project-develop" />
-      <exec executable="git" dir="${basedir}/../../../SADE-Project-develop">
-        <arg value="pull"/>
-      </exec>
-    </target-->
-
     <target name="project-data" depends="ant-dependencies">
-      <!--property name="fontane.sadeproject.git" value="http://gitlab.gwdg.de/fontane-notizbuecher/SADE-Project.git"/>
-      <property name="fontane.sadeproject.git.branch" value="develop"/>
-      <property name="fontane.sadeproject.dest" value="${build.dir}/fontane"/-->
         <if>
             <available file="${fontane.sadeproject.dest}" type="dir" />
             <then>