diff options
| -rw-r--r-- | Make.lps | 129 | ||||
| -rw-r--r-- | dateibeziehungen.pas | 4 |
2 files changed, 67 insertions, 66 deletions
@@ -9,22 +9,23 @@ <IsPartOfProject Value="True"/> <TopLine Value="47"/> <CursorPos X="16" Y="70"/> - <UsageCount Value="93"/> + <UsageCount Value="98"/> <Loaded Value="True"/> </Unit0> <Unit1> <Filename Value="Machdatei.txt"/> <IsPartOfProject Value="True"/> - <UsageCount Value="93"/> + <UsageCount Value="98"/> <DefaultSyntaxHighlighter Value="None"/> </Unit1> <Unit2> <Filename Value="tools.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="4"/> - <TopLine Value="189"/> + <TopLine Value="279"/> <CursorPos X="29" Y="190"/> - <UsageCount Value="72"/> + <UsageCount Value="77"/> <Loaded Value="True"/> </Unit2> <Unit3> @@ -33,39 +34,38 @@ <EditorIndex Value="2"/> <TopLine Value="288"/> <CursorPos X="14" Y="322"/> - <UsageCount Value="69"/> + <UsageCount Value="74"/> <Loaded Value="True"/> </Unit3> <Unit4> <Filename Value="dateibeziehungen.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="dateiBeziehungen"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="1009"/> - <CursorPos X="41" Y="1036"/> + <TopLine Value="1017"/> + <CursorPos X="80" Y="1036"/> <FoldState Value=" T3k003C pjYkO0A3315"/> - <UsageCount Value="61"/> + <UsageCount Value="66"/> <Loaded Value="True"/> </Unit4> <Unit5> <Filename Value="Machdatei"/> <CursorPos X="45" Y="17"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> <DefaultSyntaxHighlighter Value="None"/> </Unit5> <Unit6> <Filename Value="../Stabile/lowlevelunit.pas"/> <EditorIndex Value="-1"/> <CursorPos X="26" Y="23"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit6> <Unit7> <Filename Value="../units/lowlevelunit.pas"/> <EditorIndex Value="3"/> - <TopLine Value="857"/> - <CursorPos X="18" Y="862"/> - <UsageCount Value="12"/> + <TopLine Value="1295"/> + <CursorPos X="81" Y="1311"/> + <UsageCount Value="15"/> <Loaded Value="True"/> </Unit7> <Unit8> @@ -73,40 +73,40 @@ <EditorIndex Value="-1"/> <TopLine Value="140"/> <CursorPos X="10" Y="160"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit8> <Unit9> <Filename Value="/usr/lib/fpc/src/rtl/objpas/math.pp"/> <EditorIndex Value="-1"/> <TopLine Value="162"/> <CursorPos X="10" Y="167"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit9> <Unit10> <Filename Value="../units/matheunit.pas"/> <EditorIndex Value="-1"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit10> <Unit11> <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/finah.inc"/> <EditorIndex Value="-1"/> <TopLine Value="4"/> <CursorPos X="10" Y="23"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit11> <Unit12> <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="743"/> <CursorPos X="14" Y="763"/> - <UsageCount Value="10"/> + <UsageCount Value="9"/> </Unit12> <Unit13> <Filename Value="../units/systemunit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="228"/> <CursorPos Y="252"/> - <UsageCount Value="15"/> + <UsageCount Value="14"/> </Unit13> <Unit14> <Filename Value="/usr/lib/fpc/src/packages/fcl-base/src/custapp.pp"/> @@ -114,142 +114,143 @@ <EditorIndex Value="-1"/> <TopLine Value="516"/> <CursorPos X="61" Y="411"/> - <UsageCount Value="8"/> + <UsageCount Value="7"/> </Unit14> <Unit15> <Filename Value="/usr/lib/fpc/src/rtl/inc/objpash.inc"/> <EditorIndex Value="-1"/> <TopLine Value="173"/> <CursorPos X="23" Y="193"/> - <UsageCount Value="10"/> + <UsageCount Value="9"/> </Unit15> <Unit16> <Filename Value="Make.1.in"/> <EditorIndex Value="-1"/> <TopLine Value="42"/> - <UsageCount Value="10"/> + <UsageCount Value="9"/> <DefaultSyntaxHighlighter Value="None"/> </Unit16> </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1016" Column="13" TopLine="996"/> + <Caret Line="41" Column="43" TopLine="12"/> </Position1> <Position2> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="97" Column="5" TopLine="79"/> + <Caret Line="89" Column="27" TopLine="67"/> </Position2> <Position3> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="32" Column="3" TopLine="14"/> + <Caret Line="175" Column="80" TopLine="124"/> </Position3> <Position4> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="16" Column="3"/> + <Caret Line="177" Column="34" TopLine="124"/> </Position4> <Position5> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="15" Column="54"/> + <Caret Line="282" Column="39" TopLine="139"/> </Position5> <Position6> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="14"/> + <Caret Line="585" Column="35" TopLine="556"/> </Position6> <Position7> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1013" Column="24" TopLine="995"/> + <Caret Line="680" Column="23" TopLine="652"/> </Position7> <Position8> <Filename Value="dateibeziehungen.pas"/> + <Caret Line="89" Column="18" TopLine="71"/> </Position8> <Position9> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="14" Column="26"/> + <Caret Line="670" Column="38" TopLine="641"/> </Position9> <Position10> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="32" Column="58" TopLine="3"/> + <Caret Line="1042" Column="14" TopLine="1021"/> </Position10> <Position11> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="33" Column="63" TopLine="4"/> + <Caret Line="1033" Column="55" TopLine="1021"/> </Position11> <Position12> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="35" Column="58" TopLine="6"/> + <Caret Line="1019" Column="69" TopLine="1007"/> </Position12> <Position13> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="40" Column="46" TopLine="11"/> + <Caret Line="89" Column="18" TopLine="71"/> </Position13> <Position14> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="41" Column="43" TopLine="12"/> + <Caret Line="670" Column="38" TopLine="641"/> </Position14> <Position15> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="89" Column="27" TopLine="67"/> + <Caret Line="1030" TopLine="1000"/> </Position15> <Position16> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="175" Column="80" TopLine="124"/> + <Filename Value="tools.pas"/> + <Caret Line="41" Column="11" TopLine="24"/> </Position16> <Position17> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="177" Column="34" TopLine="124"/> + <Caret Line="357" Column="35" TopLine="342"/> </Position17> <Position18> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="282" Column="39" TopLine="139"/> + <Caret Line="1036" Column="41" TopLine="1009"/> </Position18> <Position19> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="585" Column="35" TopLine="556"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="862" Column="18" TopLine="857"/> </Position19> <Position20> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="680" Column="23" TopLine="652"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="147" TopLine="127"/> </Position20> <Position21> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="89" Column="18" TopLine="71"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1288" Column="21" TopLine="1270"/> </Position21> <Position22> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="670" Column="38" TopLine="641"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="146" Column="55" TopLine="128"/> </Position22> <Position23> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1042" Column="14" TopLine="1021"/> + <Caret Line="1034" Column="48" TopLine="1013"/> </Position23> <Position24> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1033" Column="55" TopLine="1021"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1296" Column="22" TopLine="1278"/> </Position24> <Position25> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1019" Column="69" TopLine="1007"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1299" Column="28" TopLine="1278"/> </Position25> <Position26> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="89" Column="18" TopLine="71"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1305" Column="28" TopLine="1282"/> </Position26> <Position27> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="670" Column="38" TopLine="641"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1301" Column="38" TopLine="1283"/> </Position27> <Position28> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1030" TopLine="1000"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1305" Column="35" TopLine="1287"/> </Position28> <Position29> - <Filename Value="tools.pas"/> - <Caret Line="41" Column="11" TopLine="24"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1309" Column="43" TopLine="1287"/> </Position29> <Position30> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="357" Column="35" TopLine="342"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1313" Column="16" TopLine="1296"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas index 22ce0b5..6c3958a 100644 --- a/dateibeziehungen.pas +++ b/dateibeziehungen.pas @@ -1031,9 +1031,9 @@ begin lokTest:=tRegExpr.create; if (ausgabeDatei='') or (extractfilepath(ausgabeDatei)=extractfilepath(pruefsummenDatei)) then - lokTest.expression:='^'+extractfilepath(pruefsummenDatei) + lokTest.expression:=unterVerzeichnisRegex([pruefsummenDatei]) else - lokTest.expression:='^('+extractfilepath(ausgabeDatei)+'|'+extractfilepath(pruefsummenDatei)+')'; + lokTest.expression:=unterVerzeichnisRegex([ausgabeDatei,pruefsummenDatei]); for i:=0 to befehle.count-1 do testeObBefehlLokal(befehle[i],extractfiledir(ausgabeDatei),geaenderteDateien,lokTest); lokTest.free; |