Skip to content
Snippets Groups Projects
Commit f571d24b authored by Terry D. Norbraten's avatar Terry D. Norbraten
Browse files

modify laf element to get win-linux installer to build, remove dup.

SummaryPanel
parent 19e38a6c
No related branches found
No related tags found
No related merge requests found
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
...@@ -58,21 +58,6 @@ ...@@ -58,21 +58,6 @@
<!-- The moving_box.x3dv arg is taken care of internally in the JavaApplicationStub --> <!-- The moving_box.x3dv arg is taken care of internally in the JavaApplicationStub -->
<string>-anisotropicDegree 2 -enableOriginManager -numLoaderThreads 4 -newt</string> <string>-anisotropicDegree 2 -enableOriginManager -numLoaderThreads 4 -newt</string>
<!-- The JavaApplicationStub takes care of the ClassPath internally --> <!-- 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>
</dict> </dict>
</plist> </plist>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- the application official website url --> <!-- the application official website url -->
<uninstaller write="yes" name="Xj3Duninstaller.jar"/> <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``. --> <!-- 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. --> <!-- 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> <requiresjdk>no</requiresjdk>
<!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. --> <!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. -->
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel. The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
--> -->
<resources> <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="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<!-- TODO look at Win-Linux settings --> <!-- TODO look at Win-Linux settings -->
</resources> </resources>
...@@ -59,15 +59,14 @@ ...@@ -59,15 +59,14 @@
We indicate here which panels we want to use. The order will be respected. We indicate here which panels we want to use. The order will be respected.
--> -->
<panels> <panels>
<panel classname="HelloPanel" id="HelloPanel"/> <panel classname="HelloPanel"/>
<!--panel classname="InfoPanel" id="InfoPanel"/--> <panel classname="LicencePanel"/>
<panel classname="LicencePanel" id="LicencePanel"/> <panel classname="TargetPanel"/>
<panel classname="TargetPanel" id="TargetPanel"/> <panel classname="PacksPanel"/>
<panel classname="PacksPanel" id="PacksPanel"/> <panel classname="ShortcutPanel"/>
<panel classname="ShortcutPanel" id="ShortcutPane"/> <panel classname="SummaryPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/> <panel classname="InstallPanel"/>
<panel classname="InstallPanel" id="SummaryPanel"/> <panel classname="SimpleFinishPanel"/>
<panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/>
</panels> </panels>
<listeners> <listeners>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- the application official website url --> <!-- the application official website url -->
<uninstaller write="yes" name="Xj3Duninstaller.jar"/> <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``. --> <!-- 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. --> <!-- 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> <requiresjdk>no</requiresjdk>
<!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. --> <!-- specifies the path for the logfile of the SummaryLoggerInstallerListener. -->
...@@ -41,32 +41,13 @@ ...@@ -41,32 +41,13 @@
<guiprefs height="300" width="400" resizable="yes"> <guiprefs height="300" width="400" resizable="yes">
<!-- <splash>images/peas_load.gif</splash> --> <!-- <splash>images/peas_load.gif</splash> -->
<laf name="substance"> <laf name="looks">
<os family="windows"/> <os family="windows"/>
<os family="unix" /> <os family="unix" />
<param name="variant" value="mist-silver" /> <param name="variant" value="plastic3D"/>
</laf>
<laf name="substance">
<os family="mac" />
<param name="variant" value="mist-aqua" />
</laf> </laf>
<modifier key="useHeadingPanel" value="yes" /> <modifier key="useHeadingPanel" value="yes" />
</guiprefs> </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> <locale>
<langpack iso3="usa"/> <langpack iso3="usa"/>
...@@ -96,7 +77,7 @@ ...@@ -96,7 +77,7 @@
The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel. The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
--> -->
<resources> <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="Installer.image" src="src/install/izpack/Xj3DlogoWhite32.jpg"/>
<res id="InfoPanel.info" src="docs/InstallerInfo"/> <res id="InfoPanel.info" src="docs/InstallerInfo"/>
<res id="shortcutSpec.xml" src="src/install/izpack/shortcutSpec.xml" /> <res id="shortcutSpec.xml" src="src/install/izpack/shortcutSpec.xml" />
...@@ -115,7 +96,6 @@ ...@@ -115,7 +96,6 @@
<panel classname="PacksPanel" id="PacksPanel"/> <panel classname="PacksPanel" id="PacksPanel"/>
<panel classname="ShortcutPanel" id="ShortcutPanel"/> <panel classname="ShortcutPanel" id="ShortcutPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/> <panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="SummaryPanel" id="SummaryPanel"/>
<panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/> <panel classname="SimpleFinishPanel" id="SimpleFinishPanel"/>
</panels> </panels>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment