Skip to content

Commit b6d321b

Browse files
committed
update to sync Tinker-FFE with CPU Tinker version 25.5
1 parent cb37e04 commit b6d321b

File tree

139 files changed

+2171
-2169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+2171
-2169
lines changed

build/build.log-linux

Lines changed: 696 additions & 696 deletions
Large diffs are not rendered by default.

build/build.log-macos

Lines changed: 698 additions & 698 deletions
Large diffs are not rendered by default.

build/build.log-windows

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ init:
3030
[mkdir] Created dir: C:\Users\ponder\ffe\build\tinker
3131
[mkdir] Created dir: C:\Users\ponder\ffe\build\tinker\bin
3232
[echoproperties] #Ant properties
33-
[echoproperties] #Tue Sep 02 23:33:52 BOT 2025
33+
[echoproperties] #Mon Sep 22 20:27:21 BOT 2025
3434
[echoproperties] ant.library.dir=C\:/Users/ponder/ffe/build/buildtools/ant-1.9.6/lib
3535
[echoproperties] awt.toolkit=sun.awt.windows.WToolkit
3636
[echoproperties] env.NUMBER_OF_PROCESSORS=4
@@ -41,27 +41,30 @@ init:
4141
[echoproperties] jvm.dir=C\:\\Users\\ponder\\ffe\\build/ffe/native/windows
4242
[echoproperties] sun.cpu.isalist=amd64
4343
[echoproperties] sun.jnu.encoding=Cp1252
44+
[echoproperties] env.EFC_6552_3789132940=1
4445
[echoproperties] env.MINTTY_SHORTCUT=/cygdrive/c/Users/Public/Desktop/Cygwin64 Terminal.lnk
4546
[echoproperties] ant.file.Force\ Field\ Explorer\ for\ Windows=C\:\\Users\\ponder\\ffe\\build\\windows.ant.xml
4647
[echoproperties] sun.arch.data.model=64
48+
[echoproperties] env.FPS_BROWSER_APP_PROFILE_STRING=Internet Explorer
4749
[echoproperties] env.CommonProgramW6432=C\:\\Program Files\\Common Files
4850
[echoproperties] env.INSTALL4J_HOME=/cygdrive/c/Progra~1/install4j10
4951
[echoproperties] java.vendor.url=https\://aws.amazon.com/corretto/
5052
[echoproperties] env.OS=Windows_NT
5153
[echoproperties] env.Profile=C\:\\Users\\ponder\\.profile.ps1
52-
[echoproperties] DSTAMP=20250902
54+
[echoproperties] DSTAMP=20250922
5355
[echoproperties] sun.boot.library.path=C\:\\Progra~1\\Amazon~1\\jdk11.0.27_6\\bin
5456
[echoproperties] sun.java.command=org.apache.tools.ant.launch.Launcher -cp -f windows.ant.xml
5557
[echoproperties] env.SYSTEMROOT=C\:\\WINDOWS
5658
[echoproperties] jdk.debug=release
5759
[echoproperties] jni.dir=C\:\\Users\\ponder\\ffe\\build/ffe/native
5860
[echoproperties] tinker.src.dir=C\:\\Users\\ponder\\ffe\\build/tinker/source
5961
[echoproperties] java.specification.vendor=Oracle Corporation
62+
[echoproperties] env.EFC_6552_1262719628=1
6063
[echoproperties] env.JAVA_HOME=C\:/Progra~1/Amazon~1/jdk11.0.27_6
6164
[echoproperties] java.version.date=2025-04-15
6265
[echoproperties] env.OSTYPE=cygwin
6366
[echoproperties] java.home=C\:\\Progra~1\\Amazon~1\\jdk11.0.27_6
64-
[echoproperties] version=25.4
67+
[echoproperties] version=25.5
6568
[echoproperties] env.PROGRAMFILES=C\:\\Program Files
6669
[echoproperties] basedir=C\:\\Users\\ponder\\ffe\\build
6770
[echoproperties] file.separator=\\
@@ -77,6 +80,7 @@ init:
7780
[echoproperties] user.script=
7881
[echoproperties] env.TLS=/cygdrive/c/Users/ponder/ffe/build/buildtools
7982
[echoproperties] sun.management.compiler=HotSpot 64-Bit Tiered Compilers
83+
[echoproperties] env.EFC_6552_2775293581=1
8084
[echoproperties] env.PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
8185
[echoproperties] env.TERM_PROGRAM_VERSION=3.7.8
8286
[echoproperties] java.runtime.version=11.0.27+6-LTS
@@ -119,7 +123,6 @@ init:
119123
[echoproperties] env.WINDIR=C\:\\WINDOWS
120124
[echoproperties] env.TERM_PROGRAM=mintty
121125
[echoproperties] sun.desktop=windows
122-
[echoproperties] env.EFC_6716_2775293581=1
123126
[echoproperties] ant.file.type=file
124127
[echoproperties] env.PWD=/cygdrive/c/Users/ponder/ffe/build
125128
[echoproperties] env.LC_CTYPE=en_US.UTF-8
@@ -128,7 +131,6 @@ init:
128131
[echoproperties] env.HOME=C\:\\Users\\ponder
129132
[echoproperties] java.vm.vendor=Amazon.com Inc.
130133
[echoproperties] env.PROCESSOR_ARCHITECTURE=AMD64
131-
[echoproperties] env.EFC_6716_1592913036=1
132134
[echoproperties] user.variant=
133135
[echoproperties] kit.dir=kits
134136
[echoproperties] user.timezone=
@@ -146,27 +148,28 @@ init:
146148
[echoproperties] env.BLD=/cygdrive/c/Users/ponder/ffe/build
147149
[echoproperties] user.home=C\:\\Users\\ponder
148150
[echoproperties] user.language=en
149-
[echoproperties] build.log=kits/build_25.4.31.log
151+
[echoproperties] build.log=kits/build_25.5.31.log
150152
[echoproperties] ffe.dir=C\:\\Users\\ponder\\ffe\\build/ffe
151153
[echoproperties] env.NLSPATH=/usr/share/locale/%L/LC_MESSAGES/%N.cat\:/usr/share/locale/%l/LC_MESSAGES/%N.cat
152154
[echoproperties] env.ALLUSERSPROFILE=C\:\\ProgramData
153155
[echoproperties] ant.java.version=1.9
154156
[echoproperties] env.SESSIONNAME=Console
155157
[echoproperties] env.MACHTYPE=x86_64
156158
[echoproperties] java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment
157-
[echoproperties] env.EFC_6716_3789132940=1
158159
[echoproperties] env.TZ=America/La_Paz
159160
[echoproperties] fc=gfortran
160161
[echoproperties] env.ANT_HOME=C\:/Users/ponder/ffe/build/buildtools/ant-1.9.6
161-
[echoproperties] TSTAMP=2333
162+
[echoproperties] TSTAMP=2027
162163
[echoproperties] env.HOST=vixen-win11
163164
[echoproperties] fftw.lib.dir=C\:\\Users\\ponder\\ffe\\build/fftw/lib
165+
[echoproperties] env.EFC_6552_2283032206=1
164166
[echoproperties] tinker.link.flags=-Ofast -msse3 -fopenmp -static -L. -LC\:\\Users\\ponder\\ffe\\build/fftw/lib -ltinker -lfftw3 -lfftw3_threads
165167
[echoproperties] ant.file=C\:\\Users\\ponder\\ffe\\build\\windows.ant.xml
166168
[echoproperties] path.separator=;
167-
[echoproperties] error.log=kits/error_25.4.31.log
169+
[echoproperties] error.log=kits/error_25.5.31.log
168170
[echoproperties] platform=windows
169171
[echoproperties] os.version=10.0
172+
[echoproperties] env.EFC_6552_1592913036=1
170173
[echoproperties] tinker.include.flags=-IC\:\\Users\\ponder\\ffe\\build/tinker/source -IC\:\\Users\\ponder\\ffe\\build/ffe/native -IC\:\\Users\\ponder\\ffe\\build/ffe/native/windows
171174
[echoproperties] env.CommonProgramFiles(x86)=C\:\\Program Files (x86)\\Common Files
172175
[echoproperties] java.runtime.name=OpenJDK Runtime Environment
@@ -178,7 +181,7 @@ init:
178181
[echoproperties] env.SHELL=/bin/tcsh
179182
[echoproperties] ant.core.lib=C\:\\Users\\ponder\\ffe\\build\\buildtools\\ant-1.9.6\\lib\\ant.jar
180183
[echoproperties] java.vendor.url.bug=https\://github.com/corretto/corretto-11/issues/
181-
[echoproperties] TODAY=September 2 2025
184+
[echoproperties] TODAY=September 22 2025
182185
[echoproperties] user.dir=C\:\\Users\\ponder\\ffe\\build
183186
[echoproperties] env.USERNAME=ponder
184187
[echoproperties] os.arch=amd64
@@ -188,11 +191,10 @@ init:
188191
[echoproperties] env.ANT_OPTS=-Xms2048M -Xmx4096M
189192
[echoproperties] java.vm.info=mixed mode
190193
[echoproperties] java.vm.version=11.0.27+6-LTS
194+
[echoproperties] env.FPS_BROWSER_USER_PROFILE_STRING=Default
191195
[echoproperties] build.number=31
192-
[echoproperties] env.EFC_6716_1262719628=1
193196
[echoproperties] env.USER=ponder
194197
[echoproperties] java.class.version=55.0
195-
[echoproperties] env.EFC_6716_2283032206=1
196198
[echoproperties] ant.project.default-target=make
197199

