• R/O
  • SSH
  • HTTPS

akdf: Commit


Commit MetaInfo

Revision378 (tree)
Time2019-07-08 07:39:46
Authorderekwildstar

Log Message

- Incremento das versões de delphi suportadas pelo Packages Creator
- Ajuste na função "DelphiName"
- Inclusão de um parâmetro adicional na função "RegExMatch" para informar o caractere separador matches
- Ajustes no projeto do Crypt Table Maker

Change Summary

Incremental Difference

--- trunk/KRKExperts/prj/Delphi 25 (Delphi Tokyo)/KRKExperts.dproj (revision 377)
+++ trunk/KRKExperts/prj/Delphi 25 (Delphi Tokyo)/KRKExperts.dproj (revision 378)
@@ -77,10 +77,10 @@
7777 <DCC_Optimize>false</DCC_Optimize>
7878 <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
7979 <DCC_RemoteDebug>true</DCC_RemoteDebug>
80+ <DCC_ExeOutput>..\..\dll\D25\debug</DCC_ExeOutput>
8081 </PropertyGroup>
8182 <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
8283 <Debugger_HostApplication>C:\Program Files (x86)\Embarcadero\Studio\19.0\bin\bds.exe</Debugger_HostApplication>
83- <DCC_ExeOutput>..\..\dll\D25\debug</DCC_ExeOutput>
8484 <Debugger_RunParams>-np -r KRKExperts</Debugger_RunParams>
8585 <VerInfo_Locale>1033</VerInfo_Locale>
8686 <DCC_RemoteDebug>false</DCC_RemoteDebug>
--- trunk/KRKExperts/src/PackagesCreator/KRK.Experts.PackagesCreator.Utilities.pas (revision 377)
+++ trunk/KRKExperts/src/PackagesCreator/KRK.Experts.PackagesCreator.Utilities.pas (revision 378)
@@ -619,53 +619,25 @@
619619 begin
620620 Result := '';
621621
622- if ASequentialVersion = 10 then
623- Result := 'Delphi 2006';
624-
625- if ASequentialVersion = 11 then
626- Result := 'Delphi 2007';
627-
628- if ASequentialVersion = 12 then
629- Result := 'Delphi 2009';
630-
631- if ASequentialVersion = 14 then
632- Result := 'Delphi 2010';
633-
634- if ASequentialVersion = 15 then
635- Result := 'Delphi XE';
636-
637- if ASequentialVersion = 16 then
638- Result := 'Delphi XE2';
639-
640- if ASequentialVersion = 17 then
641- Result := 'Delphi XE3';
642-
643- if ASequentialVersion = 18 then
644- Result := 'Delphi XE4';
645-
646- if ASequentialVersion = 19 then
647- Result := 'Delphi XE5';
648-
649- if ASequentialVersion = 20 then
650- Result := 'Delphi XE6';
651-
652- if ASequentialVersion = 21 then
653- Result := 'Delphi XE7';
654-
655- if ASequentialVersion = 22 then
656- Result := 'Delphi XE8';
657-
658- if ASequentialVersion = 23 then
659- Result := 'Delphi Seattle';
660-
661- if ASequentialVersion = 24 then
662- Result := 'Delphi Berlin';
663-
664- if ASequentialVersion = 25 then
665- Result := 'Delphi Tokyo';
666-
667- if ASequentialVersion = 26 then
668- Result := 'Delphi Rio';
622+ case ASequentialVersion of
623+ 10: Result := 'Delphi 2006';
624+ 11: Result := 'Delphi 2007';
625+ 12: Result := 'Delphi 2009';
626+ 14: Result := 'Delphi 2010';
627+ 15: Result := 'Delphi XE';
628+ 16: Result := 'Delphi XE2';
629+ 17: Result := 'Delphi XE3';
630+ 18: Result := 'Delphi XE4';
631+ 19: Result := 'Delphi XE5';
632+ 20: Result := 'Delphi XE6';
633+ 21: Result := 'Delphi XE7';
634+ 22: Result := 'Delphi XE8';
635+ 23: Result := 'Delphi Seattle';
636+ 24: Result := 'Delphi Berlin';
637+ 25: Result := 'Delphi Tokyo';
638+ 26: Result := 'Delphi Rio';
639+ 27: Result := 'Delphi 27';
640+ end;
669641 end;
670642
671643 end.
--- trunk/KRKExperts/src/PackagesCreator/KRK.Experts.PackagesCreator.pas (revision 377)
+++ trunk/KRKExperts/src/PackagesCreator/KRK.Experts.PackagesCreator.pas (revision 378)
@@ -176,7 +176,7 @@
176176 KRK.Lib.Xml.Utilities;
177177
178178 const
179- LAST_SUPPORTED_SEQUENTIAL_VERSION = 26;
179+ LAST_SUPPORTED_SEQUENTIAL_VERSION = 27;
180180
181181 { TForm1 }
182182
--- trunk/KRKExperts/leia-me.txt (nonexistent)
+++ trunk/KRKExperts/leia-me.txt (revision 378)
@@ -0,0 +1 @@
1+Para depurar um expert, use o bds.exe como host application e nos parâmetros inclua "-np -r KRKExperts" (sem as aspas). Isso vai rodar uma instância vazia do Delphi, cuja chave raiz de registro é KRKExperts. Após a primeira execução, acesse essa chave de registro e inclua na subchave "Experts" o caminho para a dll, que está em bin\D??\debug
\ No newline at end of file
--- trunk/KRKLIB/SRC/RegExp/KRK.Lib.RegExp.Utils.pas (revision 377)
+++ trunk/KRKLIB/SRC/RegExp/KRK.Lib.RegExp.Utils.pas (revision 378)
@@ -11,7 +11,7 @@
1111 // Atenção, esta função é limitada a 127 matches quando AMatchCount é usado, ou
1212 // até 256 Matches quando este argumento recebe zero, porque ShortInt = -128..127
1313 // Caso precise de mais matches, utilize SmallInt
14-function RegExMatch(ASubject, APattern: String; AGroup: Byte; AMatchCount: ShortInt; AOverrideOptions: Boolean; AOptions: TPerlRegExOptions; out AMatch: String): Boolean;
14+function RegExMatch(ASubject, APattern: String; AGroup: Byte; AMatchCount: ShortInt; AOverrideOptions: Boolean; AOptions: TPerlRegExOptions; out AMatch: String; ASeparator: String = ';'): Boolean;
1515
1616 implementation
1717
@@ -114,7 +114,7 @@
114114 end;
115115 end;
116116
117-function RegExMatch(ASubject, APattern: String; AGroup: Byte; AMatchCount: ShortInt; AOverrideOptions: Boolean; AOptions: TPerlRegExOptions; out AMatch: String): Boolean;
117+function RegExMatch(ASubject, APattern: String; AGroup: Byte; AMatchCount: ShortInt; AOverrideOptions: Boolean; AOptions: TPerlRegExOptions; out AMatch: String; ASeparator: String = ';'): Boolean;
118118 begin
119119 Result := False;
120120 AMatch := '';
@@ -139,7 +139,7 @@
139139 if AMatch = '' then
140140 AMatch := Groups[AGroup]
141141 else
142- AMatch := AMatch + ';' + Groups[AGroup];
142+ AMatch := AMatch + ASeparator + Groups[AGroup];
143143
144144 Dec(AMatchCount);
145145 until (AMatchCount = 0) or (not MatchAgain)
@@ -148,7 +148,7 @@
148148 if AMatch = '' then
149149 AMatch := MatchedText
150150 else
151- AMatch := AMatch + ';' + MatchedText;
151+ AMatch := AMatch + ASeparator + MatchedText;
152152
153153 Dec(AMatchCount);
154154 until (AMatchCount = 0) or (not MatchAgain)
--- trunk/KRKTOOLS/Crypt Table Maker/prj/CryptTableMaker.dproj (revision 377)
+++ trunk/KRKTOOLS/Crypt Table Maker/prj/CryptTableMaker.dproj (revision 378)
@@ -47,12 +47,12 @@
4747 </PropertyGroup>
4848 <PropertyGroup Condition="'$(Base)'!=''">
4949 <Icon_MainIcon>..\..\res\CryptTableMaker_Icon.ico</Icon_MainIcon>
50- <DCC_DcuOutput>..\..\bin\dcu</DCC_DcuOutput>
50+ <DCC_DcuOutput>..\bin\dcu</DCC_DcuOutput>
5151 <DCC_E>false</DCC_E>
5252 <DCC_DebugInformation>0</DCC_DebugInformation>
5353 <DCC_N>false</DCC_N>
5454 <DCC_S>false</DCC_S>
55- <DCC_ExeOutput>..\..\bin\exe</DCC_ExeOutput>
55+ <DCC_ExeOutput>..\bin\exe</DCC_ExeOutput>
5656 <VerInfo_Locale>1046</VerInfo_Locale>
5757 <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=;CFBundleDisplayName=;UIDeviceFamily=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;UISupportedInterfaceOrientations=;CFBundleExecutable=;CFBundleResourceSpecification=;LSRequiresIPhoneOS=;CFBundleInfoDictionaryVersion=;CFBundleDevelopmentRegion=;package=;label=;versionCode=;versionName=;persistent=;restoreAnyVersion=;installLocation=;largeHeap=;theme=</VerInfo_Keys>
5858 <DCC_F>false</DCC_F>
@@ -63,12 +63,12 @@
6363 <SanitizedProjectName>CryptTableMaker</SanitizedProjectName>
6464 </PropertyGroup>
6565 <PropertyGroup Condition="'$(Base_Win32)'!=''">
66- <Icon_MainIcon>..\..\res\CryptTableMaker_Icon.ico</Icon_MainIcon>
6766 <VerInfo_Locale>1033</VerInfo_Locale>
6867 <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
6968 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7069 <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
7170 <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
71+ <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
7272 <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
7373 </PropertyGroup>
7474 <PropertyGroup Condition="'$(Base_Win64)'!=''">
@@ -85,6 +85,7 @@
8585 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
8686 <VerInfo_Locale>1033</VerInfo_Locale>
8787 <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
88+ <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
8889 </PropertyGroup>
8990 <PropertyGroup Condition="'$(Cfg_2)'!=''">
9091 <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -97,6 +98,7 @@
9798 <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
9899 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
99100 <BT_BuildType>Debug</BT_BuildType>
101+ <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
100102 </PropertyGroup>
101103 <ItemGroup>
102104 <DelphiCompile Include="$(MainSource)">
@@ -176,9 +178,8 @@
176178 <VersionInfoKeys Name="theme"/>
177179 </VersionInfoKeys>
178180 <Excluded_Packages>
179- <Excluded_Packages Name="$(BDSBIN)\webdsnap190.bpl">Embarcadero InternetExpress Components</Excluded_Packages>
180- <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
181- <Excluded_Packages Name="$(BDSBIN)\dclofficexp190.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
181+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
182+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
182183 </Excluded_Packages>
183184 </Delphi.Personality>
184185 <Platforms>
Show on old repository browser