• R/O
  • SSH
  • HTTPS

akdf: Commit


Commit MetaInfo

Revision494 (tree)
Time2020-02-11 07:00:32
Authorderekwildstar

Log Message

Correção do erro que gerava access violation quando o Package Manager era usado para listar o pacote rtlxx.bpl

Change Summary

Incremental Difference

--- trunk/utl/Package Manager/prj/PackageManager.dproj (revision 493)
+++ trunk/utl/Package Manager/prj/PackageManager.dproj (revision 494)
@@ -7,7 +7,7 @@
77 <TargetedPlatforms>1</TargetedPlatforms>
88 <AppType>Console</AppType>
99 <FrameworkType>None</FrameworkType>
10- <ProjectVersion>18.7</ProjectVersion>
10+ <ProjectVersion>18.8</ProjectVersion>
1111 <Platform Condition="'$(Platform)'==''">Win32</Platform>
1212 </PropertyGroup>
1313 <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -85,7 +85,7 @@
8585 <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
8686 <VerInfo_Locale>1033</VerInfo_Locale>
8787 <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
88- <Debugger_RunParams>-l26 -oteste.txt</Debugger_RunParams>
88+ <Debugger_RunParams>-l&quot;C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rtl260.bpl&quot;</Debugger_RunParams>
8989 <Icon_MainIcon>..\res\PackageManager.ico</Icon_MainIcon>
9090 </PropertyGroup>
9191 <ItemGroup>
@@ -113,6 +113,9 @@
113113 <Source>
114114 <Source Name="MainSource">PackageManager.dpr</Source>
115115 </Source>
116+ <Excluded_Packages>
117+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
118+ </Excluded_Packages>
116119 </Delphi.Personality>
117120 <Platforms>
118121 <Platform value="Win32">True</Platform>
@@ -173,6 +176,10 @@
173176 <RemoteDir>classes</RemoteDir>
174177 <Operation>1</Operation>
175178 </Platform>
179+ <Platform Name="Android64">
180+ <RemoteDir>classes</RemoteDir>
181+ <Operation>1</Operation>
182+ </Platform>
176183 </DeployClass>
177184 <DeployClass Name="AndroidFileProvider">
178185 <Platform Name="Android">
@@ -179,6 +186,10 @@
179186 <RemoteDir>res\xml</RemoteDir>
180187 <Operation>1</Operation>
181188 </Platform>
189+ <Platform Name="Android64">
190+ <RemoteDir>res\xml</RemoteDir>
191+ <Operation>1</Operation>
192+ </Platform>
182193 </DeployClass>
183194 <DeployClass Name="AndroidGDBServer">
184195 <Platform Name="Android">
@@ -191,12 +202,26 @@
191202 <RemoteDir>library\lib\armeabi</RemoteDir>
192203 <Operation>1</Operation>
193204 </Platform>
205+ <Platform Name="Android64">
206+ <RemoteDir>library\lib\armeabi</RemoteDir>
207+ <Operation>1</Operation>
208+ </Platform>
194209 </DeployClass>
210+ <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
211+ <Platform Name="Android64">
212+ <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
213+ <Operation>1</Operation>
214+ </Platform>
215+ </DeployClass>
195216 <DeployClass Name="AndroidLibnativeMipsFile">
196217 <Platform Name="Android">
197218 <RemoteDir>library\lib\mips</RemoteDir>
198219 <Operation>1</Operation>
199220 </Platform>
221+ <Platform Name="Android64">
222+ <RemoteDir>library\lib\mips</RemoteDir>
223+ <Operation>1</Operation>
224+ </Platform>
200225 </DeployClass>
201226 <DeployClass Name="AndroidServiceOutput">
202227 <Platform Name="Android">
@@ -203,12 +228,26 @@
203228 <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
204229 <Operation>1</Operation>
205230 </Platform>
231+ <Platform Name="Android64">
232+ <RemoteDir>library\lib\arm64-v8a</RemoteDir>
233+ <Operation>1</Operation>
234+ </Platform>
206235 </DeployClass>
236+ <DeployClass Name="AndroidServiceOutput_Android32">
237+ <Platform Name="Android64">
238+ <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
239+ <Operation>1</Operation>
240+ </Platform>
241+ </DeployClass>
207242 <DeployClass Name="AndroidSplashImageDef">
208243 <Platform Name="Android">
209244 <RemoteDir>res\drawable</RemoteDir>
210245 <Operation>1</Operation>
211246 </Platform>
247+ <Platform Name="Android64">
248+ <RemoteDir>res\drawable</RemoteDir>
249+ <Operation>1</Operation>
250+ </Platform>
212251 </DeployClass>
213252 <DeployClass Name="AndroidSplashStyles">
214253 <Platform Name="Android">
@@ -215,6 +254,10 @@
215254 <RemoteDir>res\values</RemoteDir>
216255 <Operation>1</Operation>
217256 </Platform>
257+ <Platform Name="Android64">
258+ <RemoteDir>res\values</RemoteDir>
259+ <Operation>1</Operation>
260+ </Platform>
218261 </DeployClass>
219262 <DeployClass Name="AndroidSplashStylesV21">
220263 <Platform Name="Android">
@@ -221,6 +264,10 @@
221264 <RemoteDir>res\values-v21</RemoteDir>
222265 <Operation>1</Operation>
223266 </Platform>
267+ <Platform Name="Android64">
268+ <RemoteDir>res\values-v21</RemoteDir>
269+ <Operation>1</Operation>
270+ </Platform>
224271 </DeployClass>
225272 <DeployClass Name="Android_Colors">
226273 <Platform Name="Android">
@@ -227,6 +274,10 @@
227274 <RemoteDir>res\values</RemoteDir>
228275 <Operation>1</Operation>
229276 </Platform>
277+ <Platform Name="Android64">
278+ <RemoteDir>res\values</RemoteDir>
279+ <Operation>1</Operation>
280+ </Platform>
230281 </DeployClass>
231282 <DeployClass Name="Android_DefaultAppIcon">
232283 <Platform Name="Android">
@@ -233,6 +284,10 @@
233284 <RemoteDir>res\drawable</RemoteDir>
234285 <Operation>1</Operation>
235286 </Platform>
287+ <Platform Name="Android64">
288+ <RemoteDir>res\drawable</RemoteDir>
289+ <Operation>1</Operation>
290+ </Platform>
236291 </DeployClass>
237292 <DeployClass Name="Android_LauncherIcon144">
238293 <Platform Name="Android">
@@ -239,6 +294,10 @@
239294 <RemoteDir>res\drawable-xxhdpi</RemoteDir>
240295 <Operation>1</Operation>
241296 </Platform>
297+ <Platform Name="Android64">
298+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
299+ <Operation>1</Operation>
300+ </Platform>
242301 </DeployClass>
243302 <DeployClass Name="Android_LauncherIcon36">
244303 <Platform Name="Android">
@@ -245,6 +304,10 @@
245304 <RemoteDir>res\drawable-ldpi</RemoteDir>
246305 <Operation>1</Operation>
247306 </Platform>
307+ <Platform Name="Android64">
308+ <RemoteDir>res\drawable-ldpi</RemoteDir>
309+ <Operation>1</Operation>
310+ </Platform>
248311 </DeployClass>
249312 <DeployClass Name="Android_LauncherIcon48">
250313 <Platform Name="Android">
@@ -251,6 +314,10 @@
251314 <RemoteDir>res\drawable-mdpi</RemoteDir>
252315 <Operation>1</Operation>
253316 </Platform>
317+ <Platform Name="Android64">
318+ <RemoteDir>res\drawable-mdpi</RemoteDir>
319+ <Operation>1</Operation>
320+ </Platform>
254321 </DeployClass>
255322 <DeployClass Name="Android_LauncherIcon72">
256323 <Platform Name="Android">
@@ -257,6 +324,10 @@
257324 <RemoteDir>res\drawable-hdpi</RemoteDir>
258325 <Operation>1</Operation>
259326 </Platform>
327+ <Platform Name="Android64">
328+ <RemoteDir>res\drawable-hdpi</RemoteDir>
329+ <Operation>1</Operation>
330+ </Platform>
260331 </DeployClass>
261332 <DeployClass Name="Android_LauncherIcon96">
262333 <Platform Name="Android">
@@ -263,6 +334,10 @@
263334 <RemoteDir>res\drawable-xhdpi</RemoteDir>
264335 <Operation>1</Operation>
265336 </Platform>
337+ <Platform Name="Android64">
338+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
339+ <Operation>1</Operation>
340+ </Platform>
266341 </DeployClass>
267342 <DeployClass Name="Android_NotificationIcon24">
268343 <Platform Name="Android">
@@ -269,6 +344,10 @@
269344 <RemoteDir>res\drawable-mdpi</RemoteDir>
270345 <Operation>1</Operation>
271346 </Platform>
347+ <Platform Name="Android64">
348+ <RemoteDir>res\drawable-mdpi</RemoteDir>
349+ <Operation>1</Operation>
350+ </Platform>
272351 </DeployClass>
273352 <DeployClass Name="Android_NotificationIcon36">
274353 <Platform Name="Android">
@@ -275,6 +354,10 @@
275354 <RemoteDir>res\drawable-hdpi</RemoteDir>
276355 <Operation>1</Operation>
277356 </Platform>
357+ <Platform Name="Android64">
358+ <RemoteDir>res\drawable-hdpi</RemoteDir>
359+ <Operation>1</Operation>
360+ </Platform>
278361 </DeployClass>
279362 <DeployClass Name="Android_NotificationIcon48">
280363 <Platform Name="Android">
@@ -281,6 +364,10 @@
281364 <RemoteDir>res\drawable-xhdpi</RemoteDir>
282365 <Operation>1</Operation>
283366 </Platform>
367+ <Platform Name="Android64">
368+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
369+ <Operation>1</Operation>
370+ </Platform>
284371 </DeployClass>
285372 <DeployClass Name="Android_NotificationIcon72">
286373 <Platform Name="Android">
@@ -287,6 +374,10 @@
287374 <RemoteDir>res\drawable-xxhdpi</RemoteDir>
288375 <Operation>1</Operation>
289376 </Platform>
377+ <Platform Name="Android64">
378+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
379+ <Operation>1</Operation>
380+ </Platform>
290381 </DeployClass>
291382 <DeployClass Name="Android_NotificationIcon96">
292383 <Platform Name="Android">
@@ -293,6 +384,10 @@
293384 <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
294385 <Operation>1</Operation>
295386 </Platform>
387+ <Platform Name="Android64">
388+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
389+ <Operation>1</Operation>
390+ </Platform>
296391 </DeployClass>
297392 <DeployClass Name="Android_SplashImage426">
298393 <Platform Name="Android">
@@ -299,6 +394,10 @@
299394 <RemoteDir>res\drawable-small</RemoteDir>
300395 <Operation>1</Operation>
301396 </Platform>
397+ <Platform Name="Android64">
398+ <RemoteDir>res\drawable-small</RemoteDir>
399+ <Operation>1</Operation>
400+ </Platform>
302401 </DeployClass>
303402 <DeployClass Name="Android_SplashImage470">
304403 <Platform Name="Android">
@@ -305,6 +404,10 @@
305404 <RemoteDir>res\drawable-normal</RemoteDir>
306405 <Operation>1</Operation>
307406 </Platform>
407+ <Platform Name="Android64">
408+ <RemoteDir>res\drawable-normal</RemoteDir>
409+ <Operation>1</Operation>
410+ </Platform>
308411 </DeployClass>
309412 <DeployClass Name="Android_SplashImage640">
310413 <Platform Name="Android">
@@ -311,6 +414,10 @@
311414 <RemoteDir>res\drawable-large</RemoteDir>
312415 <Operation>1</Operation>
313416 </Platform>
417+ <Platform Name="Android64">
418+ <RemoteDir>res\drawable-large</RemoteDir>
419+ <Operation>1</Operation>
420+ </Platform>
314421 </DeployClass>
315422 <DeployClass Name="Android_SplashImage960">
316423 <Platform Name="Android">
@@ -317,6 +424,10 @@
317424 <RemoteDir>res\drawable-xlarge</RemoteDir>
318425 <Operation>1</Operation>
319426 </Platform>
427+ <Platform Name="Android64">
428+ <RemoteDir>res\drawable-xlarge</RemoteDir>
429+ <Operation>1</Operation>
430+ </Platform>
320431 </DeployClass>
321432 <DeployClass Name="Android_Strings">
322433 <Platform Name="Android">
@@ -323,6 +434,10 @@
323434 <RemoteDir>res\values</RemoteDir>
324435 <Operation>1</Operation>
325436 </Platform>
437+ <Platform Name="Android64">
438+ <RemoteDir>res\values</RemoteDir>
439+ <Operation>1</Operation>
440+ </Platform>
326441 </DeployClass>
327442 <DeployClass Name="DebugSymbols">
328443 <Platform Name="iOSSimulator">
@@ -392,6 +507,9 @@
392507 <Platform Name="Android">
393508 <Operation>0</Operation>
394509 </Platform>
510+ <Platform Name="Android64">
511+ <Operation>0</Operation>
512+ </Platform>
395513 <Platform Name="iOSDevice32">
396514 <Operation>0</Operation>
397515 </Platform>
@@ -679,6 +797,9 @@
679797 <Platform Name="Android">
680798 <Operation>1</Operation>
681799 </Platform>
800+ <Platform Name="Android64">
801+ <Operation>1</Operation>
802+ </Platform>
682803 </DeployClass>
683804 <DeployClass Name="ProjectiOSDeviceDebug">
684805 <Platform Name="iOSDevice32">
@@ -722,6 +843,10 @@
722843 <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
723844 <Operation>1</Operation>
724845 </Platform>
846+ <Platform Name="Android64">
847+ <RemoteDir>library\lib\arm64-v8a</RemoteDir>
848+ <Operation>1</Operation>
849+ </Platform>
725850 <Platform Name="iOSDevice32">
726851 <Operation>1</Operation>
727852 </Platform>
@@ -744,6 +869,12 @@
744869 <Operation>0</Operation>
745870 </Platform>
746871 </DeployClass>
872+ <DeployClass Name="ProjectOutput_Android32">
873+ <Platform Name="Android64">
874+ <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
875+ <Operation>1</Operation>
876+ </Platform>
877+ </DeployClass>
747878 <DeployClass Name="ProjectUWPManifest">
748879 <Platform Name="Win32">
749880 <Operation>1</Operation>
@@ -781,6 +912,7 @@
781912 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
782913 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
783914 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
915+ <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
784916 </Deployment>
785917 <ModelSupport>False</ModelSupport>
786918 </BorlandProject>
--- trunk/utl/Package Manager/src/UFunctions.pas (revision 493)
+++ trunk/utl/Package Manager/src/UFunctions.pas (revision 494)
@@ -318,43 +318,50 @@
318318
319319 WriteLnToDevice('├ Pacotes requeridos');
320320
321- for var i: Word := 0 to Pred(Length(DMI.RequiredPackages)) do
321+ if Length(DMI.RequiredPackages) > 0 then
322+ for var i: Word := 0 to Pred(Length(DMI.RequiredPackages)) do
323+ begin
324+ if i < High(DMI.RequiredPackages) then
325+ WriteToDevice('│ ├ ' + DMI.RequiredPackages[i].ItemName)
326+ else
327+ WriteToDevice('│ └ ' + DMI.RequiredPackages[i].ItemName);
328+
329+ NormVideo;
330+ WriteLnToDevice;
331+ end
332+ else
322333 begin
323- if i < High(DMI.RequiredPackages) then
324- WriteToDevice('│ ├ ' + DMI.RequiredPackages[i].ItemName)
325- else
326- WriteToDevice('│ └ ' + DMI.RequiredPackages[i].ItemName);
327-
334+ WriteLnToDevice('│ └ <Nenhum>');
328335 NormVideo;
329- WriteLnToDevice;
330336 end;
331337
332338 WriteLnToDevice('├ Units inclusas');
333339
334- for var i: Word := 0 to Pred(Length(DMI.ContainedUnits)) do
335- begin
336- if i < High(DMI.ContainedUnits) then
337- WriteToDevice('│ ├ ' + DMI.ContainedUnits[i].ItemName + '.dcu ')
338- else
339- WriteToDevice('│ └ ' + DMI.ContainedUnits[i].ItemName + '.dcu ');
340+ if Length(DMI.ContainedUnits) > 0 then
341+ for var i: Word := 0 to Pred(Length(DMI.ContainedUnits)) do
342+ begin
343+ if i < High(DMI.ContainedUnits) then
344+ WriteToDevice('│ ├ ' + DMI.ContainedUnits[i].ItemName + '.dcu ')
345+ else
346+ WriteToDevice('│ └ ' + DMI.ContainedUnits[i].ItemName + '.dcu ');
340347
341- TextColor(Red);
342- if idMainUnit in DMI.ContainedUnits[i].ItemDetails then
343- WriteToDevice('<Main Unit>');
348+ TextColor(Red);
349+ if idMainUnit in DMI.ContainedUnits[i].ItemDetails then
350+ WriteToDevice('<Main Unit>');
344351
345- if idPackageUnit in DMI.ContainedUnits[i].ItemDetails then
346- WriteToDevice('<Package Unit>');
352+ if idPackageUnit in DMI.ContainedUnits[i].ItemDetails then
353+ WriteToDevice('<Package Unit>');
347354
348- if idOriginalWeakPackageUnit in DMI.ContainedUnits[i].ItemDetails then
349- WriteToDevice('<Weak Package Unit>')
350- else if idWeakPackageUnit in DMI.ContainedUnits[i].ItemDetails then
351- WriteToDevice('<Imported Weak Package Unit>');
355+ if idOriginalWeakPackageUnit in DMI.ContainedUnits[i].ItemDetails then
356+ WriteToDevice('<Weak Package Unit>')
357+ else if idWeakPackageUnit in DMI.ContainedUnits[i].ItemDetails then
358+ WriteToDevice('<Imported Weak Package Unit>');
352359
353- if idImplicitlyImported in DMI.ContainedUnits[i].ItemDetails then
354- WriteToDevice('<ImplicitlyImported>');
355- NormVideo;
356- WriteLnToDevice;
357- end;
360+ if idImplicitlyImported in DMI.ContainedUnits[i].ItemDetails then
361+ WriteToDevice('<ImplicitlyImported>');
362+ NormVideo;
363+ WriteLnToDevice;
364+ end;
358365
359366 WriteLnToDevice('└ Módulo do pacote');
360367 WriteLnToDevice(' └ ' + DMI.PackageModule.ItemName + '.dcp');
Show on old repository browser