Updated installer to support new Linux metamod filename and Mac OS X binaries (bug 5601, r=dvander).

Former-commit-id: 0be36403602c16adaddc84881c9613b3f0f9c1ff
2013-02-13 01:20:11 -06:00 · 2013-02-13 01:20:11 -06:00 · 99411af951
commit 99411af951
parent b318509687
6 changed files with 213 additions and 224 deletions
--- a/installer/installer/AMXInstaller.cfg
+++ b/installer/installer/AMXInstaller.cfg
@ -1,40 +1,40 @@
-$A8
-$B-
-$C+
-$D+
-$E-
-$F-
-$G+
-$H+
-$I+
-$J-
-$K-
-$L+
-$M-
-$N+
-$O+
-$P+
-$Q-
-$R-
-$S-
-$T-
-$U-
-$V+
-$W-
-$X+
-$YD
-$Z1
-GD
-cg
-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-H+
-W+
-M
-$M16384,1048576
-K$00400000
-LE"c:\program files\borland\delphi7\Projects\Bpl"
-LN"c:\program files\borland\delphi7\Projects\Bpl"
-DmadExcept
-w-UNSAFE_TYPE
-w-UNSAFE_CODE
-w-UNSAFE_CAST
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-GD
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\program files (x86)\delphi7se\Projects\Bpl"
+-LN"c:\program files (x86)\delphi7se\Projects\Bpl"
+-DmadExcept
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
--- a/installer/installer/AMXInstaller.dof
+++ b/installer/installer/AMXInstaller.dof
@ -1,139 +1,132 @@
-[FileVersion]
-Version=7.0
-[Compiler]
-A=8
-B=0
-C=1
-D=1
-E=0
-F=0
-G=1
-H=1
-I=1
-J=0
-K=0
-L=1
-M=0
-N=1
-O=1
-P=1
-Q=0
-R=0
-S=0
-T=0
-U=0
-V=1
-W=0
-X=1
-Y=1
-Z=1
-ShowHints=1
-ShowWarnings=1
-UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-NamespacePrefix=
-SymbolDeprecated=1
-SymbolLibrary=1
-SymbolPlatform=1
-UnitLibrary=1
-UnitPlatform=1
-UnitDeprecated=1
-HResultCompat=1
-HidingMember=1
-HiddenVirtual=1
-Garbage=1
-BoundsError=1
-ZeroNilCompat=1
-StringConstTruncated=1
-ForLoopVarVarPar=1
-TypedConstVarPar=1
-AsgToTypedConst=1
-CaseLabelRange=1
-ForVariable=1
-ConstructingAbstract=1
-ComparisonFalse=1
-ComparisonTrue=1
-ComparingSignedUnsigned=1
-CombiningSignedUnsigned=1
-UnsupportedConstruct=1
-FileOpen=1
-FileOpenUnitSrc=1
-BadGlobalSymbol=1
-DuplicateConstructorDestructor=1
-InvalidDirective=1
-PackageNoLink=1
-PackageThreadVar=1
-ImplicitImport=1
-HPPEMITIgnored=1
-NoRetVal=1
-UseBeforeDef=1
-ForLoopVarUndef=1
-UnitNameMismatch=1
-NoCFGFileFound=1
-MessageDirective=1
-ImplicitVariants=1
-UnicodeToLocale=1
-LocaleToUnicode=1
-ImagebaseMultiple=1
-SuspiciousTypecast=1
-PrivatePropAccessor=1
-UnsafeType=0
-UnsafeCode=0
-UnsafeCast=0
-[Linker]
-MapFile=3
-OutputObjs=0
-ConsoleApp=1
-DebugInfo=0
-RemoteSymbols=0
-MinStackSize=16384
-MaxStackSize=1048576
-ImageBase=4194304
-ExeDescription=
-[Directories]
-OutputDir=
-UnitOutputDir=
-PackageDLLOutputDir=
-PackageDCPOutputDir=
-SearchPath=
-Packages=vcl;rtl;vclx;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvBandsD7R;JvBDED7R;JvDBD7R;JvDlgsD7R;JvCmpD7R;JvCryptD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;qrpt;JvGlobusD7R;JvHMID7R;JvInspectorD7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvSystemD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;DelphiX_for7;Indy70;DJcl;tb2k_d7;FlatStyle_D5;scited7;mxFlatPack_D7;mbXPLib
-Conditionals=madExcept
-DebugSourceDirs=
-UsePackages=0
-[Parameters]
-RunParams=-debug
-HostApplication=
-Launcher=
-UseLauncher=0
-DebugCWD=
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1031
-CodePage=1252
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=3
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=vcl;rtl;vclx;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvBandsD7R;JvBDED7R;JvDBD7R;JvDlgsD7R;JvCmpD7R;JvCryptD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;qrpt;JvGlobusD7R;JvHMID7R;JvInspectorD7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvSystemD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;DelphiX_for7;Indy70;DJcl;tb2k_d7;FlatStyle_D5;scited7;mxFlatPack_D7;mbXPLib
+Conditionals=madExcept
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=-debug
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1031
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
--- a/installer/installer/AMXInstaller.exe
+++ b/installer/installer/AMXInstaller.exe
--- a/installer/installer/UnitInstall.pas
+++ b/installer/installer/UnitInstall.pas
@ -6,7 +6,7 @@ uses SysUtils, Classes, Windows, Graphics, Forms, ShellAPI, Controls, Messages,
     TlHelp32, IdFTPCommon, ComCtrls, Dialogs, JclFileUtils;

 type TMod = (modNone, modCS, modDoD, modTFC, modNS, modTS, modESF);
