[JVCL-Checkins] SF.net SVN: jvcl:[12664] trunk/jvcl/install/JVCLInstall/JVCLData.pas

[<ah...@us...>]

Revision: 12664
          http://jvcl.svn.sourceforge.net/jvcl/?rev=12664&view=rev
Author:   ahuser
Date:     2010-01-07 19:27:43 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
Fixed modified package check

Modified Paths:
--------------
    trunk/jvcl/install/JVCLInstall/JVCLData.pas

Modified: trunk/jvcl/install/JVCLInstall/JVCLData.pas
===================================================================
--- trunk/jvcl/install/JVCLInstall/JVCLData.pas	2010-01-07 19:04:26 UTC (rev 12663)
+++ trunk/jvcl/install/JVCLInstall/JVCLData.pas	2010-01-07 19:27:43 UTC (rev 12664)
@@ -899,15 +899,12 @@
 end;
 
 function TTargetConfig.VersionedJVCLXmlDcp(const Name: string): string;
-var
-  Suffix: string;
 begin
   { TODO : Keep in sync with JVCL naming schema }
-  if Target.IsBCB then
-    Suffix := Format('C%d', [Target.Version])
+  if EndsWith(Name, '-R', True) or EndsWith(Name, '-D', True) then
+    Result := Copy(Name, 1, Length(Name) - 2) + '.dcp'
   else
-    Suffix := Format('D%d', [Target.Version]);
-  Result := StringReplace(Name, '-', Suffix, []) + '.dcp';
+    Result := Name;
 end;
 
 function TTargetConfig.VersionedJVCLXmlBpl(const Name: string): string;
@@ -915,11 +912,17 @@
   Suffix: string;
 begin
   { TODO : Keep in sync with JVCL naming schema }
-  if Target.IsBCB then
-    Suffix := Format('C%d', [Target.Version])
+  if Target.Version >= 7 then
+    Suffix := Format('%d0', [Target.Version])
+  else if Target.IsBCB then
+    Suffix := Format('C%d0', [Target.Version])
   else
-    Suffix := Format('D%d', [Target.Version]);
-  Result := StringReplace(Name, '-', Suffix, []) + '.bpl';
+    Suffix := Format('D%d0', [Target.Version]);
+
+  if EndsWith(Name, '-R', True) or EndsWith(Name, '-D', True) then
+    Result := Copy(Name, 1, Length(Name) - 2) + Suffix + '.bpl'
+  else
+    Result := Name;
 end;
 
 function TTargetConfig.LinkMapFile(const BinaryFileName, MapFileName: string;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.