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 aaddba15 authored by Norbraten, Terry's avatar Norbraten, Terry

somehow commit f571d24b did not rewrite the origin/master history. Make

it so
parent 6d8b8d87
......@@ -45,8 +45,8 @@
<property name="runarg7" value="${runarg5}"/>
<!-- For Mac -->
<property name="runarg8" value="-Dsun.java2d.opengl=true"/>
<property name="runarg9" value=" -Dsun.java2d.opengl.fbobject=true"/>
<property name="runarg9" value="-Dsun.java2d.opengl.fbobject=true"/>
<property name="runarg10" value="-Dapple.awt.graphics.UseQuartz=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"/>
......
......@@ -93,10 +93,10 @@ POSSIBILITY OF SUCH DAMAGE.
https://izpack.atlassian.net/browse/IZPACK-953
-->
<echo message="Running IzPack to build the installers..."/>
<echo message="Prerequisite: apply .jar fix in installers/util/izpack-lang-fix in local $IZPACK_DIST .jar at"/>
<!--echo message="Prerequisite: apply .jar fix in installers/util/izpack-lang-fix in local $IZPACK_DIST .jar at"/>
<echo message=" ${IZPACK_DIST}/lib/izpack-core-5.1.3.jar"/>
<copy file="installers/util/izpack-core-5.1.3.jar" todir="${IZPACK_DIST}/lib/" verbose="true" force="true"/>
<echo message="Windows Linux installer file: ${win.linux.32.64.installer.file}"/>
<echo message="Windows Linux installer file: ${win.linux.32.64.installer.file}"/-->
<izpack input= "${win.linux.32.64.installer.file}"
output="${installers.dir}/${win.linux.32.64.installer.jar}"
installerType="standard"
......@@ -128,7 +128,7 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="clean.installers"
description="Clean up all executables generated by producing the installers">
<delete>
<delete verbose="true">
<fileset dir="installers">
<include name="*.jar"/>
</fileset>
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>NPS MOVES Software License</title>
<meta name="description" content="NPS MOVES Software License" ></meta>
<meta name="author" content="Donald P. Brutzman" ></meta>
<meta name="created" content="4 March 2005" ></meta>
<meta name="revised" content="24 January 2009" ></meta>
<meta name="reference" content="http://www.oreilly.com/catalog/osfreesoft" ></meta>
<meta name="reference" content="http://opensource.org/licenses/bsd-license.php" ></meta>
<meta name="reference" content="http://xchat.movesinstitute.org/bugzilla/show_bug.cgi?id=32" ></meta>
<link rel="icon" href="http://www.web3D.org/x3d/content/examples/images/X3DtextIcon16.png" title="X3D" type="image/png"></link>
</head>
<body>
<p>Copyright (c) 1995-2015 held by the author(s). All rights reserved.</p>
<p>Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:</p>
<ul>
<li>
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
</li>
<li>
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
</li>
<li>
Neither the names of the
<a href="http://www.nps.edu">Naval Postgraduate School (NPS)</a>
<a href="http://www.movesinstitute.org">Modeling Virtual Environments and Simulation (MOVES) Institute</a>
nor the names of its contributors may be used to endorse or
promote products derived from this software without specific
prior written permission.
</li>
</ul>
<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.</p>
</body>
</html>
Copyright (c) 1995-2015 held by the author(s). All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the names of the Naval Postgraduate School (NPS)
Modeling Virtual Environments and Simulation (MOVES) Institute
(http://www.nps.edu and http://www.movesinstitute.org)
nor the names of its contributors may be used to endorse or
promote products derived from this software without specific
prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
2014 MAY 19
2020 APR 09
The standalone-compiler was modified to include a usa.xml file and usa.gif in
the bin.langpacks.installer and bin.langpacks.flags directories respectively.
The legacy standalone-compiler was missing a usa.xml file and usa.gif in
the bin.langpacks.installer and bin.langpacks.flags directories respectively. The
standalone-compiler is no longer supported/produced in izpack v5+. The jar update
to include the USA langpack is now performed in the izpack-core-@{version}.jar.
See update.sh for details
See update.sh or update.bat for details
nbjdk.active=JDK_11
nbjdk.active=JDK_14
License
-------
This source is licensed under the GNU LGPL v2.1
Please read http://www.gnu.org/copyleft/lesser.html for more information
This software comes with the standard NO WARRANTY disclaimer for any
purpose. Use it at your own risk. If there's a problem you get to fix it.
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSArchitecturePriority</key>
<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.1</string>
<key>CFBundleGetInfoString</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<string>2.2</string>
<key>CFBundleGetInfoString</key>
<string>Copyright © 1995-2020. All rights reserved.</string>
<key>CFBundleShortVersionString</key>
<string>Developed at the Naval Postgraduate School, Monterey, CA</string>
<string>Developed at the MOVES Institute of the Naval Postgraduate School, Monterey, CA</string>
<key>CFBundleIdentifier</key>
<string>org.xj3d</string>
<key>CFBundleAllowMixedLocalizations</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,34 +45,19 @@
<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 -->
<!--key>ClassPath</key>
<array>
<string>$JAVAROOT/jhall.jar</string>
<string>$JAVAROOT/joal.jar</string>
<string>$JAVAROOT/joal-natives-macosx-universal.jar</string>
<string>$JAVAROOT/gluegen-rt.jar</string>
<string>$JAVAROOT/gluegen-rt-natives-macosx-universal.jar</string>
<string>$JAVAROOT/jogl-all-natives-macosx-universal.jar</string>
<string>$JAVAROOT/jogl-all.jar</string>
<string>$JAVAROOT/xj3d-2.1-3rdparty-nps.jar</string>
<string>$JAVAROOT/xj3d-2.1-nps.jar</string>
<string>$JAVAROOT/xj3d.browser_2.1.0-nps.jar</string>
<string>$JAVAROOT/xj3d.cadfilter_2.1.0-nps.jar</string>
<string>$JAVAROOT/jhall.jar</string>
</array-->
</dict>
</dict>
</plist>
......@@ -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
......
NOTE: This file can be found in the doc directory of your installation path for
later reference.
IMPORTANT!
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
modifying your installed JDK/JRE info.plist from the following link.
https://stackoverflow.com/questions/26847411/to-open-eclipse-you-need-to-install-the-legacy-java-se-6-runtime
STEPS
1) Edit the info.plist for the JDK after installing:
$ sudo nano `/usr/libexec/java_home -V`/../info.plist
2) Update the following section from:
<key>JVMCapabilities</key>
<array>
<string>CommandLine</string>
</array>
to
<key>JVMCapabilities</key>
<array>
<string>JNI</string>
<string>BundledApp</string>
<string>WebStart</string>
<string>Applets</string>
<string>CommandLine</string>
</array>
3) Be sure to reboot your system when completed.
......@@ -26,7 +26,7 @@
<!-- the application official website url -->
<uninstaller write="yes" name="Xj3Duninstaller.jar"/>
<!-- specifies whether to create an uninstaller after installation, and which name to use for it. This tag has the write attribute, with default value `` yes``. If this tag is not specified, the uninstaller will still be written. The name attribute can be used to change the default name of the generated uninstaller, i.e. `` uninstaller.jar``. -->
<javaversion>14</javaversion>
<javaversion>11</javaversion>
<!-- specifies the minimum version of Java required to install your program. Values can be 1.2, 1.2.2, 1.4, etc. The test is a lexical comparison against the java.version System property on the install machine. -->
<requiresjdk>no</requiresjdk>
<!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. -->
......@@ -49,9 +49,9 @@
The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-->
<resources>
<res id="LicencePanel.licence" src="src/install/izpack/license.txt"/>
<res id="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<!-- TODO look at Win-Linux settings -->
<res id="LicencePanel.licence" src="docs/BSD.txt"/>
<res id="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<res id="InfoPanel.info" src="src/install/izpack/macosx/installerInfo"/>
</resources>
<!--
......@@ -59,15 +59,15 @@
We indicate here which panels we want to use. The order will be respected.
-->
<panels>
<panel classname="HelloPanel" id="HelloPanel"/>
<!--panel classname="InfoPanel" id="InfoPanel"/-->
<panel classname="LicencePanel" id="LicencePanel"/>
<panel classname="TargetPanel" id="TargetPanel"/>
<panel classname="PacksPanel" id="PacksPanel"/>
<panel classname="ShortcutPanel" id="ShortcutPane"/>
<panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="InstallPanel" id="SummaryPanel"/>
<panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/>
<panel classname="HelloPanel"/>
<panel classname="InfoPanel" id="panel.info"/>
<panel classname="LicencePanel"/>
<panel classname="TargetPanel"/>
<panel classname="PacksPanel"/>
<panel classname="ShortcutPanel"/>
<panel classname="SummaryPanel"/>
<panel classname="InstallPanel"/>
<panel classname="SimpleFinishPanel"/>
</panels>
<listeners>
......@@ -94,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 -->
......@@ -112,9 +112,10 @@
<!-- Apple specific files -->
<file src="src/install/izpack/macosx/Info.plist" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents"/>
<file src="src/install/izpack/macosx/JavaApplicationStub" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents/MacOS"/>
<file src="src/install/izpack/macosx/PkgInfo" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents"/>
<file src="src/install/izpack/macosx/installerInfo" targetdir="$INSTALL_PATH/doc"/>
<file src="src/install/izpack/macosx/xj3dIcons.icns" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents/Resources"/>
<file src="src/install/izpack/macosx/JavaApplicationStub" targetdir="$INSTALL_PATH/Xj3DBrowser.app/Contents/MacOS"/>
<executable targetfile="$INSTALL_PATH/Xj3DBrowser.app/Contents/MacOS/JavaApplicationStub" stage="never" />
<executable targetfile="$INSTALL_PATH/browser.sh.command" stage="never"/>
......@@ -128,12 +129,11 @@
<fileset dir="docs" targetdir="$INSTALL_PATH/doc">
<exclude name="javadoc/**"/>
<exclude name="setup/**"/>
<exclude name="NPS-build-procedures-for-Xj3D.txt"/>
<exclude name="InstallerInfo"/>
<exclude name="NPS-SVN-MergeProcedures.txt"/>
<exclude name="Xj3D-Codebase-ChangeLog-NPS.txt"/>
<exclude name="NetBeans-SVN-Merge.png"/>
<exclude name="known-compile-warnings"/>
<exclude name="TODO"/>
<exclude name="Xj3D-Codebase-ChangeLog-NPS.txt"/>
<include name="**"/>
</fileset>
</pack>
......
......@@ -30,7 +30,7 @@
<!-- the application official website url -->
<uninstaller write="yes" name="Xj3Duninstaller.jar"/>
<!-- specifies whether to create an uninstaller after installation, and which name to use for it. This tag has the write attribute, with default value `` yes``. If this tag is not specified, the uninstaller will still be written. The name attribute can be used to change the default name of the generated uninstaller, i.e. `` uninstaller.jar``. -->
<javaversion>14</javaversion>
<javaversion>11</javaversion>
<!-- specifies the minimum version of Java required to install your program. Values can be 1.2, 1.2.2, 1.4, etc. The test is a lexical comparison against the java.version System property on the install machine. -->
<requiresjdk>no</requiresjdk>
<!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. -->
......@@ -41,32 +41,13 @@
<guiprefs height="300" width="400" resizable="yes">
<!-- <splash>images/peas_load.gif</splash> -->
<laf name="substance">
<laf name="looks">
<os family="windows"/>
<os family="unix" />
<param name="variant" value="mist-silver" />
</laf>
<laf name="substance">
<os family="mac" />
<param name="variant" value="mist-aqua" />
<param name="variant" value="plastic3D"/>
</laf>
<modifier key="useHeadingPanel" value="yes" />
</guiprefs>
<!--
<guiprefs width="800" height="600" resizable="no">
<splash>images/peas_load.gif</splash>
<laf name="substance">
<os family="windows" />
<os family="unix" />
<param name="variant" value="mist-silver" />
</laf>
<laf name="substance">
<os family="mac" />
<param name="variant" value="mist-aqua" />
</laf>
<modifier key="useHeadingPanel" value="yes" />
</guiprefs>
-->
<locale>
<langpack iso3="usa"/>
......@@ -96,7 +77,7 @@
The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-->
<resources>
<res id="LicencePanel.licence" src="src/install/izpack/license.txt"/>
<res id="LicencePanel.licence" src="docs/BSD.txt"/>
<res id="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<res id="InfoPanel.info" src="docs/InstallerInfo"/>
<res id="shortcutSpec.xml" src="src/install/izpack/shortcutSpec.xml" />
......@@ -115,7 +96,7 @@
<panel classname="PacksPanel" id="PacksPanel"/>
<panel classname="ShortcutPanel" id="ShortcutPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="InstallPanel" id="panel.install"/>
<panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/>
</panels>
......@@ -144,8 +125,8 @@
<include name="**/*.so"/>
</fileset>
<fileset dir="@{browser.dir}/doc/javaHelp" targetdir="$INSTALL_PATH/doc/javaHelp"/>
<fileset dir="@{browser.dir}/images" targetdir="$INSTALL_PATH/images"/>
<fileset dir="@{browser.dir}/doc/javaHelp" targetdir="$INSTALL_PATH/doc/javaHelp"/>
<fileset dir="@{browser.dir}/images" targetdir="$INSTALL_PATH/images"/>
<!-- FILES -->
<file src="src/install/izpack/Xj3D-Convert.ico" targetdir="$INSTALL_PATH"/>
......@@ -177,11 +158,9 @@
<fileset dir="docs" targetdir="$INSTALL_PATH/doc">
<exclude name="javadoc/**"/>
<exclude name="setup/**"/>
<exclude name="NPS-build-procedures-for-Xj3D.txt"/>
<exclude name="NPS-SVN-MergeProcedures.txt"/>
<exclude name="Xj3D-Codebase-ChangeLog-NPS.txt"/>
<exclude name="NetBeans-SVN-Merge.png"/>
<exclude name="known-compile-warnings"/>
<exclude name="TODO"/>
<include name="**"/>
</fileset>
......
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