Changeset 30fc954 for installer


Ignore:
Timestamp:
Jul 10, 2018 12:19:29 PM (23 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
02669fa
Parents:
307a68aa
Message:

Installer: Fix Windows 10 64-bit install for IzPack? 4/5 (ticket #1864)
Add more IzPack? 5 build targets

Location:
installer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installer/install.xml

    r307a68aa r30fc954  
    103103    </resources>
    104104
     105    <dynamicvariables>
     106        <variable name="datamodel" value="${SYSTEM_sun_arch_data_model}"/>
     107    </dynamicvariables>
     108
     109    <conditions>
     110        <condition type="variable" id="is64bit">
     111            <name>datamodel</name>
     112            <value>64</value>
     113        </condition>
     114    </conditions>
     115
    105116    <panels>
    106117        <panel classname="HelloPanel"/>
     
    116127         Using the condition this way, the panel is shown on everything *but* Windows.
    117128         -->
    118     <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
    119     <panel classname="SimpleFinishPanel"/>
    120 </panels>
     129        <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
     130        <panel classname="SimpleFinishPanel"/>
     131    </panels>
    121132
    122133    <packs>
     
    136147            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell"> <os family="unix" /> </parsable>
    137148            <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
    138 
    139             <conditions>
    140                 <condition type="variable" id="is64bit">
    141                     <name>SYSTEM_sun_arch_data_model</name>
    142                     <value>64</value>
    143                 </condition>
    144             </conditions>
    145149
    146150            <!-- postinstall stuff for windows -->
  • installer/install5.xml

    r307a68aa r30fc954  
    126126    </variables>
    127127
     128    <dynamicvariables>
     129        <variable name="datamodel" value="${SYSTEM[sun.arch.data.model]}"/>
     130    </dynamicvariables>
     131
    128132    <conditions>
    129133        <condition type="variable" id="is64bit">
    130             <name>SYSTEM[sun.arch.data.model]</name>
     134            <name>datamodel</name>
    131135            <value>64</value>
    132136        </condition>
Note: See TracChangeset for help on using the changeset viewer.