added GetExecutableExt and GetLibraryExt

git-svn-id: trunk@8789 -

ide/buildlazdialog.pas

@@ -525,7 +525,7 @@ begin
             if OSLocksExecutables then begin
               // Case 4. the current executable is locked
               // => use a different output name
-              NewTargetFilename:='lazarus.new'+GetDefaultExecutableExt;
+              NewTargetFilename:='lazarus.new'+GetExecutableExt(Options.TargetOS);
               debugln('CreateBuildLazarusOptions exe locked NewTargetFilename=',NewTargetFilename);
             end else begin
               // Case 5. or else: => just compile to current directory
@@ -547,10 +547,10 @@ begin
 
     if NewTargetFilename<>'' then begin
       // FPC automatically changes the last extension (append or replace)
-      // For example under linux, where executable don't need any extension
+      // For example under linux, where executables don't need any extension
       // fpc removes the last extension of the -o option.
       // Trick fpc:
-      if GetDefaultExecutableExt='' then
+      if GetExecutableExt(Options.TargetOS)='' then
         NewTargetFilename:=NewTargetFilename+'.dummy';
       AppendExtraOption('-o'+NewTargetFilename);
     end;
@@ -895,7 +895,7 @@ begin
   try
     DirDialog.Options:=DirDialog.Options+[ofPathMustExist];
     DirDialog.Title:='Choose output directory of the IDE executable '
-                    +'(lazarus'+GetDefaultExecutableExt+')';
+                    +'(lazarus'+GetExecutableExt(Options.TargetOS)+')';
     if DirDialog.Execute then begin
       AFilename:=CleanAndExpandDirectory(DirDialog.Filename);
       TargetDirectoryComboBox.AddHistoryItem(AFilename,10,true,true);

ide/compileroptions.pp

@@ -1333,19 +1333,9 @@ function TBaseCompilerOptions.GetTargetFileExt: string;
 begin
   case ExecutableType of
   cetProgram:
-    begin
+    Result:=GetExecutableExt(fTargetOS);
-      if CompareText(fTargetOS, 'win32') = 0 then
-        Result:='.exe'
-      else
-        Result:=GetDefaultExecutableExt;
-    end;
   cetLibrary:
-    begin
+    Result:=GetLibraryExt(fTargetOS);
-      if CompareText(fTargetOS, 'win32') = 0 then
-        Result:='.dll'
-      else
-        Result:=GetDefaultLibraryExt;
-    end;
   else
     RaiseGDBException('');
   end;

ide/editoroptions.pp

@@ -2318,6 +2318,7 @@ begin
   // Display options
   ASynEdit.Gutter.Visible := fVisibleGutter;
   ASynEdit.Gutter.ShowLineNumbers := fShowLineNumbers;
+  //ASynEdit.Gutter.AutoSize:= fShowLineNumbers;
   ASynEdit.Gutter.ShowCodeFolding := FUseCodeFolding;
   ASynEdit.Gutter.Color := fGutterColor;
   ASynEdit.Gutter.Width := fGutterWidth;

ide/include/darwin/lazconf.inc

@@ -32,21 +32,11 @@
 uses
   BaseUnix, Unix;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.dylib';
-end;
-
 function GetDefaultTargetOS: string;
 begin
   Result:='darwin';
 end;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.dynlib';
-end;
-
 procedure IfDirectoryExistsAdd(const Directory: string; List: TStrings);
 begin
   if DirPathExists(Directory) then List.Add(Directory);

ide/include/freebsd/lazconf.inc

@@ -32,11 +32,6 @@
 uses
   BaseUnix, Unix;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.so';
-end;
-
 function GetDefaultTargetOS: string;
 begin
   Result:='freebsd';
@@ -46,11 +41,6 @@ procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.so';
-end;
-
 {$I ../unix/lazbaseconf.inc}
 
 

ide/include/linux/lazconf.inc

@@ -31,11 +31,6 @@
 uses
   Unix, BaseUnix;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.so';
-end;
-
 function GetDefaultTargetOS: string;
 begin
   Result:='linux';

ide/include/netbsd/lazconf.inc

@@ -32,11 +32,6 @@
 uses
   baseunix, unix;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.so';
-end;
-
 function GetDefaultTargetOS: string;
 begin
   Result:='netbsd';
@@ -46,11 +41,6 @@ procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;
 
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.so';
-end;
-
 {$I ../unix/lazbaseconf.inc}
 
 

ide/include/unix/lazbaseconf.inc

@@ -128,14 +128,6 @@ begin
   Result:=FindDefaultExecutablePath('make');
 end;
 
-{---------------------------------------------------------------------------
-  function GetDefaultExecutableExt: string;
- ---------------------------------------------------------------------------}
-function GetDefaultExecutableExt: string;
-begin
-  Result:='';
-end;
-
 function GetDefaultCompiledUnitExt(FPCVersion, FPCRelease: integer): string;
 begin
   Result:='.ppu';

ide/include/win32/lazconf.inc

@@ -115,19 +115,6 @@ begin
   end;
 end;
 
-{---------------------------------------------------------------------------
-  function GetDefaultExecutableExt: string;
- ---------------------------------------------------------------------------}
-function GetDefaultExecutableExt: string;
-begin
-  Result:='.exe';
-end;
-
-function GetDefaultLibraryExt: string;
-begin
-  Result:='.dll';
-end;
-
 function GetDefaultCompiledUnitExt(FPCVersion, FPCRelease: integer): string;
 begin
   if (FPCVersion=1) and (FPCRelease=0) then

ide/lazarusmanager.pas

@@ -177,7 +177,7 @@ end;
 function TLazarusManager.GetLazarusPath(const FileName: string) : string;
 begin
   Result := AppendPathDelim(FStartLazarusOptions.LazarusDir) + FileName +
