Changeset 9 for trunk/Forms


Ignore:
Timestamp:
Feb 12, 2011, 12:33:04 PM (13 years ago)
Author:
chronos
Message:
  • Fixed: Instance compilation on Linux.
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        44Source
        55Instance
         6FreePascalManager

  • trunk/Forms/UInstanceOptions.lfm

    r6 r9  
    3737    Height = 14
    3838    Top = 72
    39     Width = 67
     39    Width = 76
    4040    Caption = 'IDE selection:'
    4141    ParentColor = False
    … …  
    4545    Height = 14
    4646    Top = 40
    47     Width = 69
     47    Width = 77
    4848    Caption = 'FPC selection:'
    4949    ParentColor = False
    … …  
    6161    Height = 14
    6262    Top = 8
    63     Width = 32
     63    Width = 37
    6464    Caption = 'Name:'
    6565    ParentColor = False

  • trunk/Forms/UInstanceOptions.pas

    r7 r9  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, HTTPSend, USource, UInstance,
     9  ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, USource, UInstance,
    1010  USourceSelection;
    1111

  • trunk/Forms/UMainForm.lfm

    r8 r9  
    3535      item
    3636        Caption = 'Compiled'
     37        Width = 95
    3738      end>
    3839    OwnerData = True
    … …  
    4950    Height = 14
    5051    Top = 8
    51     Width = 94
     52    Width = 108
    5253    Caption = 'Installed instances:'
    5354    ParentColor = False

  • trunk/Forms/UMainForm.pas

    r7 r9  
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    99  StdCtrls, ActnList, Menus, ExtCtrls, Contnrs, USource, UInstance,
    10   UInstanceOptions, DOM, XMLWrite, XMLRead, HTTPSend, UMainOptions,
    11   USourceSelection;
     10  UInstanceOptions, DOM, XMLWrite, XMLRead, UMainOptions,
     11  USourceSelection, HTTPSend;
    1212
    1313const
    … …  
    8181    Sources: TSourceList;
    8282    function GetBinUtilsDir: string;
     83    function GetCompilerPath: string;
    8384    function GetBaseDir: string;
     85    procedure InstallDependencies;
    8486  end;
    8587
    … …  
    254256    AStart.Enabled := False;
    255257    ARemove.Enabled := False;
     258    AUpdate.Enabled := False;
    256259  end;
    257260end;
    … …  
    492495function TMainForm.GetBinUtilsDir: string;
    493496begin
     497  {$IFDEF Windows}
    494498  Result := GetBaseDir + DirectorySeparator +
    495499    BinUtilsDir + DirectorySeparator + Platform;
     500  {$ENDIF}
     501  {$IFDEF Linux}
     502  Result := '/usr/bin';
     503  {$ENDIF}
     504end;
     505
     506function TMainForm.GetCompilerPath: string;
     507begin
     508  {$IFDEF Windows}
     509  Result := GetBinUtilsDir + DirectorySeparator + 'fpc';
     510  {$ENDIF}
     511  {$IFDEF Linux}
     512  Result := '/usr/lib/fpc/2.4.0/ppc386';
     513  {$ENDIF}
    496514end;
    497515
    … …  
    499517begin
    500518  Result := ExtractFileDir(Application.ExeName);
     519end;
     520
     521procedure TMainForm.InstallDependencies;
     522begin
     523  {$IFDEF Windows}
     524  {$ENDIF}
     525  {$IFDEF Linux}
     526  if FileExistsUTF8('yum') then begin
     527  end else
     528  if FileExistsUTF8('apt-get') then begin
     529  (* sudo apt-get install -y subversion
     530    sudo apt-get install -y cvs
     531    sudo apt-get install -y alien
     532    sudo apt-get install -y libncurses5-dev
     533    sudo apt-get install -y libgtk2.0-dev
     534    sudo apt-get install -y libgdk-pixbuf-dev
     535    sudo apt-get install -y libXp-dev
     536    sudo apt-get install -y libgtk1.2-dev
     537    sudo apt-get install -y libXxf86vm-dev
     538    sudo apt-get install -y glutg3-dev
     539    sudo apt-get install -y libgli-mesa-dev
     540    sudo apt-get install -y mesa-utils
     541  *)
     542  end else ShowMessage('No package manager found.');
     543  {$ENDIF}
    501544end;
    502545

  • trunk/Forms/UMainOptions.lfm

    r7 r9  
    11object MainOptionsForm: TMainOptionsForm
    2   Left = 320
     2  Left = 307
    33  Height = 350
    4   Top = 81
     4  Top = 161
    55  Width = 489
    66  Caption = 'Options'
    … …  
    3535    Height = 14
    3636    Top = 8
    37     Width = 79
     37    Width = 92
    3838    Caption = 'Bit utils location:'
    3939    ParentColor = False
    … …  
    5151    Height = 14
    5252    Top = 50
    53     Width = 41
     53    Width = 46
    5454    Caption = 'Platform'
    5555    ParentColor = False
    … …  
    6767    Height = 14
    6868    Top = 90
    69     Width = 135
     69    Width = 155
    7070    Caption = 'Web source list file location:'
    7171    ParentColor = False
    … …  
    8383    Height = 14
    8484    Top = 128
    85     Width = 98
     85    Width = 113
    8686    Caption = 'Subversion location:'
    8787    ParentColor = False

  • trunk/Forms/USourceSelection.pas

    r7 r9  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    9   StdCtrls, USource, HTTPSend;
     9  StdCtrls, USource, HttpSend;
    1010
    1111type
Note: See TracChangeset for help on using the changeset viewer.