Browse Source

* remove default sourceext to keep things simple and consistent

git-svn-id: trunk@10077 -
peter 17 years ago
parent
commit
c3248b7748
1 changed files with 1 additions and 13 deletions
  1. 1 13
      packages/fpmkunit/src/fpmkunit.pp

+ 1 - 13
packages/fpmkunit/src/fpmkunit.pp

@@ -588,7 +588,6 @@ Type
     FTarget: String;
     FTarget: String;
     FUnixPaths: Boolean;
     FUnixPaths: Boolean;
     FNoFPCCfg: Boolean;
     FNoFPCCfg: Boolean;
-    FSourceExt : String;
     function GetLocalUnitDir: String;
     function GetLocalUnitDir: String;
     function GetGlobalUnitDir: String;
     function GetGlobalUnitDir: String;
     function GetBaseInstallDir: String;
     function GetBaseInstallDir: String;
@@ -622,7 +621,6 @@ Type
     Property Mode : TCompilerMode Read FMode Write FMode;
     Property Mode : TCompilerMode Read FMode Write FMode;
     Property UnixPaths : Boolean Read FUnixPaths Write FUnixPaths;
     Property UnixPaths : Boolean Read FUnixPaths Write FUnixPaths;
     Property Options : String Read FOptions Write FOptions;    // Default compiler options.
     Property Options : String Read FOptions Write FOptions;    // Default compiler options.
-    Property SourceExt : String Read FSourceExt Write FSourceExt;
     Property NoFPCCfg : Boolean Read FNoFPCCfg Write FNoFPCCfg;
     Property NoFPCCfg : Boolean Read FNoFPCCfg Write FNoFPCCfg;
     // paths etc.
     // paths etc.
     Property LocalUnitDir : String Read GetLocalUnitDir Write SetLocalUnitDir;
     Property LocalUnitDir : String Read GetLocalUnitDir Write SetLocalUnitDir;
@@ -1024,7 +1022,6 @@ Const
   KeyBinInstallDir      = 'BinInstallDir';
   KeyBinInstallDir      = 'BinInstallDir';
   KeyDocInstallDir      = 'DocInstallDir';
   KeyDocInstallDir      = 'DocInstallDir';
   KeyExamplesInstallDir = 'ExamplesInstallDir';
   KeyExamplesInstallDir = 'ExamplesInstallDir';
-  KeySourceExt = 'SourceExt';
   // Keys for unit config
   // Keys for unit config
   KeyName     = 'Name';
   KeyName     = 'Name';
   KeyVersion  = 'Version';
   KeyVersion  = 'Version';
@@ -2251,7 +2248,6 @@ begin
 {$else}
 {$else}
   UnixPaths:=False;
   UnixPaths:=False;
 {$endif}
 {$endif}
-  FSourceExt:=PPExt;
   FNoFPCCfg:=False;
   FNoFPCCfg:=False;
   FCPU:=cpuNone;
   FCPU:=cpuNone;
   FOS:=osNone;
   FOS:=osNone;
@@ -2377,7 +2373,6 @@ begin
       Values[KeyExamplesInstallDir]:=FExamplesInstallDir;
       Values[KeyExamplesInstallDir]:=FExamplesInstallDir;
       Values[KeyRemove]:=FRemove;
       Values[KeyRemove]:=FRemove;
       Values[KeyTarget]:=FTarget;
       Values[KeyTarget]:=FTarget;
-      Values[KeySourceExt]:=FSourceExt;
       if FNoFPCCfg then
       if FNoFPCCfg then
         Values[KeyNoFPCCfg]:='Y';
         Values[KeyNoFPCCfg]:='Y';
       end;
       end;
@@ -2435,9 +2430,6 @@ begin
       FBinInstallDir:=Values[KeyBinInstallDir];
       FBinInstallDir:=Values[KeyBinInstallDir];
       FDocInstallDir:=Values[KeyDocInstallDir];
       FDocInstallDir:=Values[KeyDocInstallDir];
       FExamplesInstallDir:=Values[KeyExamplesInstallDir];
       FExamplesInstallDir:=Values[KeyExamplesInstallDir];
-      FSourceExt:=Values[KeySourceExt];
-      If (FSourceExt='') then
-        FSourceExt:=PPExt;
       FNoFPCCfg:=(Upcase(Values[KeyNoFPCCfg])='Y');
       FNoFPCCfg:=(Upcase(Values[KeyNoFPCCfg])='Y');
       end;
       end;
   Finally
   Finally
@@ -4317,11 +4309,7 @@ begin
   D:=ExtractFilePath(N);
   D:=ExtractFilePath(N);
   E:=ExtractFileExt(N);
   E:=ExtractFileExt(N);
   N:=ExtractFileName(N);
   N:=ExtractFileName(N);
-  If (E<>'') then
-    N:=Copy(N,1,Length(N)-Length(E))
-  else
-    E:=Defaults.SourceExt;
-  inherited SetName(N);
+  inherited SetName(Copy(N,1,Length(N)-Length(E)));
   FExtension:=E;
   FExtension:=E;
   FDirectory:=D;
   FDirectory:=D;
 end;
 end;