diff --git a/build.xml b/build.xml index 88983c128fda02fb4df890b08805e3af4e4a57b6..0c00cb2a55a94da617f81753864fb51dfd1274f1 100644 --- a/build.xml +++ b/build.xml @@ -513,7 +513,7 @@ POSSIBILITY OF SUCH DAMAGE. <!-- do not clean documentation as part of zip: depends="clean.owldoc" --> </target> - <target name="zip" depends="clean" description="create EthicalControlArchive.zip to facilitate developent" > + <target name="zip" depends="clean" description="create EthicalControlArchive.zip to facilitate developent"> <zip destfile="EthicalControlArchive.zip"> <zipfileset dir="." prefix="EthicalControl"> <include name="*.html"/> @@ -523,7 +523,7 @@ POSSIBILITY OF SUCH DAMAGE. <include name="*.xml"/> <include name="license.*"/><!-- TODO --> </zipfileset> - <zipfileset dir="documentation" prefix="EthicalControl/documents"> + <zipfileset dir="documentation" prefix="EthicalControl/documentation"> <include name="**/*.png"/> <include name="**/*.jpg"/> <include name="**/*.md"/> @@ -531,10 +531,18 @@ POSSIBILITY OF SUCH DAMAGE. <include name="**/*.pptx"/> <include name="**/*.md"/> <include name="**/*.txt"/> - <include name="owldoc/**/*.*"/><!-- produced by Protege - big! --> - <exclude name="videos/*.*"/> + <exclude name="videos/**/*.mp4"/> <exclude name="**/*signature*.*"/> </zipfileset> + <!-- XML Spy documentation for AVCL --> + <zipfileset dir="documentation/ontologies/owldoc" prefix="EthicalControl/documentation/ontologies/owldoc"> + <!-- produced by Protege - big! --> + <include name="**/*"/> + </zipfileset> + <!-- XML Spy documentation for AVCL --> + <zipfileset dir="documentation/schemas/AVCL.3.0" prefix="EthicalControl/documentation/schemas/AVCL.3.0"> + <include name="**/*"/> + </zipfileset> <zipfileset dir="lib" prefix="EthicalControl/lib"> <include name="*.jar"/> </zipfileset> @@ -585,15 +593,18 @@ POSSIBILITY OF SUCH DAMAGE. </if> </target> - <target name="upload" depends="zip,scp.uploadEthicalControl.savage"/> + <target name="upload" depends="zip,scp.uploadEthicalControl.savage"/> + <target name="upload.videos" depends= "scp.uploadEthicalControl.savage.videos"/> <target name="scp.uploadEthicalControl.savage" depends="scp.askUsernamePassword.savage" - description="scp upload of updated Savage X3D catalog and javadoc pages, not including .zip"> - <echo message="scp upload catalog and javadoc pages to sftp://${sftpServer.savage}${sftpDirectory.savage.EthicalControl}"/> - <scp remotetodir="${username.savage}@${sftpServer.savage}:${sftpDirectory.savage.EthicalControl}" password="${password.savage}" + description="scp upload of Ethical Control project, not including videos"> + <echo message="scp upload Ethical Control project, not including videos, to"/> + <echo message= " sftp://${sftpServer.savage}${sftpDirectory.savage.EthicalControl}"/> + <scp remotetodir="${username.savage}@${sftpServer.savage}:${sftpDirectory.savage.EthicalControl}" password="${password.savage}" verbose="true" filemode="664" dirmode="775"> <fileset dir="."> <include name="**/*"/> + <exclude name="**/*.mp4"/> <exclude name="**/*.fasl"/> <exclude name="**/*.zip"/> <exclude name="**/~*"/> @@ -613,6 +624,19 @@ POSSIBILITY OF SUCH DAMAGE. <echo message="upload available at https://${sftpServer.savage}/${sftpDirectory.savage.EthicalControl}"/> <echo message="scp.uploadEthicalControl.savage ssh-sftp target complete"/> </target> + + <target name="scp.uploadEthicalControl.savage.videos" depends="scp.askUsernamePassword.savage" + description="scp upload of Ethical Control videos"> + <echo message="scp upload videos to sftp://${sftpServer.savage}${sftpDirectory.savage.EthicalControl}"/> + <scp remotetodir="${username.savage}@${sftpServer.savage}:${sftpDirectory.savage.EthicalControl}" password="${password.savage}" + verbose="true" filemode="664" dirmode="775"> + <fileset dir="."> + <include name="**/*.mp4"/> + </fileset> + </scp> + <echo message="upload available at https://${sftpServer.savage}/${sftpDirectory.savage.EthicalControl}"/> + <echo message="scp.uploadEthicalControl.savage.videos ssh-sftp target complete"/> + </target> <target name="view.gitlab.site" description="view online version control archive in web browser (Netbeans only)"> <echo message="https://gitlab.nps.edu/Savage/EthicalControl"/>