* with ihx2tzx now also supporting binary output it makes sense to rename it to something more generic

git-svn-id: trunk@45594 -

.gitattributes

@@ -19170,14 +19170,14 @@ utils/h2pas/scan.pas svneol=native#text/plain
 utils/h2pas/testit.h -text
 utils/h2pas/yylex.cod svneol=native#text/plain
 utils/h2pas/yyparse.cod svneol=native#text/plain
-utils/ihx2tzx/Makefile svneol=native#text/plain
-utils/ihx2tzx/Makefile.fpc svneol=native#text/plain
-utils/ihx2tzx/fpmake.pp svneol=native#text/plain
-utils/ihx2tzx/ihx2tzx.lpi svneol=native#text/plain
-utils/ihx2tzx/ihx2tzx.lpr svneol=native#text/plain
-utils/ihx2tzx/ihxreader.pas svneol=native#text/plain
-utils/ihx2tzx/tzxwriter.pas svneol=native#text/plain
-utils/ihx2tzx/zxbasic.pas svneol=native#text/plain
+utils/ihxutil/Makefile svneol=native#text/plain
+utils/ihxutil/Makefile.fpc svneol=native#text/plain
+utils/ihxutil/fpmake.pp svneol=native#text/pascal
+utils/ihxutil/ihxreader.pas svneol=native#text/pascal
+utils/ihxutil/ihxutil.lpi svneol=native#text/plain
+utils/ihxutil/ihxutil.lpr svneol=native#text/pascal
+utils/ihxutil/tzxwriter.pas svneol=native#text/pascal
+utils/ihxutil/zxbasic.pas svneol=native#text/pascal
 utils/importtl/Makefile svneol=native#text/plain
 utils/importtl/Makefile.fpc svneol=native#text/plain
 utils/importtl/Makefile.fpc.fpcmake svneol=native#text/plain

compiler/systems/t_zxspectrum.pas

@@ -328,7 +328,7 @@ end;
 
 function TLinkerZXSpectrum.postprocessexecutable(const fn: string; isdll: boolean): boolean;
   begin
-    result:=DoExec(FindUtil(utilsprefix+'ihx2tzx'),' '+fn,true,false);
+    result:=DoExec(FindUtil(utilsprefix+'ihxutil'),' '+fn,true,false);
   end;
 
 
@@ -421,7 +421,7 @@ function TInternalLinkerZXSpectrum.postprocessexecutable(const fn: string): bool
   begin
     result:=false;
 
-    utilexe:=utilsprefix+'ihx2tzx';
+    utilexe:=utilsprefix+'ihxutil';
     FoundBin:='';
     Found:=false;
     if utilsdirectory<>'' then

utils/fpmake_add.inc

@@ -18,4 +18,4 @@
   add_tply(ADirectory+IncludeTrailingPathDelimiter('tply'));
   add_unicode(ADirectory+IncludeTrailingPathDelimiter('unicode'));
   add_pas2js(ADirectory+IncludeTrailingPathDelimiter('pas2js'));
-  add_ihx2tzx(ADirectory+IncludeTrailingPathDelimiter('ihx2tzx'));
+  add_ihxutil(ADirectory+IncludeTrailingPathDelimiter('ihxutil'));

utils/fpmake_proc.inc

@@ -38,5 +38,5 @@
 
 {$include pas2js/fpmake.pp}
 
-{$include ihx2tzx/fpmake.pp}
+{$include ihxutil/fpmake.pp}
 

utils/ihx2tzx/fpmake.pp → utils/ihxutil/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 {$endif ALLPACKAGES}
 
-procedure add_ihx2tzx(const ADirectory: string);
+procedure add_ihxutil(const ADirectory: string);
 
 Var
   P : TPackage;
@@ -14,8 +14,8 @@ Var
 begin
   With Installer do
     begin
