diff options
| -rw-r--r-- | Make.lps | 78 | ||||
| -rw-r--r-- | dateibeziehungen.pas | 8 | ||||
| -rw-r--r-- | tools.pas | 5 |
3 files changed, 50 insertions, 41 deletions
@@ -9,7 +9,6 @@ <IsPartOfProject Value="True"/> <TopLine Value="2"/> <CursorPos Y="26"/> - <FoldState Value=" T3P0ns"/> <UsageCount Value="85"/> <Loaded Value="True"/> </Unit0> @@ -22,10 +21,11 @@ <Unit2> <Filename Value="tools.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="2"/> - <TopLine Value="39"/> - <CursorPos Y="64"/> - <FoldState Value=" T3iF03B pibjN0K1 pj4jS0D4]91jT07,"/> + <TopLine Value="365"/> + <CursorPos X="52" Y="383"/> + <FoldState Value=" T3iF03B pibjN0K1 pj4jS0D311w"/> <UsageCount Value="64"/> <Loaded Value="True"/> </Unit2> @@ -42,10 +42,10 @@ <Filename Value="dateibeziehungen.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="dateiBeziehungen"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="54"/> - <FoldState Value=" T3k103C pjYkO0A4]9DjX0n3]97kL0P8]91k5071[R4I042 piel70G]9k1kN033("/> + <TopLine Value="970"/> + <CursorPos X="48" Y="995"/> + <FoldState Value=" T3k103C pjYkO0A4]9DjX0n3]97kL0P8]91k5071[R4I042 piel70G114I"/> <UsageCount Value="53"/> <Loaded Value="True"/> </Unit4> @@ -127,121 +127,121 @@ <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="322" Column="9" TopLine="289"/> + <Caret Line="491" Column="9" TopLine="316"/> </Position1> <Position2> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="485" Column="9" TopLine="310"/> + <Caret Line="492" Column="9" TopLine="317"/> </Position2> <Position3> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="491" Column="9" TopLine="316"/> + <Caret Line="499" Column="21" TopLine="324"/> </Position3> <Position4> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="492" Column="9" TopLine="317"/> + <Caret Line="500" Column="14" TopLine="325"/> </Position4> <Position5> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="499" Column="21" TopLine="324"/> + <Caret Line="594" Column="12" TopLine="476"/> </Position5> <Position6> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="500" Column="14" TopLine="325"/> </Position6> <Position7> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="594" Column="12" TopLine="476"/> + <Caret Line="89" Column="12" TopLine="56"/> </Position7> <Position8> <Filename Value="dateibeziehungen.pas"/> + <Caret Line="486" Column="14" TopLine="311"/> </Position8> <Position9> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="89" Column="12" TopLine="56"/> + <Caret Line="627" Column="10" TopLine="594"/> </Position9> <Position10> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="486" Column="14" TopLine="311"/> + <Caret Line="635" Column="16" TopLine="602"/> </Position10> <Position11> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="627" Column="10" TopLine="594"/> + <Caret Line="636" Column="12" TopLine="603"/> </Position11> <Position12> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="635" Column="16" TopLine="602"/> + <Caret Line="637" Column="10" TopLine="604"/> </Position12> <Position13> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="636" Column="12" TopLine="603"/> + <Caret Line="672" Column="22" TopLine="616"/> </Position13> <Position14> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="637" Column="10" TopLine="604"/> + <Caret Line="673" Column="15" TopLine="617"/> </Position14> <Position15> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="672" Column="22" TopLine="616"/> + <Caret Line="674" Column="14" TopLine="618"/> </Position15> <Position16> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="673" Column="15" TopLine="617"/> </Position16> <Position17> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="674" Column="14" TopLine="618"/> + <Caret Line="90" TopLine="56"/> </Position17> <Position18> <Filename Value="dateibeziehungen.pas"/> + <Caret Line="292" TopLine="219"/> </Position18> <Position19> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="90" TopLine="56"/> + <Caret Line="311" TopLine="291"/> </Position19> <Position20> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="292" TopLine="219"/> + <Caret Line="471" TopLine="403"/> </Position20> <Position21> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="311" TopLine="291"/> + <Caret Line="560" TopLine="471"/> </Position21> <Position22> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="471" TopLine="403"/> + <Caret Line="588" TopLine="568"/> </Position22> <Position23> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="560" TopLine="471"/> + <Caret Line="595" TopLine="575"/> </Position23> <Position24> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="588" TopLine="568"/> + <Caret Line="625" TopLine="598"/> </Position24> <Position25> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="595" TopLine="575"/> + <Caret Line="928" Column="30" TopLine="908"/> </Position25> <Position26> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="625" TopLine="598"/> + <Filename Value="tools.pas"/> + <Caret Line="124" TopLine="45"/> </Position26> <Position27> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="928" Column="30" TopLine="908"/> + <Filename Value="tools.pas"/> + <Caret Line="112" Column="28" TopLine="88"/> </Position27> <Position28> <Filename Value="tools.pas"/> - <Caret Line="124" TopLine="45"/> + <Caret Line="32" Column="41" TopLine="12"/> </Position28> <Position29> - <Filename Value="tools.pas"/> - <Caret Line="112" Column="28" TopLine="88"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="116" Column="29" TopLine="98"/> </Position29> <Position30> - <Filename Value="tools.pas"/> - <Caret Line="32" Column="41" TopLine="12"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="952" Column="30" TopLine="687"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas index fcaec5f..c244a79 100644 --- a/dateibeziehungen.pas +++ b/dateibeziehungen.pas @@ -949,7 +949,7 @@ var sumDateien: tStringlist; gefunden: boolean; lokTest: tRegExpr; - befehl: string; + befehl,datei,verzeichnis: string; begin befehle:=tStringlist.create; geaenderteDateien:=tStringlist.create; @@ -992,6 +992,12 @@ begin testeObBefehlLokal(befehle[i],extractfiledir(ausgabeDatei),lokTest); lokTest.free; end; + verzeichnis:=extractfilepath(pruefsummenDatei); + for i:=0 to geaenderteDateien.count-1 do begin + datei:=geaenderteDateien[i]; + if startetMit(verzeichnis,datei) then + geaenderteDateien[i]:=datei; + end; for i:=geaenderteDateien.count-1 downto 0 do begin if geaenderteDateien[i]='.uralt.' then begin geaenderteDateien.delete(i); @@ -378,7 +378,10 @@ begin rb:=0; for i:=0 to erg.count-1 do if not gut xor (rightStr(erg[i],4)=': OK') then begin - result[gut].add(leftStr(erg[i],pos(':',erg[i])-1)); + s:=leftStr(erg[i],pos(':',erg[i])-1); + if leftStr(s,1)<>'/' then + s:=extractfilepath(sumNam)+s; + result[gut].add(s); inc(rb); end; end; |