Updated documentation and build scripts

horstoeko · Feb 15, 2021 · d811f0a · d811f0a
1 parent f87212e
commit d811f0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1,392 deletions.
diff --git a/build.ant.xml b/build.ant.xml
@@ -3,7 +3,6 @@
     <!-- By default the tools are managed by Composer in ${basedir}/vendor/bin -->
     <property name="url.composer.download" value="https://getcomposer.org/download/1.10.13/composer.phar"/>
     <property name="url.phpdox.download" value="http://phpdox.de/releases/phpdox.phar"/>
-    <property name="url.sami.download" value="http://get.sensiolabs.org/sami.phar"/>
     <property name="url.validator.download" value="https://github.com/itplr-kosit/validator/releases/download/v1.4.0/validationtool-1.4.0.zip"/>
     <property name="url.validator.scenarios.download" value="https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2020-07-31/validator-configuration-xrechnung_2.0.0_2020-07-31.zip"/>
     <property name="validatorzipdir" value="${basedir}/build/validator"/>
@@ -21,7 +20,7 @@
     <property name="phpmd" value="${basedir}/vendor/bin/phpmd"/>
     <property name="phpunit" value="${basedir}/vendor/bin/phpunit"/>
     <property name="phpstan" value="${basedir}/vendor/bin/phpstan"/>
-    <property name="sami" value="${basedir}/sami.phar"/>
+    <property name="sami" value="/usr/local/sbin/sami.phar"/>
     <property name="git" value="/usr/bin/git"/>
     <target name="clean" unless="clean.done" description="Cleanup build artifacts.">
         <delete dir="${basedir}/build/builddoc"/>
@@ -58,13 +57,6 @@
             <arg value="${phpdox}"/>
         </exec>
     </target>
-    <target name="downloadsami" description="Install Sami.">
-        <get src="${url.sami.download}" dest="${sami}"/>
-        <exec executable="chmod">
-            <arg value="+x"/>
-            <arg path="${sami}"/>
-        </exec>
-    </target>
     <target name="full-build" depends="prepare,composer,static-analysis,phpunit,schematron,phpdox,-check-failure,projectdoc,deploy" description="Perform static analysis, run tests, and generate project documentation.">
         <echo message="Built"/>
     </target>
@@ -268,7 +260,7 @@
         </fail>
         <echo message="Checked failure"/>
     </target>
-    <target name="projectdoc" depends="prepare,downloadsami" description="Generator project documentation using Sami.">
+    <target name="projectdoc" depends="prepare" description="Generator project documentation using Sami.">
         <exec executable="php" taskname="projectdoc">
             <arg path="${sami}"/>
             <arg value="update"/>
@@ -330,21 +322,11 @@
         <delete dir="${basedir}/doc"/>
         <mkdir dir="${basedir}/cache"/>
         <mkdir dir="${basedir}/doc"/>
-        <exec executable="wget">
-            <arg path="${url.sami.download}"/>
-            <arg value="-O"/>
-            <arg path="${sami}"/>
-        </exec>
-        <exec executable="chmod">
-            <arg value="+x"/>
-            <arg path="${sami}"/>
-        </exec>
         <exec executable="php">
             <arg path="${sami}"/>
             <arg value="update"/>
             <arg path="${basedir}/build/sami.config.deploy.php"/>
         </exec>
-        <delete file="${sami}"/>
         <delete file="${basedir}/doc/PROJECT_VERSION"/>
         <delete file="${basedir}/doc/SAMI_VERSION"/>
         <delete file="${basedir}/doc/renderer.index"/>

diff --git a/build.xml b/build.xml
@@ -3,7 +3,6 @@
     <!-- By default the tools are managed by Composer in ${project.basedir}/vendor/bin -->
     <property name="url.composer.download" value="https://getcomposer.org/download/1.10.13/composer.phar"/>
     <property name="url.phpdox.download" value="http://phpdox.de/releases/phpdox.phar"/>
-    <property name="url.sami.download" value="http://get.sensiolabs.org/sami.phar"/>
     <property name="composer" value="${project.basedir}/composer.phar"/>
     <property name="pdepend" value="${project.basedir}/vendor/bin/pdepend"/>
     <property name="phpcpd" value="${project.basedir}/vendor/bin/phpcpd"/>
@@ -13,7 +12,7 @@
     <property name="phpmd" value="${project.basedir}/vendor/bin/phpmd"/>
     <property name="phpunit" value="${project.basedir}/vendor/bin/phpunit"/>
     <property name="phpstan" value="${project.basedir}/vendor/bin/phpstan"/>
-    <property name="sami" value="${project.basedir}/sami.phar"/>
+    <property name="sami" value="/usr/local/sbin/sami.phar"/>
     <property name="git" value="/usr/bin/git"/>
     <target name="clean" unless="clean.done" description="Cleanup build artifacts.">
         <delete dir="${project.basedir}/build/builddoc"/>
@@ -59,17 +58,6 @@
             <arg path="${phpdox}"/>
         </exec>
     </target>
-    <target name="downloadsami" description="Install Sami.">
-        <exec executable="wget">
-            <arg path="${url.sami.download}"/>
-            <arg value="-O"/>
-            <arg path="${sami}"/>
-        </exec>
-        <exec executable="chmod">
-            <arg value="+x"/>
-            <arg path="${sami}"/>
-        </exec>
-    </target>
     <target name="full-build" depends="prepare,composer,static-analysis,phpunit,phpdox,-check-failure,projectdoc,deploy" description="Perform static analysis, run tests, and generate project documentation.">
         <echo message="Built"/>
     </target>
@@ -260,7 +248,7 @@
         </fail>
         <echo message="Checked failure"/>
     </target>
-    <target name="projectdoc" depends="prepare,downloadsami" description="Generator project documentation using sami.">
+    <target name="projectdoc" depends="prepare" description="Generator project documentation using sami.">
         <exec executable="php" taskname="projectdoc">
             <arg path="${sami}"/>
             <arg value="update"/>
@@ -322,21 +310,11 @@
         <delete dir="${project.basedir}/doc"/>
         <mkdir dir="${project.basedir}/cache"/>
         <mkdir dir="${project.basedir}/doc"/>
-        <exec executable="wget">
-            <arg path="${url.sami.download}"/>
-            <arg value="-O"/>
-            <arg path="${sami}"/>
-        </exec>
-        <exec executable="chmod">
-            <arg value="+x"/>
-            <arg path="${sami}"/>
-        </exec>
         <exec executable="php" taskname="projectdoc">
             <arg path="${sami}"/>
             <arg value="update"/>
             <arg path="${project.basedir}/build/sami.config.deploy.php"/>
         </exec>
-        <delete file="${sami}"/>
         <delete file="${project.basedir}/doc/PROJECT_VERSION"/>
         <delete file="${project.basedir}/doc/SAMI_VERSION"/>
         <delete file="${project.basedir}/doc/renderer.index"/>