-type TOS = (osWindows, osLinux32{, osLinux64});
+type TOS = (osWindows, osLinux, osMac);

 procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True);
 procedure AddDone(Additional: String = '');
@ -221,25 +221,25 @@ begin
    osWindows: begin
      if ExtractFileExt(eFile) = '.so' then
        Result := True;
+      if ExtractFileExt(eFile) = '.dylib' then
+        Result := True;
    end;
-    osLinux32: begin
+    osLinux: begin
      if ExtractFileExt(eFile) = '.dll' then
        Result := True;
      if ExtractFileExt(eFile) = '.exe' then
        Result := True;
-
-      if Pos('_amd64', ExtractFileName(eFile)) <> 0 then
+      if ExtractFileExt(eFile) = '.dylib' then
        Result := True;
    end;
-    {osLinux64: begin
+    osMac: begin
      if ExtractFileExt(eFile) = '.dll' then
        Result := True;
      if ExtractFileExt(eFile) = '.exe' then
        Result := True;
-
-      if Pos('_i386', ExtractFileName(eFile)) <> 0 then
+      if ExtractFileExt(eFile) = '.so' then
        Result := True;
-    end;}
+    end;
  end;
 end;

@ -380,10 +380,8 @@ begin
          eStr[i] := '//' + eStr[i];
      end;
      eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"');
-      //if OS = osLinux64 then
-      //  eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
-      //else
-      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
+      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.so"');
+      eStr.Add('gamedll_osx "addons/metamod/dlls/metamod.dylib"');
      FileSetAttr(ePath + 'liblist.gam', 0);
      eStr.SaveToFile(ePath + 'liblist.gam');
      FileSetAttr(ePath + 'liblist.gam', faReadOnly); // important for listen servers
@ -516,13 +514,13 @@ begin
  { metamod }
  AddStatus('Copying Metamod...', clBlack);
  FileCopy(ePath + 'addons\amxmodx\dlls\metamod.dll', ePath + '\addons\metamod\dlls\metamod.dll', CopyConfig, False);
-  FileCopy(ePath + '\addons\amxmodx\dlls\metamod_i386.so', ePath + '\addons\metamod\dlls\metamod_i386.so', CopyConfig, False);
-  FileCopy(ePath + '\addons\amxmodx\dlls\metamod_amd64.so', ePath + '\addons\metamod\dlls\metamod_amd64.so', CopyConfig, False);
+  FileCopy(ePath + '\addons\amxmodx\dlls\metamod.so', ePath + '\addons\metamod\dlls\metamod.so', CopyConfig, False);
+  FileCopy(ePath + '\addons\amxmodx\dlls\metamod.dylib', ePath + '\addons\metamod\dlls\metamod.dylib', CopyConfig, False);

  try
    if FileExists(ePath + '\addons\amxmodx\dlls\metamod.dll')      then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dll'));
-    if FileExists(ePath + '\addons\amxmodx\dlls\metamod_amd64.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_amd64.so'));
-    if FileExists(ePath + '\addons\amxmodx\dlls\metamod_i386.so')  then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_i386.so'));
+    if FileExists(ePath + '\addons\amxmodx\dlls\metamod.so')  then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.so'));
+    if FileExists(ePath + '\addons\amxmodx\dlls\metamod.dylib')  then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dylib'));
  finally
    UpdatePluginsIni := True;
    eStr := TStringList.Create;
@ -533,12 +531,12 @@ begin
        if (Pos('addons\amxmodx\dlls\amxmodx_mm.dll', eStr.Text) <> 0) then
          UpdatePluginsIni := False;
      end
-      else if OS = osLinux32 then begin
+      else if OS = osLinux then begin
        if (Pos('addons/amxmodx/dlls/amxmodx_mm_i386.so', eStr.Text) <> 0) then
          UpdatePluginsIni := False;
      end
      else begin
-        if (Pos('addons/amxmodx/dlls/amxmodx_mm_amd64.so', eStr.Text) <> 0) then
+        if (Pos('addons/amxmodx/dlls/amxmodx_mm.dylib', eStr.Text) <> 0) then
          UpdatePluginsIni := False;
      end;
    end
@ -555,7 +553,7 @@ begin
        eStr.Add('; Enable this instead for binary logging');
        eStr.Add('; win32   addons\amxmodx\dlls\amxmodx_bl_mm.dll');
      end
