Skip to content

Commit e3aa16b

Browse files
yuanhoyuanho
committed
modified with no jre/lib/ext for java 21
1 parent 5e36530 commit e3aa16b

File tree

1 file changed

+10
-71
lines changed

1 file changed

+10
-71
lines changed

‎src/ucar/unidata/idv/release/installer/idv.install4j

Lines changed: 10 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<install4j version="8.0.11" transformSequenceNumber="8">
33
<directoryPresets config="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/runIDV" />
4-
<application name="Integrated Data Viewer" applicationId="5178-8833-6241-8128" mediaDir="/share/idv/installers" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}_installer" shrinkRuntime="false" shortName="idv" publisher="Unidata Program Center" publisherWeb="https://www.unidata.ucar.edu/software/idv" version="5.1" macVolumeId="7d14a4bd08cc217e" javaMinVersion="1.8" javaMaxVersion="1.8" allowBetaVM="true">
4+
<application name="Integrated Data Viewer" applicationId="5178-8833-6241-8128" mediaDir="/share/idv/installers" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}_installer" shrinkRuntime="false" shortName="idv" publisher="Unidata Program Center" publisherWeb="https://www.unidata.ucar.edu/software/idv" version="6.3" macVolumeId="7d14a4bd08cc217e" javaMinVersion="21" javaMaxVersion="21" allowBetaVM="true">
55
<variables>
66
<variable name="INSTALLDIR" value="IDV_${compiler:sys.version}" />
77
<variable name="NOJRE" value="nojre" />
88
<variable name="SRCDIR" value="/share/idv" />
99
<variable name="JREDIR" value="/share/idv" />
1010
</variables>
1111
<codeSigning macEnabled="true" macPkcs12File="/share/idv/Certificates/mac.p12" />
12-
<jreBundles jdkProviderId="AdoptOpenJDK" release="openjdk8/jdk8u422-b05" />
12+
<jreBundles jdkProviderId="AdoptOpenJDK" release="openjdk21/jdk-21.0.6+7" />
1313
</application>
1414
<files>
1515
<filesets>
16-
<fileset name="Java 3D" id="695" />
1716
<fileset name="Mac OS-X" id="835" />
1817
</filesets>
1918
<roots>
20-
<root id="696" fileset="695" />
2119
<root id="836" fileset="835" />
2220
</roots>
2321
<mountPoints>
2422
<mountPoint id="175" location="licenses" />
2523
<mountPoint id="1" />
26-
<mountPoint id="697" root="696" />
2724
<mountPoint id="837" root="836" />
2825
</mountPoints>
2926
<entries>
@@ -40,13 +37,16 @@
4037
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/visad.jar" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4138
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/jython.jar" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4239
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/ncIdv.jar" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
40+
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/jogamp-all-2.5.0.jar" />
41+
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/j3dcore.jar" />
42+
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/j3dutils.jar" />
43+
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/lib/vecmath.jar" />
4344
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/licenses/NOTICE" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4445
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/idv.gif" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4546
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/runIDV" overwriteMode="5" fileMode="755" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4647
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/runIDV.bat" overwriteMode="5" fileMode="755" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4748
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/testIDV" overwriteMode="5" fileMode="755" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
4849
<fileEntry mountPoint="1" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/runIDV.ico" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
49-
<fileEntry mountPoint="697" file="${compiler:SRCDIR}/libsrc/j3d.zip" overwriteMode="2" overrideOverwriteMode="true" />
5050
<dirEntry mountPoint="837" file="${compiler:SRCDIR}/src/ucar/unidata/idv/release/installer/mac" overwriteMode="2" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" overrideDirMode="true" />
5151
<fileEntry mountPoint="837" file="${compiler:SRCDIR}/libsrc/sunjce_provider.jar" overwriteMode="2" overrideOverwriteMode="true" />
5252
</entries>
@@ -62,6 +62,10 @@
6262
<entry location="jython.jar" />
6363
<entry location="ncIdv.jar" />
6464
<entry location="simpleidv.jar" />
65+
<entry location="jogamp-all-2.5.0.jar" />
66+
<entry location="j3dcore.jar" />
67+
<entry location="j3dutils.jar" />
68+
<entry location="vecmath.jar" />
6569
<entry location="NOTICE" />
6670
<entry location="idv.gif" />
6771
</include>
@@ -78,11 +82,6 @@
7882
<component id="67" />
7983
</dependencies>
8084
</component>
81-
<component name="Java 3D" id="770">
82-
<include>
83-
<entry filesetId="695" />
84-
</include>
85-
</component>
8685
<component name="Mac OS X" id="909">
8786
<include>
8887
<entry filesetId="835" />
@@ -457,66 +456,6 @@ if (!context.isUpdateInstallation()) {
457456
<property name="mode" type="string">777</property>
458457
</serializedBean>
459458
</action>
460-
<action name="Windows Java 3D" id="704" beanClass="com.install4j.runtime.beans.actions.files.InstallExternalZipFileAction" actionElevationType="elevated">
461-
<serializedBean>
462-
<property name="destinationDirectory">
463-
<object class="java.io.File">
464-
<string>./jre/lib/ext</string>
465-
</object>
466-
</property>
467-
<property name="overwriteMode" type="enum" class="com.install4j.api.context.OverwriteMode" value="ALWAYS" />
468-
<property name="zipFile">
469-
<object class="java.io.File">
470-
<string>j3d.zip</string>
471-
</object>
472-
</property>
473-
</serializedBean>
474-
</action>
475-
<action name="Linux Java 3D" id="706" beanClass="com.install4j.runtime.beans.actions.files.InstallExternalZipFileAction" actionElevationType="elevated">
476-
<serializedBean>
477-
<property name="destinationDirectory">
478-
<object class="java.io.File">
479-
<string>./jre/lib/ext</string>
480-
</object>
481-
</property>
482-
<property name="overwriteMode" type="enum" class="com.install4j.api.context.OverwriteMode" value="ALWAYS" />
483-
<property name="zipFile">
484-
<object class="java.io.File">
485-
<string>j3d.zip</string>
486-
</object>
487-
</property>
488-
</serializedBean>
489-
</action>
490-
<action name="Mac OS X Java 3D" id="707" beanClass="com.install4j.runtime.beans.actions.files.InstallExternalZipFileAction" actionElevationType="elevated">
491-
<serializedBean>
492-
<property name="destinationDirectory">
493-
<object class="java.io.File">
494-
<string>jre.bundle/Contents/Home/lib/ext</string>
495-
</object>
496-
</property>
497-
<property name="overwriteMode" type="enum" class="com.install4j.api.context.OverwriteMode" value="ALWAYS" />
498-
<property name="zipFile">
499-
<object class="java.io.File">
500-
<string>j3d.zip</string>
501-
</object>
502-
</property>
503-
</serializedBean>
504-
</action>
505-
<action name="Sun Java 3D" id="709" beanClass="com.install4j.runtime.beans.actions.files.InstallExternalZipFileAction" actionElevationType="elevated">
506-
<serializedBean>
507-
<property name="destinationDirectory">
508-
<object class="java.io.File">
509-
<string>./jre/lib/ext</string>
510-
</object>
511-
</property>
512-
<property name="overwriteMode" type="enum" class="com.install4j.api.context.OverwriteMode" value="ALWAYS" />
513-
<property name="zipFile">
514-
<object class="java.io.File">
515-
<string>j3d.zip</string>
516-
</object>
517-
</property>
518-
</serializedBean>
519-
</action>
520459
<action name="Configure runIDV with OS X JRE" id="1019" beanClass="com.install4j.runtime.beans.actions.text.ModifyTextFileAction" actionElevationType="elevated">
521460
<serializedBean>
522461
<property name="files" type="array" class="java.io.File" length="1">

0 commit comments

Comments
 (0)