From fbcbded529ac9e27c472f4ba9953f80344d33ed6 Mon Sep 17 00:00:00 2001
From: "Brutzman, Don" <brutzman@nps.edu>
Date: Fri, 13 Aug 2021 06:41:52 -0700
Subject: [PATCH] refactor to utilize downloads subdirectory
---
specifications/build.xml | 119 +++++++++++++++++++++++----------------
1 file changed, 72 insertions(+), 47 deletions(-)
diff --git a/specifications/build.xml b/specifications/build.xml
index 0c9d87fa23..88bd1d6f74 100644
--- a/specifications/build.xml
+++ b/specifications/build.xml
@@ -2,6 +2,22 @@
<project name="Download IEEE and SISO Specifications" default="download.all" basedir=".">
<target name="download.all" depends="download.clean.specifications,download.SISO,download.IeeeDisStandards.instructions"/>
+
+ <property name="DIS.1.document" value="6387564"/>
+ <property name="DIS.1.rename" value="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.${DIS.1.document}.pdf"/>
+ <property name="DIS.1.title" value="1278.1-2012 - IEEE Standard for Distributed Interactive Simulation (DIS) -- Application Protocols"/>
+
+ <property name="DIS.2.document" value="7459689"/>
+ <property name="DIS.2.rename" value="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.2.document}.pdf.SAVEME"/>
+ <property name="DIS.2.title" value="1278.2-2015 - IEEE Standard for Distributed Interactive Simulation (DIS) -- Communication Services and Profiles"/>
+
+ <property name="DIS.3.document" value="587529"/>
+ <property name="DIS.3.rename" value="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.3.document}.pdf.SAVEME"/>
+ <property name="DIS.3.title" value="1278.3-1996 - IEEE Recommended Practice for Distributed Interactive Simulation (DIS) -- Exercise Management and Feedback"/>
+
+ <property name="DIS.4.document" value="8685803"/>
+ <property name="DIS.4.rename" value="IEEE1278.4-1997.DistributedInteractiveSimulation.VV+A.${DIS.4.document}.pdf.SAVEME"/>
+ <property name="DIS.4.title" value="1278.4-1997 - IEEE Recommended Practice for Distributed Interactive Simulation (DIS) -- Verification, Validation, and Accreditation (VV+A)"/>
<target name="download.clean.specifications">
<echo message="ensure all files are closed before deleting..."/>
@@ -25,18 +41,25 @@
<!-- =============================================== -->
<target name="download.IeeeDisStandards.rename" description="rename saved DIS specification files to readable filenames">
+ <!-- move files to subdirectory if needed -->
+ <move file="12781-2012.pdf" todir="downloads/" failonerror="false"/>
+ <move file="12782-2015.pdf" todir="downloads/" failonerror="false"/>
+ <move file="00587529.pdf" todir="downloads/" failonerror="false"/>
+ <move file="12784-1997.pdf" todir="downloads/" failonerror="false"/>
<!-- part 1 6387564.pdf -->
- <move file="12781-2012.pdf" tofile="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.12781-2012.pdf" verbose="true" quiet="true" failonerror="false"/>
- <copy todir="archive" file="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.12781-2012.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <move file="downloads/12781-2012.pdf" tofile="downloads/IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.12781-2012.pdf" verbose="true" quiet="true" failonerror="false"/>
<!-- part 2 7459689.pdf -->
- <move file="12782-2015.pdf" tofile="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.12782-2015.pdf" verbose="true" quiet="true" failonerror="false"/>
- <copy todir="archive" file="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.12782-2015.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <move file="downloads/12782-2015.pdf" tofile="downloads/IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.12782-2015.pdf" verbose="true" quiet="true" failonerror="false"/>
<!-- part 3 00587529.pdf -->
- <move file= "00587529.pdf" tofile="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.00587529.pdf" verbose="true" quiet="true" failonerror="false"/>
- <copy todir="archive" file="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.00587529.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <move file= "downloads/00587529.pdf" tofile="downloads/IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.00587529.pdf" verbose="true" quiet="true" failonerror="false"/>
<!-- part 4 6595010.pdf -->
- <move file="12784-1997.pdf" tofile="IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.12784-1997.pdf" verbose="true" quiet="true" failonerror="false"/>
- <copy todir="archive" file="IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.12784-1997.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <move file="downloads/12784-1997.pdf" tofile="downloads/IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.12784-1997.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <!--
+ <copy todir="downloads" file="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.12781-2012.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <copy todir="downloads" file="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.12782-2015.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <copy todir="downloads" file="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.00587529.pdf" verbose="true" quiet="true" failonerror="false"/>
+ <copy todir="downloads" file="IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.12784-1997.pdf" verbose="true" quiet="true" failonerror="false"/>
+ -->
<echo message="check *.pdf directory contents..."/>
<!-- https://stackoverflow.com/questions/10528032/listing-all-files-and-subdirectories-using-ant -->
@@ -45,11 +68,11 @@
<!-- https://stackoverflow.com/questions/7102793/how-to-put-a-newline-in-ant-property -->
<echo message="specifications directory:"/>
<echo message="${prop.dist.contents}"/>
- <fileset id="archive.contents" dir="archive" includes="*.pdf"/>
- <property name="prop.archive.contents" refid="archive.contents"/>
+ <fileset id="downloads.contents" dir="downloads" includes="*.pdf"/>
+ <property name="prop.downloads.contents" refid="downloads.contents"/>
<!-- https://stackoverflow.com/questions/7102793/how-to-put-a-newline-in-ant-property -->
- <echo message="specifications/archive directory:"/>
- <echo message="${prop.archive.contents}"/>
+ <echo message="specifications/downloads directory:"/>
+ <echo message="${prop.downloads.contents}"/>
</target>
<!-- =============================================== -->
@@ -63,58 +86,60 @@
<echo message="Warning: due to cookie and scripting restrictions, you must download IEEE specifications manually via links found in README.md"/>
<echo message="TODO: university students/faculty can first login with permissions to the IEEE Explore page, then use target download.IeeeDisStandards.retrieve"/>
<echo message="IEEE Explore: ${ieeeExploreUrl}"/>
+ <echo/>
<!-- ======================== -->
- <property name="DIS.1.document" value="6387564"/>
- <property name="DIS.1.rename" value="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.${DIS.1.document}.pdf"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.1.document}"/>
+ <echo message="${DIS.1.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.1.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.1.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.1.rename}"/>
<!--
<get src="${ieeeBaseLinkUrl}${DIS.1.document}"
- dest="${DIS.1.rename}" verbose="true"/> -->
+ dest="downloads/${DIS.1.rename}" verbose="true"/> -->
<property name="warningMessage" value="Restriction: cookie restrictions prevent automated download. You must manually download this file while within NPS campus or firewall. For "/>
<echo message="${warningMessage}IEEE1278.1 retrieval to this location, use your browser to save ${ieeeBaseLinkUrl}${DIS.1.document}"
file="${DIS.1.rename}.SAVEME"/>
- <echo message=""/>
+ <echo/>
<!-- ======================== -->
- <property name="DIS.2.document" value="7459689"/>
- <property name="DIS.2.rename" value="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.2.document}.pdf.SAVEME"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.2.document}"/>
+ <echo message="${DIS.2.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.2.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.2.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.2.rename}"/>
<!--
<get src="${ieeeBaseLinkUrl}${DIS.2.document}"
- dest="${DIS.2.rename}" verbose="true"/> -->
+ dest="downloads/${DIS.2.rename}" verbose="true"/> -->
<echo message="${warningMessage}IEEE1278.2 retrieval to this location, use your browser to save ${ieeeBaseLinkUrl}${DIS.2.document}"
file="${DIS.2.rename}"/>
- <echo message=""/>
+ <echo/>
<!-- ======================== -->
- <property name="DIS.3.document" value="587529"/>
- <property name="DIS.3.rename" value="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.3.document}.pdf.SAVEME"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.3.document}"/>
+ <echo message="${DIS.3.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.3.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.3.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.3.rename}"/>
<!--
<get src="${ieeeBaseLinkUrl}${DIS.3.document}"
- dest="${DIS.3.rename}" verbose="true"/> -->
+ dest="downloads/${DIS.3.rename}" verbose="true"/> -->
<echo message="${warningMessage}IEEE1278.3 retrieval to this location, use your browser to save ${ieeeBaseLinkUrl}${DIS.3.document}"
file="${DIS.3.rename}"/>
- <echo message=""/>
+ <echo/>
<!-- ======================== -->
- <property name="DIS.4.document" value="8685803"/>
- <property name="DIS.4.rename" value="IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.${DIS.4.document}.pdf.SAVEME"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.4.document}"/>
+ <echo message="${DIS.4.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.4.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.4.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.4.rename}"/>
<!--
<get src="${ieeeBaseLinkUrl}${DIS.4.document}"
- dest="${DIS.4.rename}" verbose="true"/> -->
+ dest="downloads/${DIS.4.rename}" verbose="true"/> -->
<echo message="${warningMessage}IEEE1278.4 retrieval to this location, use your browser to save ${ieeeBaseLinkUrl}${DIS.4.document}"
file="${DIS.4.rename}"/>
+ <echo/>
</target>
<target name="download.IeeeDisStandards.retrieve">
@@ -129,40 +154,40 @@
<echo message="IEEE Explore: ${ieeeExploreUrl}"/>
<!-- ======================== -->
- <property name="DIS.1.document" value="6387564"/>
- <property name="DIS.1.rename" value="IEEE1278.1-2012.DistributedInteractiveSimulation.ApplicationProtocols.${DIS.1.document}.pdf"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.1.document}"/>
+ <echo message="${DIS.1.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.1.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.1.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.1.rename}"/>
<get src="${ieeeBaseLinkUrl}${DIS.1.document}"
- dest="${DIS.1.rename}" verbose="true"/>
+ dest="downloads/${DIS.1.rename}" verbose="true"/>
<!-- ======================== -->
- <property name="DIS.2.document" value="7459689"/>
- <property name="DIS.2.rename" value="IEEE1278.2-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.2.document}.pdf"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.2.document}"/>
+ <echo message="${DIS.2.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.2.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.2.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.2.rename}"/>
<get src="${ieeeBaseLinkUrl}${DIS.2.document}"
- dest="${DIS.2.rename}" verbose="true"/>
+ dest="downloads/${DIS.2.rename}" verbose="true"/>
<!-- ======================== -->
- <property name="DIS.3.document" value="587529"/>
- <property name="DIS.3.rename" value="IEEE1278.3-2015.DistributedInteractiveSimulation.CommunicationsServices.${DIS.3.document}.pdf"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.3.document}"/>
+ <echo message="${DIS.3.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.3.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.3.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.3.rename}"/>
<get src="${ieeeBaseLinkUrl}${DIS.3.document}"
- dest="${DIS.3.rename}" verbose="true"/>
+ dest="downloads/${DIS.3.rename}" verbose="true"/>
<!-- ======================== -->
- <property name="DIS.4.document" value="8685803"/>
- <property name="DIS.4.rename" value="IEEE1278.4-2013.DistributedInteractiveSimulation.VV+A.${DIS.4.document}.pdf"/>
- <echo message="see ${ieeeBasePageUrl}${DIS.4.document}"/>
+ <echo message="${DIS.4.title}"/>
+ <echo message="see ${ieeeBasePageUrl}${DIS.4.document}"/>
<echo message="get ${ieeeBaseLinkUrl}${DIS.4.document}"/>
+ <echo message="to downloads/ subdirectory"/>
<echo message="as ${DIS.4.rename}"/>
<get src="${ieeeBaseLinkUrl}${DIS.4.document}"
- dest="${DIS.4.rename}" verbose="true"/>
+ dest="downloads/${DIS.4.rename}" verbose="true"/>
</target>
<!-- =============================================== -->
--
GitLab