-      else if OS = osLinux32 then begin
+      else if OS = osLinux then begin
        eStr.Add('');
        eStr.Add('linux   addons/amxmodx/dlls/amxmodx_mm_i386.so');
        eStr.Add('; Enable this instead for binary logging');
@ -563,9 +561,9 @@ begin
      end
      else begin
        eStr.Add('');
-        eStr.Add('linux   addons/amxmodx/dlls/amxmodx_mm_amd64.so');
+        eStr.Add('osx   addons/amxmodx/dlls/amxmodx_mm.dylib');
        eStr.Add('; Enable this instead for binary logging');
-        eStr.Add('; linux   addons/amxmodx/dlls/amxmodx_bl_mm_amd64.so');
+        eStr.Add('; osx   addons/amxmodx/dlls/amxmodx_bl_mm.dylib');
      end;
    end;
    eStr.SaveToFile(ePath + 'addons\metamod\plugins.ini');
@ -710,10 +708,10 @@ begin
    end;
    if frmMain.optWindows.Checked then
      eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"')
-    else if frmMain.optLinux32.Checked then
-      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"')
+    else if frmMain.optLinux.Checked then
+      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.so"')
    else
-      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"');
+      eStr.Add('gamedll_osx "addons/metamod/dlls/metamod.dylib"');
    FileSetAttr(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam', 0);
    eStr.SaveToFile(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam');
  end;
--- a/installer/installer/UnitfrmMain.dfm
+++ b/installer/installer/UnitfrmMain.dfm
@ -5733,7 +5733,7 @@ object frmMain: TfrmMain
        BorderColor = clBtnShadow
        Flat = True
        ShowBorder = True
-        Version = '1.26'
+        Version = '1.24'
      end
      object frbAgree: TFlatRadioButton
        Left = 10
@ -6391,21 +6391,20 @@ object frmMain: TfrmMain
          TabOrder = 0
          TabStop = True
        end
-        object optLinux32: TFlatRadioButton
-          Left = 171
+        object optLinux: TFlatRadioButton
+          Left = 187
          Top = 5
-          Width = 84
+          Width = 46
          Height = 14
-          Caption = 'Linux (32-bit)'
+          Caption = 'Linux'
          TabOrder = 1
        end
-        object optLinux64: TFlatRadioButton
-          Left = 353
+        object optMac: TFlatRadioButton
+          Left = 369
          Top = 5
-          Width = 82
+          Width = 64
          Height = 14
-          Caption = 'Linux (64-bit)'
-          Enabled = False
+          Caption = 'Mac OS X'
          TabOrder = 2
        end
      end
@ -6554,7 +6553,7 @@ object frmMain: TfrmMain
        BorderColor = clBtnShadow
        Flat = True
        ShowBorder = True
-        Version = '1.26'
+        Version = '1.24'
      end
    end
  end
@ -6758,7 +6757,6 @@ object frmMain: TfrmMain
  object IdFTP: TIdFTP
    Intercept = IdLogFile
    MaxLineAction = maException
-    ReadTimeout = 0
    RecvBufferSize = 1024
    SendBufferSize = 1024
    OnWork = IdFTPWork
--- a/installer/installer/UnitfrmMain.pas
+++ b/installer/installer/UnitfrmMain.pas
@ -107,10 +107,10 @@ type
    lblStep3: TLabel;
    pnlOS: TPanel;
    optWindows: TFlatRadioButton;
-    optLinux32: TFlatRadioButton;
+    optLinux: TFlatRadioButton;
    lblStep5: TLabel;
    lblFTP: TLabel;
-    optLinux64: TFlatRadioButton;
+    optMac: TFlatRadioButton;
    procedure jvwStepsCancelButtonClick(Sender: TObject);
    procedure cmdCancelClick(Sender: TObject);
    procedure cmdNextClick(Sender: TObject);
@ -149,7 +149,7 @@ var
  frmMain: TfrmMain;
  gMultiAccount: Boolean;

-const VERSION = '1.8.0';
+const VERSION = '1.8.2';

 implementation

@ -249,8 +249,8 @@ begin
    trvDirectories.Enabled := False;
    cmdConnect.Enabled := False;
    optWindows.Enabled := False;
-    optLinux32.Enabled := False;
-    //optLinux64.Enabled := False;
+    optLinux.Enabled := False;
+    optMac.Enabled := False;
    cboGameAddon.Enabled := False;
    // preinstall...
    MakeDir(ExtractFilePath(Application.ExeName) + 'temp');
@ -281,10 +281,10 @@ begin

    if optWindows.Checked then
      eOS := osWindows
-    else //if optLinux32.Checked then
-      eOS := osLinux32;
-    //else
-    //  eOS := osLinux64;
+    else if optLinux.Checked then
+      eOS := osLinux
+    else
+      eOS := osMac;

    jspInstallProgress.Show;
    frmMain.Height := 382;