Merge origin/master

ed16c1eb · Norbraten, Terry · 7d352fef · 7b2c9ed3 · ed16c1eb · ed16c1eb
Commit ed16c1eb authored Apr 15, 2020 by Norbraten, Terry
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

build.properties build.properties +1 -0

build.xml build.xml +1 -1

No files found.
--- a/build.properties
+++ b/build.properties
@@ -235,6 +235,7 @@ sai.simserver.dir=${examples.dir}/sai/simserver
 examples.spec.x3d.java.dir=${examples.dir}/spec/x3d/java

 xj3d.version=Version
+xj3d.version.number=2.2
 xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version}.java

 browser.class=${browser.classes.dir}/xj3d/browser/Xj3DBrowser.class

--- a/build.xml
+++ b/build.xml
@@ -1422,7 +1422,7 @@ Nearby:
            </fileset>
        </scp>
        <scp sftp="true"
-             remotetodir="${username.savage}@${scpServer.savage}:${scpDirectory.savage.Xj3D}/installers" password="${password.savage}"
+             remotetodir="${username.savage}@${scpServer.savage}:${scpDirectory.savage.Xj3D}/installers/${xj3d.version.number}" password="${password.savage}"
            trust="true" verbose="true" preserveLastModified="true">
            <fileset dir="installers">
                <include name="README.installers.txt"/>