From ed84f06a12c86f9927471983490dece4b232357a Mon Sep 17 00:00:00 2001 From: Don Date: Sun, 3 Nov 2024 15:16:07 +0000 Subject: [PATCH] Smaller tag. --- fpcupdeluxe.lps | 135 +++++++++++++++++++---- languages/fpcupdeluxe-i386-win32.pot | 16 ++- public/gitrevision.txt | 2 +- sources/installercore.pas | 4 + sources/updeluxe/fpcupdeluxemainform.pas | 104 ++++++++++------- 5 files changed, 197 insertions(+), 64 deletions(-) diff --git a/fpcupdeluxe.lps b/fpcupdeluxe.lps index 414febba..1cfa7bdd 100644 --- a/fpcupdeluxe.lps +++ b/fpcupdeluxe.lps @@ -5,7 +5,7 @@ - + @@ -22,8 +22,8 @@ - - + + @@ -34,9 +34,7 @@ - - - + @@ -78,9 +76,9 @@ - - - + + + @@ -97,7 +95,7 @@ - + @@ -124,11 +122,10 @@ - + - + - @@ -3962,49 +3959,143 @@ + + + + + + + + + + + + + + - + - + + - + - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/fpcupdeluxe-i386-win32.pot b/languages/fpcupdeluxe-i386-win32.pot index cd4c8fcc..6d0b733e 100644 --- a/languages/fpcupdeluxe-i386-win32.pot +++ b/languages/fpcupdeluxe-i386-win32.pot @@ -93,6 +93,11 @@ msgstr "" msgid "Use wget/libcurl as downloader." msgstr "" +#: extrasettings.captionenabledelphirtti +msgctxt "extrasettings.captionenabledelphirtti" +msgid "Enable Delphi RTTI." +msgstr "" + #: extrasettings.captionusesoftfloat80bit msgctxt "extrasettings.captionusesoftfloat80bit" msgid "Enable software emulation of 80 bit floats." @@ -154,6 +159,11 @@ msgstr "" msgid "Use the system wide install of FPC to build Lazarus." msgstr "" +#: extrasettings.hintenabledelphirtti +msgctxt "extrasettings.hintenabledelphirtti" +msgid "Enable Delphi RTTI." +msgstr "" + #: extrasettings.hintusesoftfloat80bit msgctxt "extrasettings.hintusesoftfloat80bit" msgid "Enable software emulation of 80 bit floats." @@ -710,13 +720,17 @@ msgid "mORMot2" msgstr "" #: tform1.mormotbtn.hint -msgid "Get the mORMot for FPC" +msgid "Get the mORMot2 for FPC" msgstr "" #: tform1.mportugueselanguage.caption msgid "Portuguese (PT)" msgstr "" +#: tform1.mrussianlanguage.caption +msgid "Russian (RUS)" +msgstr "" + #: tform1.mturkishlanguage.caption msgid "Turkish (TR)" msgstr "" diff --git a/public/gitrevision.txt b/public/gitrevision.txt index c624a2e7..82cbf337 100644 --- a/public/gitrevision.txt +++ b/public/gitrevision.txt @@ -1 +1 @@ -[master]darwin_amd64_crossbins_all-2904(ac0266f) +[master]darwin_amd64_crossbins_all-2905(6dc8658) diff --git a/sources/installercore.pas b/sources/installercore.pas index df420923..c6ff19f9 100644 --- a/sources/installercore.pas +++ b/sources/installercore.pas @@ -91,6 +91,10 @@ interface LAZARUSTRUNKBRANCH = 'main'; LAZARUSBINARIES = LAZARUSGITLABBINARIES + '/-/raw/'+LAZARUSTRUNKBRANCH; + TAG_PREAMBLE = 'refs/tags/'; + FPC_TAG_PREAMBLE = 'release_'; + LAZ_TAG_PREAMBLE = 'lazarus_'; + PACKAGESLOCATION = 'packages.fppkg'; PACKAGESCONFIGDIR = 'fpcpkgconfig'; //PACKAGESCONFIGDIR = PACKAGESLOCATION+DirectorySeparator+'fpcpkgconfig'; diff --git a/sources/updeluxe/fpcupdeluxemainform.pas b/sources/updeluxe/fpcupdeluxemainform.pas index 2558c055..5cf43e35 100644 --- a/sources/updeluxe/fpcupdeluxemainform.pas +++ b/sources/updeluxe/fpcupdeluxemainform.pas @@ -1874,7 +1874,11 @@ procedure TForm1.CommandOutputScreenSpecialLineMarkup(Sender: TObject; Line: int {$endif} procedure TForm1.PageControl1Change(Sender: TObject); +type + TTarget = (FPC,LAZARUS); var + aTarget : TTarget; + aTargetListBox : array[TTarget] of TListBox; aFileList:TStringList; aResultCode: longint; Output:string; @@ -1890,69 +1894,89 @@ procedure TForm1.PageControl1Change(Sender: TObject); if TPageControl(Sender).ActivePage=TagSheet then begin - Application.ProcessMessages; - aFileList:=TStringList.Create; - aFileList.Delimiter:=#10; - aFileList.StrictDelimiter:=true; - ListBoxFPCTargetTag.Items.BeginUpdate; - ListBoxLazarusTargetTag.Items.BeginUpdate; - try - GitExe:=Which('git'+GetExeExt); - {$ifdef MSWindows} - if (NOT FileExists(GitExe)) then - begin - GitExe:=ConcatPaths([FPCupManager.MakeDirectory,'git','cmd'])+PathSeparator+'git.exe'; - end; - {$endif} + GitExe:=Which('git'+GetExeExt); + {$ifdef MSWindows} + if (NOT FileExists(GitExe)) then + begin + GitExe:=ConcatPaths([FPCupManager.MakeDirectory,'git','cmd'])+PathSeparator+'git.exe'; + end; + {$endif} + + if FileExists(GitExe) then + begin + aTargetListBox[FPC]:=ListBoxFPCTargetTag; + aTargetListBox[LAZARUS]:=ListBoxLazarusTargetTag; - if FileExists(GitExe) then + aFileList:=TStringList.Create; + aFileList.Delimiter:=#10; + aFileList.StrictDelimiter:=true; + + for aTarget in TTarget do begin + Application.ProcessMessages; - ListBoxFPCTargetTag.Items.Clear; - ListBoxLazarusTargetTag.Items.Clear; + aTargetListBox[aTarget].Items.BeginUpdate; + aTargetListBox[aTarget].Items.Clear; aFileList.Clear; - RunCommandIndir('',GitExe,['ls-remote','--tags','--sort=-v:refname','--refs',FPCGITLABREPO+'.git','*rc*','?.?.?'], Output, aResultCode,[poUsePipes, poStderrToOutPut]{$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)},swoHide{$ENDIF}); - aFileList.DelimitedText:=Output; - for GITTagCombo in aFileList do - begin - i:=Pos(#9,GITTagCombo); - GITTag:=Copy(GITTagCombo,i+1,MaxInt); - Delete(GITTag,1,Length('refs/tags/')); - ListBoxFPCTargetTag.Items.Append(GITTag); - end; - aFileList.Clear; - RunCommandIndir('',GitExe,['ls-remote','--tags','--sort=-v:refname','--refs',LAZARUSGITLABREPO+'.git','*_RC*'], Output, aResultCode,[poUsePipes, poStderrToOutPut]{$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)},swoHide{$ENDIF}); + if aTarget=FPC then + RunCommandIndir('',GitExe,['ls-remote','--tags','--sort=-v:refname','--refs',FPCGITLABREPO+'.git','*rc*'{,'?.?.?'}], Output, aResultCode,[poUsePipes, poStderrToOutPut]{$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)},swoHide{$ENDIF}); + if aTarget=LAZARUS then + RunCommandIndir('',GitExe,['ls-remote','--tags','--sort=-v:refname','--refs',LAZARUSGITLABREPO+'.git','*RC*'], Output, aResultCode,[poUsePipes, poStderrToOutPut]{$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)},swoHide{$ENDIF}); + aFileList.DelimitedText:=Output; for GITTagCombo in aFileList do begin i:=Pos(#9,GITTagCombo); - GITTag:=Copy(GITTagCombo,i+1,MaxInt); - Delete(GITTag,1,Length('refs/tags/')); - ListBoxLazarusTargetTag.Items.Append(GITTag); + if i>0 then GITTag:=Copy(GITTagCombo,i+1,MaxInt); + i:=Pos(TAG_PREAMBLE,GITTag); + if i>0 then Delete(GITTag,1,Length(TAG_PREAMBLE)); + + if aTarget=FPC then + begin + i:=Pos(FPC_TAG_PREAMBLE,GITTag); + if i>0 then Delete(GITTag,1,Length(FPC_TAG_PREAMBLE)); + end; + if aTarget=LAZARUS then + begin + i:=Pos(LAZ_TAG_PREAMBLE,GITTag); + if i>0 then Delete(GITTag,1,Length(LAZ_TAG_PREAMBLE)); + end; + + aTargetListBox[aTarget].Items.Append(GITTag); end; aFileList.Clear; - - //Do this only once !! - TPageControl(Sender).OnChange:=nil; + aTargetListBox[aTarget].Items.EndUpdate; end; - finally aFileList.Free; - ListBoxLazarusTargetTag.Items.EndUpdate; - ListBoxFPCTargetTag.Items.EndUpdate; end; + + //Do this only once !! + TPageControl(Sender).OnChange:=nil; end; end; procedure TForm1.OnlyTagClick(Sender: TObject); var aListBox:TListBox; + aPre:string; begin - if (Sender=BitBtnFPCOnlyTag) then aListBox:=ListBoxFPCTargetTag; - if (Sender=BitBtnLazarusOnlyTag) then aListBox:=ListBoxLazarusTargetTag; - if (aListBox.ItemIndex<>-1) then AddTag(aListBox,aListBox.GetSelectedText); + if (Sender=BitBtnFPCOnlyTag) then + begin + aListBox:=ListBoxFPCTargetTag; + aPre:=FPC_TAG_PREAMBLE; + end; + if (Sender=BitBtnLazarusOnlyTag) then + begin + aListBox:=ListBoxLazarusTargetTag; + aPre:=LAZ_TAG_PREAMBLE; + end; + if (aListBox.ItemIndex<>-1) then + begin + AddTag(aListBox,aPre+aListBox.GetSelectedText); + end; end; procedure TForm1.AddTag(Sender: TObject;aTag:string);