Please review any and all PUBLIC repositories, groups and associate files. These allow anyone on the Internet to access without authentication. Repository and group owners are responsible for their content and permission settings. Go to your project(s), click on Settings > General and expand the "Visibility, project features, permissions" to change this setting.

Commit 414f1a10 authored by Norbraten, Terry's avatar Norbraten, Terry

add missing installer panel to win/linux install files. build with

openjdk 14. modify mac install to redirect javahelp
parent ad6ad341
......@@ -46,8 +46,8 @@
<!-- For Mac -->
<property name="runarg8" value="-Dsun.java2d.opengl=true"/>
<property name="runarg9" value=" -Dsun.java2d.opengl.fbobject=true"/>
<property name="runarg10" value="-Dapple.awt.graphics.UseQuartz=true"/>
<property name="runarg9" value="-Dsun.java2d.opengl.fbobject=true"/>
<property name="runarg10" value="-Dapple.awt.graphics.UseQuartz=true"/>
<property name="runarg11" value="-Dapple.laf.useScreenMenuBar=true"/>
<property name="runarg12" value="-Djava.library.path=./Xj3DBrowser.app/Contents/Resources/bin"/>
......
nbjdk.active=JDK_11
nbjdk.active=JDK_14
......@@ -6,18 +6,18 @@
<array>
<string>x86_64</string>
</array>
<key>LSApplicationCategoryType</key>
<string>public.app-category.graphics-design</string>
<key>LSHasLocalizedDisplayName</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.graphics-design</string>
<key>LSHasLocalizedDisplayName</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<key>CFBundleName</key>
<string>Xj3DBrowser</string>
<key>CFBundleVersion</key>
<string>2.2</string>
<key>CFBundleGetInfoString</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<key>CFBundleGetInfoString</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<key>CFBundleShortVersionString</key>
<string>Developed at the MOVES Institute of the Naval Postgraduate School, Monterey, CA</string>
<key>CFBundleIdentifier</key>
......@@ -34,8 +34,8 @@
<string>????</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<key>CFBundleIconFile</key>
<string>xj3dIcons.icns</string>
<key>Java</key>
......@@ -45,18 +45,18 @@
<key>MainClass</key>
<string>xj3d.browser.Xj3DBrowser</string>
<key>Properties</key>
<dict>
<key>apple.laf.useScreenMenuBar</key>
<string>true</string>
<key>apple.awt.graphics.UseQuartz</key>
<string>true</string>
</dict>
<key>VMOptions</key>
<!-- The JavaApplicationStub takes care of the JVM arg -Djava.library.path=./Xj3DBrowser.app/Contents/Resources/bin internally -->
<string>-Dsun.java2d.opengl=true -Dorg.web3d.vrml.renderer.common.nodes.shape.useTextureCache=true -Dswing.aatext=true -Dawt.useSystemAAFontSettings=gasp -Djava.ext.dirs= -Xmx1g -XX:-UseConcMarkSweepGC -XX:-UseParallelGC -Djava.net.preferIPv4Stack=true</string>
<key>Arguments</key>
<!-- The moving_box.x3dv arg is taken care of internally in the JavaApplicationStub -->
<string>-anisotropicDegree 2 -enableOriginManager -numLoaderThreads 4 -newt</string>
<dict>
<key>apple.laf.useScreenMenuBar</key>
<string>true</string>
<key>apple.awt.graphics.UseQuartz</key>
<string>true</string>
</dict>
<key>VMOptions</key>
<!-- The JavaApplicationStub takes care of the JVM arg -Djava.library.path=./Xj3DBrowser.app/Contents/Resources/bin internally -->
<string>-Dsun.java2d.opengl=true -Dsun.java2d.opengl.fbobject=true -Dorg.web3d.vrml.renderer.common.nodes.shape.useTextureCache=true -Dswing.aatext=true -Dawt.useSystemAAFontSettings=gasp -Xmx1g -XX:-UseParallelGC -Djava.net.preferIPv4Stack=true</string>
<key>Arguments</key>
<!-- The moving_box.x3dv arg is taken care of internally in the JavaApplicationStub -->
<string>-anisotropicDegree 2 -enableOriginManager -numLoaderThreads 4 -newt</string>
<!-- The JavaApplicationStub takes care of the ClassPath internally -->
</dict>
</dict>
......
......@@ -169,15 +169,13 @@ if [ -x "$JAVACMD" ]; then
# - main class
# - JVM arguments
exec "$JAVACMD" \
-cp "${JVMClasspath}" \
-Xdock:icon="$PROGDIR/../Resources/${CFBundleIconFile}" \
-Xdock:name="${CFBundleName}" \
$JVMOptions \
-Djava.library.path="$PROGDIR/../Resources/bin" \
$JVMDefaultOptions \
$JVMMainClass \
$JVMArguments \
$PROGDIR/../../../moving_box.x3dv
-cp "${JVMClasspath}" \
-Xdock:icon="$PROGDIR/../Resources/${CFBundleIconFile}" \
-Xdock:name="${CFBundleName}" \
$JVMOptions -Djava.library.path="$PROGDIR/../Resources/bin" \
$JVMDefaultOptions \
$JVMMainClass \
$JVMArguments $PROGDIR/../../../moving_box.x3dv
else
......
If you encounter a popup that says, "To open "Xj3DBrowser" you need to install
the legacy Java SE 6 runtime", click "OK" to close, then follow the advice for
modify the JDK info.plist from the following link.
https://stackoverflow.com/questions/26847411/to-open-eclipse-you-need-to-install-the-legacy-java-se-6-runtime
Be sure to reboot your system when completed.
......@@ -50,7 +50,8 @@
-->
<resources>
<res id="LicencePanel.licence" src="docs/BSD.txt"/>
<res id="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<res id="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<res id="InfoPanel.info" src="src/install/izpack/macosx/installerInfo"/>
</resources>
<!--
......@@ -59,6 +60,7 @@
-->
<panels>
<panel classname="HelloPanel"/>
<panel classname="InfoPanel" id="panel.info"/>
<panel classname="LicencePanel"/>
<panel classname="TargetPanel"/>
<panel classname="PacksPanel"/>
......@@ -92,7 +94,7 @@
<include name="*.jnilib"/>
</fileset>
<fileset dir="@{browser.dir}/doc/javaHelp" targetdir="$INSTALL_PATH/doc/javaHelp"/>
<fileset dir="@{browser.dir}/doc/javaHelp" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents/MacOS/doc/javaHelp"/>
<fileset dir="@{browser.dir}/images" targetdir="$INSTALL_PATH/images"/>
<!-- FILES -->
......
......@@ -96,6 +96,7 @@
<panel classname="PacksPanel" id="PacksPanel"/>
<panel classname="ShortcutPanel" id="ShortcutPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="InstallPanel" id="panel.install"/>
<panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/>
</panels>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment