Skip to content

Commit 1057bb2

Browse files
jayponderjayponder
committed
update to use Tinker 8.8 and Java3d 1.7.0-final
1 parent ba52532 commit 1057bb2

32 files changed

+298
-647
lines changed

Diff for: ‎.gitattributes

+8
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
*.java linguist-language=Java
2+
source/*.tgz linguist-language=Java
23
other/* linguist-documentation
4+
*.java linguist-detectable=true
5+
*.sh linguist-detectable=false
6+
*.csh linguist-detectable=false
7+
*.xml linguist-detectable=false
8+
*.gz linguist-detectable=false
9+
*.install4j linguist-detectable=false
10+
*.number linguist-detectable=false

Diff for: ‎build/build.log-linux

+93-214
Large diffs are not rendered by default.

Diff for: ‎build/build.log-macos

+88-205
Large diffs are not rendered by default.

Diff for: ‎build/build.log-windows

+86-206
Large diffs are not rendered by default.

Diff for: ‎build/kits/build_8.7.21.log.gz

-41.7 KB
Binary file not shown.

Diff for: ‎build/kits/build_8.7.31.log.gz

-39.2 KB
Binary file not shown.

Diff for: ‎build/kits/build_8.7.11.log.gz renamed to ‎build/kits/build_8.8.11.log.gz

37.3 KB
Binary file not shown.

Diff for: ‎build/kits/build_8.8.21.log.gz

41.7 KB
Binary file not shown.

Diff for: ‎build/kits/build_8.8.31.log.gz

39.2 KB
Binary file not shown.

Diff for: ‎build/kits/error_8.7.11.log.gz renamed to ‎build/kits/error_8.8.11.log.gz

File renamed without changes.

Diff for: ‎build/kits/error_8.7.21.log.gz renamed to ‎build/kits/error_8.8.21.log.gz

File renamed without changes.

Diff for: ‎build/kits/error_8.7.31.log.gz renamed to ‎build/kits/error_8.8.31.log.gz

File renamed without changes.

Diff for: ‎build/linux-ffe-only.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="linux" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/linux.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="linux" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/linux.ant.xml-intel

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="linux" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/linux.build.number

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Build Number for ANT. Do not edit!
2-
#Sun Apr 19 18:12:07 CDT 2020
2+
#Thu May 28 21:54:15 CDT 2020
33
build.number=21

Diff for: ‎build/linux.install4j

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<install4j version="6.1.3" transformSequenceNumber="5">
33
<directoryPresets config="./ffe/src/main/java/ffe/icons" />
4-
<application name="Tinker-FFE" distributionSourceDir="" applicationId="7386-8650-0128-8960" mediaDir="./kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.7.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="d5b6e8b9744c70be" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 1.8">
4+
<application name="Tinker-FFE" distributionSourceDir="" applicationId="7386-8650-0128-8960" mediaDir="./kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.8.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="d5b6e8b9744c70be" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 1.8">
55
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
66
<principalLanguage id="en" customLocalizationFile="" />
77
<additionalLanguages />

Diff for: ‎build/macos-ffe-only.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="macos" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/macos.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="macos" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/macos.ant.xml-intel

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="macos" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/macos.build.number

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Build Number for ANT. Do not edit!
2-
#Sat Apr 18 22:12:40 CDT 2020
2+
#Thu May 28 21:18:58 CDT 2020
33
build.number=11

Diff for: ‎build/macos.install4j

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<install4j version="6.1.3" transformSequenceNumber="5">
33
<directoryPresets config="." />
4-
<application name="Tinker-FFE" distributionSourceDir="" applicationId="4247-8783-3069-7883" mediaDir="kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.7.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="9b7e5608bc366cbf" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="true" jdkMode="runtimeJre" jdkName="JDK 1.8">
4+
<application name="Tinker-FFE" distributionSourceDir="" applicationId="4247-8783-3069-7883" mediaDir="kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.8.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="9b7e5608bc366cbf" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="true" jdkMode="runtimeJre" jdkName="JDK 1.8">
55
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
66
<principalLanguage id="en" customLocalizationFile="" />
77
<additionalLanguages />

Diff for: ‎build/windows-ffe-only.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<property name="platform" value="windows" />
77
<property name="compiler" value="intel" />
88
<buildnumber file="${platform}.build.number" />
9-
<property name="version" value="8.7" />
9+
<property name="version" value="8.8" />
1010
<property name="kit.dir" value="kits" />
1111
<property name="build.log"
1212
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/windows.ant.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property file="tools.properties" />
66
<property name="platform" value="windows" />
77
<buildnumber file="${platform}.build.number" />
8-
<property name="version" value="8.7" />
8+
<property name="version" value="8.8" />
99
<property name="kit.dir" value="kits" />
1010
<property name="build.log"
1111
value="${kit.dir}/build_${version}.${build.number}.log" />

Diff for: ‎build/windows.build.number

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Build Number for ANT. Do not edit!
2-
#Mon Apr 20 00:04:09 COT 2020
2+
#Thu May 28 22:26:08 COT 2020
33
build.number=31

Diff for: ‎build/windows.install4j

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<install4j version="6.1.3" transformSequenceNumber="5">
33
<directoryPresets config="ffe/FFESetupWin.bat" />
4-
<application name="Tinker-FFE" distributionSourceDir="" applicationId="4247-8783-3069-7883" mediaDir="kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.7.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="baea8932708593ec" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
4+
<application name="Tinker-FFE" distributionSourceDir="" applicationId="4247-8783-3069-7883" mediaDir="kits" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="3" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Tinker-FFE" publisher="Jay Ponder Lab" publisherWeb="http://dasher.wustl.edu" version="8.8.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="baea8932708593ec" javaMinVersion="1.6" javaMaxVersion="1.8" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
55
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
66
<principalLanguage id="en" customLocalizationFile="" />
77
<additionalLanguages />

Diff for: ‎other/j3d/0README

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
##############################################
55

66
This directory contains the most recent versions of Java3D, JOGL
7-
and related packages as obtained in April 2018.
7+
and related packages as obtained from JogAmp.org in May 2020.
88

9-
The Java3D package is found as version 1.7.0-pre1 dated May 2017
10-
and downloaded from:
9+
The Java3D package is found as version 1.7.0-final dated January
10+
2020 and downloaded from:
1111

12-
http://jogamp.org/deployment/java3d/1.7.0-pre1/jogamp-java3d.7z
12+
http://jogamp.org/deployment/java3d/1.7.0-final \
13+
/jogamp-java3d1.7.0-final.7z
1314

1415
The corresponding version of JOGAMP is version 2.3.2, containing
1516
JOGL, JOAL and GLUEGEN, dated October 2015 and downloaded from:
1617

1718
http://jogamp.org/deployment/jogamp-current/archive \
1819
/jogamp-all-platforms.7z
1920

20-
The directory provide here contains jar files for Linux, MacOS
21+
The directory provided here contains jar files for Linux, MacOS
2122
and Windows extracted from the above download.
2223

2324
These versions of Java3D, JOGL, JOAL and GLUEGEN work on Linux,
@@ -27,13 +28,13 @@
2728
for these packages, and how to configure them under Eclipse.
2829

2930
The file macos-override-java3d.pdf contains info on overriding
30-
the old Java3D 1.3 install as system software with MacOS. In
31+
the old Java3D 1.3 installed as system software with MacOS. In
3132
the current FFE build, the override is performed by bundling
3233
the Java3d jars with the build and specifying the jars to be
3334
used in the Install4j build configuration (see ffe/build.xml).
3435

35-
To building FFE, several jar files from this directory should
36-
be copied to ffe/lib in the build tree. These include:
36+
To build FFE, several jar files from this directory should be
37+
copied to ffe/lib in the build tree. These include:
3738

3839
j3dcore-1.7.jar
3940
j3utils-1.7.jar

Diff for: ‎other/j3d/jogamp-java3d/j3dcore-1.7.jar

12.8 KB
Binary file not shown.

Diff for: ‎other/j3d/jogamp-java3d/j3dutils-1.7.jar

37.5 KB
Binary file not shown.

Diff for: ‎other/j3d/jogamp-java3d/vecmath-1.7.jar

8.44 KB
Binary file not shown.

Diff for: ‎source/ffe.tgz

842 KB
Binary file not shown.

Diff for: ‎source/tinker.tgz

3.72 MB
Binary file not shown.

0 commit comments

Comments
 (0)