198200
sync-source:
@@ -2057,7 +2059,7 @@ resource:
20572059
[copy] Copying 148 files to C:\Users\ponder\ffe\build\ffe\target\classes
20582060

20592061
package:
2060-
[jar] Building jar: C:\Users\ponder\ffe\build\ffe\lib\ffe-25.4.jar
2062+
[jar] Building jar: C:\Users\ponder\ffe\build\ffe\lib\ffe-25.5.jar
20612063

20622064
make:
20632065

@@ -2089,24 +2091,24 @@ kits:
20892091
[install4j]
20902092
[install4j] Compressed media file 'Windows Archive':
20912093
[install4j] Moving media files to media directory C:\Users\ponder\ffe\build\kits
2092-
[install4j] The name of the media file is Tinker-FFE_windows-x64_25.4.31.zip.
2093-
[install4j] The size of the media file is 253.2 MB
2094+
[install4j] The name of the media file is Tinker-FFE_windows-x64_25.5.31.zip.
2095+
[install4j] The size of the media file is 253.5 MB
20942096
[install4j]
20952097
[install4j] Compressed media file 'Windows':
20962098
[install4j] Compressing files
20972099
[install4j] Moving media files to media directory C:\Users\ponder\ffe\build\kits
2098-
[install4j] The name of the media file is Tinker-FFE_windows-x64_25.4.31.exe.
2099-
[install4j] The size of the media file is 251.6 MB
2100+
[install4j] The name of the media file is Tinker-FFE_windows-x64_25.5.31.exe.
2101+
[install4j] The size of the media file is 251.9 MB
21002102
[install4j] Writing md5sums.
21012103
[install4j] Writing sha256sums.
21022104
[install4j] Writing updates.xml.
2103-
[install4j] Build completed in 52.5 seconds at 2025-09-02 23:48:54.
2104-
[gzip] Building: C:\Users\ponder\ffe\build\kits\build_25.4.31.log.gz
2105-
[gzip] Building: C:\Users\ponder\ffe\build\kits\error_25.4.31.log.gz
2106-
[delete] Deleting: C:\Users\ponder\ffe\build\kits\build_25.4.31.log
2107-
[delete] Deleting: C:\Users\ponder\ffe\build\kits\error_25.4.31.log
2105+
[install4j] Build completed in 50.6 seconds at 2025-09-22 20:42:13.
2106+
[gzip] Building: C:\Users\ponder\ffe\build\kits\build_25.5.31.log.gz
2107+
[gzip] Building: C:\Users\ponder\ffe\build\kits\error_25.5.31.log.gz
2108+
[delete] Deleting: C:\Users\ponder\ffe\build\kits\build_25.5.31.log
2109+
[delete] Deleting: C:\Users\ponder\ffe\build\kits\error_25.5.31.log
21082110

