diff --git a/src/install/izpack/license.txt b/src/install/izpack/license.txt deleted file mode 100644 index 01f1316d0a50b36b18f60615d3c94608a4486e2d..0000000000000000000000000000000000000000 --- a/src/install/izpack/license.txt +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/src/install/izpack/macosx/Info.plist b/src/install/izpack/macosx/Info.plist index 7d913aac80dd56b97bb9a3b07e82dde6d76a9d2d..509aacca8dc5cf306051e664d1471143d81aacfa 100644 --- a/src/install/izpack/macosx/Info.plist +++ b/src/install/izpack/macosx/Info.plist @@ -58,21 +58,6 @@ <!-- 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> diff --git a/src/install/izpack/xj3d-mac-install.xml b/src/install/izpack/xj3d-mac-install.xml index dec862587282c49663d91d725429e8fdb8a15325..9283948795b4933265341eb01a9a7f593f49ef0f 100644 --- a/src/install/izpack/xj3d-mac-install.xml +++ b/src/install/izpack/xj3d-mac-install.xml @@ -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,7 +49,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"/> <!-- TODO look at Win-Linux settings --> </resources> @@ -59,15 +59,14 @@ 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="LicencePanel"/> + <panel classname="TargetPanel"/> + <panel classname="PacksPanel"/> + <panel classname="ShortcutPanel"/> + <panel classname="SummaryPanel"/> + <panel classname="InstallPanel"/> + <panel classname="SimpleFinishPanel"/> </panels> <listeners> diff --git a/src/install/izpack/xj3d-win-linux-32-64-install.xml b/src/install/izpack/xj3d-win-linux-32-64-install.xml index 393e26025a38812f3847472883f097007989ffe4..0523fe4102023f29d7ef460a2618c077ff2ee128 100644 --- a/src/install/izpack/xj3d-win-linux-32-64-install.xml +++ b/src/install/izpack/xj3d-win-linux-32-64-install.xml @@ -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,6 @@ <panel classname="PacksPanel" id="PacksPanel"/> <panel classname="ShortcutPanel" id="ShortcutPanel"/> <panel classname="SummaryPanel" id="SummaryPanel"/> - <panel classname="SummaryPanel" id="SummaryPanel"/> <panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/> </panels>