-    GetDefaultExecutableExt;
+    GetExecutableExt;
 end;
 
 function TLazarusManager.RenameLazarusExecutables: TModalResult;

ide/lazconf.pp

@@ -97,10 +97,10 @@ const
   // create a pascal file, which can be used to test the compiler
   function CreateCompilerTestPascalFilename: string;
 
-  // returns the standard file extension (e.g '.exe')
+  // returns the standard executable extension (e.g '.exe')
-  function GetDefaultExecutableExt: string;
+  function GetExecutableExt(TargetOS: string = ''): string;
-  // returns the standard file extension (e.g '.dll' or '.dylib')
+  // returns the standard library extension (e.g '.dll' or '.dynlib')
-  function GetDefaultLibraryExt: string;
+  function GetLibraryExt(TargetOS: string = ''): string;
 
   // returns the standard file extension for compiled units (e.g '.ppu')
   function GetDefaultCompiledUnitExt(FPCVersion, FPCRelease: integer): string;
@@ -192,6 +192,28 @@ begin
   Result:=AppendPathDelim(GetPrimaryConfigPath)+'projectsessions';
 end;
 
+function GetExecutableExt(TargetOS: string): string;
+begin
+  if TargetOS='' then
+    TargetOS:=GetDefaultTargetOS;
+  if CompareText(TargetOS, 'win32') = 0 then
+     Result:='.exe'
+  else
+     Result:='';
+end;
+
+function GetLibraryExt(TargetOS: string): string;
+begin
+  if TargetOS='' then
+    TargetOS:=GetDefaultTargetOS;
+  if CompareText(TargetOS, 'win32') = 0 then
+     Result:='.dll'
+  else if CompareText(TargetOS, 'darwin') = 0 then
+     Result:='.dylib'
+  else
+     Result:='';
+end;
+
 function GetDefaultTargetCPU: string;
 begin
   Result:='undefined';

ide/main.pp

@@ -7544,7 +7544,7 @@ procedure TMainIDE.DoRestart;
       // TODO: use the target directory, where the new startlazarus is
       StartLazProcess.CurrentDirectory := ExtractFileDir(ParamStr(0));
       ExeName := AppendPathDelim(StartLazProcess.CurrentDirectory) +
-        'startlazarus' + GetDefaultExecutableExt;
+        'startlazarus' + GetExecutableExt;
       if not FileExists(ExeName) then begin
         ShowMessage(format(lisCannotFindLazarusStarter,
           [LineEnding, ExeName]));
@@ -9290,7 +9290,7 @@ var
 begin
   Result:=Filename;
   OldExt:=ExtractFileExt(Filename);
-  ExeExt:=LazConf.GetDefaultExecutableExt;
+  ExeExt:=LazConf.GetExecutableExt(GetTargetOS(true));
   if OldExt<>ExeExt then
     Result:=copy(Result,1,length(Result)-length(OldExt))+ExeExt;
   DebugLn('TMainIDE.OnMacroFuncMakeExe A ',Filename,' ',Result);

ide/outputfilter.pas

@@ -993,7 +993,7 @@ var
   MakeMsg: String;
 begin
   Result:=false;
-  MakeBeginPattern:= 'make' + GetDefaultExecutableExt + '[';
+  MakeBeginPattern:= 'make' + GetExecutableExt + '[';
   i:=length(MakeBeginPattern);
   if copy(s,1,i)=MakeBeginPattern then begin
     Result:=true;

ide/project.pp

@@ -1424,7 +1424,7 @@ begin
   UpdateProjectDirectory;
   FPublishOptions:=TPublishProjectOptions.Create(Self);
   FRunParameterOptions:=TRunParamsOptions.Create;
-  FTargetFileExt := GetDefaultExecutableExt;
+  FTargetFileExt := GetExecutableExt;
   Title := '';
   FUnitList := TList.Create;  // list of TUnitInfo
 end;
@@ -1918,7 +1918,7 @@ begin
          Path+'General/AutoCreateForms/Value', true);
       IconPath := xmlconfig.GetValue(Path+'General/IconPath/Value', './');
       TargetFileExt := xmlconfig.GetValue(
-         Path+'General/TargetFileExt/Value', GetDefaultExecutableExt);
+         Path+'General/TargetFileExt/Value', GetExecutableExt);
       Title := xmlconfig.GetValue(Path+'General/Title/Value', '');
 
       // Lazdoc
@@ -2137,7 +2137,7 @@ begin
   ClearSourceDirectories;
   UpdateProjectDirectory;
   FPublishOptions.Clear;
-  FTargetFileExt := GetDefaultExecutableExt;
+  FTargetFileExt := GetExecutableExt;
   Title := '';
   EndUpdate;
 end;

ideintf/projectintf.pas

@@ -1048,6 +1048,7 @@ end;
 procedure TLazProject.SetTitle(const AValue: String);
 begin
   if fTitle=AValue then exit;
+  Modified:=true;
   fTitle:=AValue;
 end;
 

packager/pkgmanager.pas

@@ -1348,7 +1348,7 @@ begin
   try
     FPCMakeTool.Title:='Creating Makefile for package '+APackage.IDAsString;
     FPCMakeTool.WorkingDirectory:=APackage.Directory;
-    FPCMakeTool.Filename:=FindFPCTool('fpcmake'+GetDefaultExecutableExt,
+    FPCMakeTool.Filename:=FindFPCTool('fpcmake'+GetExecutableExt,
                                       EnvironmentOptions.CompilerFilename);
     FPCMakeTool.CmdLineParams:='-q -TAll';
     FPCMakeTool.EnvironmentOverrides.Add(