-    P:=AddPackage('utils-ihx2tzx');
-    P.ShortName:='ihx2tzx';
+    P:=AddPackage('utils-ihxutil');
+    P.ShortName:='ihxutil';
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
@@ -24,7 +24,7 @@ begin
     P.License := 'GPL';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '';
-    P.Description := 'A tool to convert Intel HEX Format files to ZX Spectrum tape files in the TZX format.';
+    P.Description := 'A tool to convert Intel HEX Format files different formats used on various Z80 systems.';
     P.NeedLibC:= false;
 
     P.Directory:=ADirectory;
@@ -32,7 +32,7 @@ begin
 
     P.Dependencies.Add('fcl-base');
 
-    T:=P.Targets.AddProgram('ihx2tzx.lpr');
+    T:=P.Targets.AddProgram('ihxutil.lpr');
     T.Dependencies.AddUnit('ihxreader');
     T.Dependencies.AddUnit('tzxwriter');
     T.Dependencies.AddUnit('zxbasic');
@@ -44,7 +44,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_ihx2tzx('');
+  add_ihxutil('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

utils/ihx2tzx/ihx2tzx.lpi → utils/ihxutil/ihxutil.lpi

@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <Title Value="ihx2tzx"/>
+      <Title Value="ihxutil"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
@@ -26,7 +26,7 @@
     </RunParams>
     <Units Count="4">
       <Unit0>
-        <Filename Value="ihx2tzx.lpr"/>
+        <Filename Value="ihxutil.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
@@ -46,7 +46,7 @@
   <CompilerOptions>
     <Version Value="11"/>
     <Target>
-      <Filename Value="ihx2tzx"/>
+      <Filename Value="ihxutil"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>

utils/ihx2tzx/ihx2tzx.lpr → utils/ihxutil/ihxutil.lpr

@@ -1,4 +1,4 @@
-{ IHX (Intel Hex format) to TZX (ZX Spectrum tape file format) convertor tool
+{ IHX (Intel Hex format) utility program
 
   This is the main program of the tool.
 
@@ -20,7 +20,7 @@
   Boston, MA 02110-1335, USA.
 }
 
-program ihx2tzx;
+program ihxutil;
 
 {$mode objfpc}{$H+}
 
@@ -41,9 +41,9 @@ type
     otBin
   );
 
-  { TIHX2TZX }
+  { TIHXUtil }
 
-  TIHX2TZX = class(TCustomApplication)
+  TIHXUtil = class(TCustomApplication)
   private
     FInputFileName: string;
     FOutputFileName: string;
@@ -63,7 +63,7 @@ type
 
 { TIHX2TZX }
 
-procedure TIHX2TZX.DoRun;
+procedure TIHXUtil.DoRun;
 var
   ErrorMsg, t: String;
   NonOptions: TStringArray;
@@ -150,7 +150,7 @@ begin
   Terminate;
 end;
 
-constructor TIHX2TZX.Create(TheOwner: TComponent);
+constructor TIHXUtil.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
   StopOnException:=True;
@@ -159,7 +159,7 @@ begin
   FBinaryProgramName := 'test';
 end;
 
-destructor TIHX2TZX.Destroy;
+destructor TIHXUtil.Destroy;
 begin
   FreeAndNil(FInputImage);
   FreeAndNil(FTapeWriter);
@@ -167,7 +167,7 @@ begin
   inherited Destroy;
 end;
 
-procedure TIHX2TZX.WriteHelp;
+procedure TIHXUtil.WriteHelp;
 begin
   { add your help code here }
   writeln('Usage: ', ExeName, ' [options] ihx_file [out_file]');
@@ -181,10 +181,10 @@ begin
 end;
 
 var
-  Application: TIHX2TZX;
+  Application: TIHXUtil;
 begin
-  Application:=TIHX2TZX.Create(nil);
-  Application.Title:='ihx2tzx';
+  Application:=TIHXUtil.Create(nil);
+  Application.Title:='ihxutil';
   Application.Run;
   Application.Free;
 end.