diff options
Diffstat (limited to 'Installer/FilelistTool.java')
| -rw-r--r-- | Installer/FilelistTool.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Installer/FilelistTool.java b/Installer/FilelistTool.java index c5a0c32..b256702 100644 --- a/Installer/FilelistTool.java +++ b/Installer/FilelistTool.java @@ -7,7 +7,7 @@ public class FilelistTool return null; if(mctrl.isWin32) { - if(mctrl.osArch.indexOf("x86")>=0) + if(mctrl.isOsArchX86) { return new FilelistWin32I386(); } @@ -17,36 +17,36 @@ public class FilelistTool { if(mctrl.unixFlavor==mctrl.unixFlavor_Linux) { - if(mctrl.osArch.indexOf("x86")>=0 || - mctrl.osArch.indexOf("i86")>=0 || - mctrl.osArch.indexOf("i686")>=0 || - mctrl.osArch.indexOf("i586")>=0 || - mctrl.osArch.indexOf("i486")>=0 || - mctrl.osArch.indexOf("i386")>=0 - ) + if(mctrl.isOsArchX86) { return new FilelistLinuxI386GlibcXF86(); - } else if(mctrl.osArch.indexOf("ppc")>=0) + } else if(mctrl.isOsArchPPC) { return new FilelistLinuxPPCGlibcXF86(); } } else if(mctrl.unixFlavor==mctrl.unixFlavor_Solaris) { - if(mctrl.osArch.indexOf("sparc")>=0) + if(mctrl.isOsArchSPARC) return new FilelistSUNSolaris26Sparc(); } else if(mctrl.unixFlavor==mctrl.unixFlavor_Irix) { - if(mctrl.osArch.indexOf("mips")>=0) + if(mctrl.isOsArchMIPS) return new FilelistSGIIrix62Mips(); } else if(mctrl.unixFlavor==mctrl.unixFlavor_HPUX) { - if(mctrl.osArch.indexOf("pa_risc")>=0) + if(mctrl.isOsArchPARISC) return new FilelistHPUXPaRisc(); + } else if(mctrl.unixFlavor==mctrl.unixFlavor_MacOsX) + { + if(mctrl.isOsArchPPC) + { + return new FilelistMacOsXPPC(); + } } } - if(mctrl.isMacOs) + if(mctrl.isMacOs9) { - if(mctrl.osArch.indexOf("powerpc")>=0) + if(mctrl.isOsArchPPC) return new FilelistMacOSPPC(); } return null; |