21092111
make:
21102112

21112113
BUILD SUCCESSFUL
2112-
Total time: 15 minutes 2 seconds
2114+
Total time: 14 minutes 52 seconds

build/linux.ant.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tstamp />
55
<property name="platform" value="linux" />
66
<buildnumber file="${platform}.build.number" />
7-
<property name="version" value="25.4" />
7+
<property name="version" value="25.5" />
88
<property name="kit.dir" value="kits" />
99
<property name="build.log"
1010
value="${kit.dir}/build_${version}.${build.number}.log" />

build/linux.ant.xml-ffe-only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tstamp />
55
<property name="platform" value="linux" />
66
<buildnumber file="${platform}.build.number" />
7-
<property name="version" value="25.4" />
7+
<property name="version" value="25.5" />
88
<property name="kit.dir" value="kits" />
99
<property name="build.log"
1010
value="${kit.dir}/build_${version}.${build.number}.log" />

build/linux.ant.xml-intel-compiler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tstamp />
55
<property name="platform" value="linux" />
66
<buildnumber file="${platform}.build.number" />
7-
<property name="version" value="25.4" />
7+
<property name="version" value="25.5" />
88
<property name="kit.dir" value="kits" />
99
<property name="build.log"
1010
value="${kit.dir}/build_${version}.${build.number}.log" />

build/linux.build.number

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Build Number for ANT. Do not edit!
2-
#Tue Sep 02 23:19:27 EDT 2025
2+
#Fri Oct 03 11:21:02 EDT 2025
33
build.number=21

build/linux.install4j

Lines changed: 1 addition & 1 deletion
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.6" 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="TinkerTools Organization" publisherWeb="https://github.com/TinkerTools/" version="25.4.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="d5b6e8b9744c70be" javaMinVersion="1.8" javaMaxVersion="11" allowBetaVM="true" jdkMode="runtimeJre" jdkName="JDK 11">
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="TinkerTools Organization" publisherWeb="https://github.com/TinkerTools/" version="25.5.${compiler:build.number}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="d5b6e8b9744c70be" javaMinVersion="1.8" javaMaxVersion="11" allowBetaVM="true" jdkMode="runtimeJre" jdkName="JDK 11">
55
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
66
<principalLanguage id="en" customLocalizationFile="" />
77
<additionalLanguages />

build/macos.ant.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tstamp />
55
<property name="platform" value="macos" />
66
<buildnumber file="${platform}.build.number" />
7-
<property name="version" value="25.4" />
7+
<property name="version" value="25.5" />
88
<property name="kit.dir" value="kits" />
99
<property name="build.log"
1010
value="${kit.dir}/build_${version}.${build.number}.log" />

build/macos.ant.xml-ffe-only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tstamp />
55
<property name="platform" value="macos" />
66
<buildnumber file="${platform}.build.number" />
7-
<property name="version" value="25.4" />
7+
<property name="version" value="25.5" />
88
<property name="kit.dir" value="kits" />
99
<property name="build.log"
1010
value="${kit.dir}/build_${version}.${build.number}.log" />

0 commit comments

Comments
 (0)