artem3213212/FasmOnDelphi
1
0
Fork 0
Code Releases Activity

Fix FPC TempDir

Browse Source
This commit is contained in:
Artem3213212
2018-03-30 12:56:16 +03:00
parent 62a5d170ba
commit baf108a37f
4 changed files with 57 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FPCTests/fpcunitproject1.lpi
View File

@@ -14,9 +14,6 @@
<i18n> <i18n>
<EnableI18N LFM="False"/> <EnableI18N LFM="False"/>
</i18n> </i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>

119
FPCTests/fpcunitproject1.lps
View File

@@ -4,42 +4,41 @@
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="10"/> <Version Value="10"/>
<BuildModes Active="Default"/> <BuildModes Active="Default"/>
<Units Count="12"> <Units Count="13">
<Unit0> <Unit0>
<Filename Value="fpcunitproject1.lpr"/> <Filename Value="fpcunitproject1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/> <CursorPos X="14" Y="13"/>
<CursorPos Y="9"/> <UsageCount Value="24"/>
<UsageCount Value="23"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="testcase1.pas"/> <Filename Value="testcase1.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="TestCase1"/> <UnitName Value="TestCase1"/>
<EditorIndex Value="2"/> <EditorIndex Value="1"/>
<TopLine Value="17"/> <TopLine Value="16"/>
<CursorPos Y="27"/> <CursorPos Y="27"/>
<UsageCount Value="23"/> <UsageCount Value="24"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="3"/> <IsVisibleTab Value="True"/>
<TopLine Value="172"/> <EditorIndex Value="2"/>
<CursorPos X="25" Y="195"/> <TopLine Value="606"/>
<UsageCount Value="23"/> <CursorPos Y="622"/>
<UsageCount Value="24"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="..\Fasm4Delphi\Source\Fasm4Delphi.pas"/> <Filename Value="..\Fasm4Delphi\Source\Fasm4Delphi.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="5"/> <EditorIndex Value="-1"/>
<TopLine Value="16"/> <TopLine Value="16"/>
<CursorPos X="3" Y="31"/> <CursorPos X="3" Y="31"/>
<UsageCount Value="23"/> <UsageCount Value="24"/>
<Loaded Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\Source\Fasm4Delphi.pas"/> <Filename Value="..\Source\Fasm4Delphi.pas"/>
@@ -87,153 +86,147 @@
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="C:\lazarus\fpc\3.0.2\source\rtl\win\wininc\base.inc"/> <Filename Value="C:\lazarus\fpc\3.0.2\source\rtl\win\wininc\base.inc"/>
<EditorIndex Value="4"/> <EditorIndex Value="-1"/>
<TopLine Value="140"/> <TopLine Value="140"/>
<CursorPos X="6" Y="169"/> <CursorPos X="6" Y="169"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="C:\lazarus\lcl\include\application.inc"/> <Filename Value="C:\lazarus\lcl\include\application.inc"/>
<EditorIndex Value="1"/> <EditorIndex Value="-1"/>
<TopLine Value="414"/> <TopLine Value="414"/>
<CursorPos Y="431"/> <CursorPos Y="431"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit11> </Unit11>
<Unit12>
<Filename Value="C:\lazarus\fpc\3.0.4\source\rtl\objpas\sysutils\osutilsh.inc"/>
<EditorIndex Value="3"/>
<CursorPos X="10" Y="36"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit12>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="200" Column="23" TopLine="175"/> <Caret Line="194" TopLine="175"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="193" Column="27" TopLine="175"/> <Caret Line="195" TopLine="175"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="191" TopLine="175"/> <Caret Line="200" TopLine="175"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="193" TopLine="175"/> <Caret Line="205" TopLine="177"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="194" TopLine="175"/> <Caret Line="623" TopLine="607"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="testcase1.pas"/>
<Caret Line="195" TopLine="175"/> <Caret Line="27" TopLine="17"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="200" TopLine="175"/> <Caret Line="622" TopLine="607"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="205" TopLine="177"/> <Caret Line="201" Column="7" TopLine="172"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="623" TopLine="607"/> <Caret Line="188" Column="20" TopLine="172"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="testcase1.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="27" TopLine="17"/> <Caret Line="191" TopLine="172"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="622" TopLine="607"/> <Caret Line="193" TopLine="172"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="201" Column="7" TopLine="172"/> <Caret Line="194" TopLine="172"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="188" Column="20" TopLine="172"/> <Caret Line="195" TopLine="172"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="191" TopLine="172"/> <Caret Line="196" Column="35" TopLine="172"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="testcase1.pas"/>
<Caret Line="193" TopLine="172"/> <Caret Line="27" TopLine="17"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="194" TopLine="172"/> <Caret Line="623" TopLine="607"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="195" TopLine="172"/> <Caret Line="190" TopLine="173"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="196" Column="35" TopLine="172"/> <Caret Line="192" TopLine="173"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="testcase1.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="27" TopLine="17"/> <Caret Line="194" TopLine="173"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="623" TopLine="607"/> <Caret Line="195" TopLine="173"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="190" TopLine="173"/> <Caret Line="196" TopLine="173"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="192" TopLine="173"/> <Caret Line="194" TopLine="173"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="194" TopLine="173"/> <Caret Line="623" TopLine="607"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="195" TopLine="173"/> <Caret Line="194" TopLine="177"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="196" TopLine="173"/> <Caret Line="195" Column="36" TopLine="177"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="194" TopLine="173"/> <Caret Line="623" Column="8" TopLine="607"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="623" TopLine="607"/> <Caret Line="33" Column="32" TopLine="16"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="194" TopLine="177"/> <Caret Line="610" Column="53" TopLine="593"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="195" Column="36" TopLine="177"/> <Caret Line="767" Column="9" TopLine="737"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="..\Source\FasmOnDelphi.pas"/> <Filename Value="..\Source\FasmOnDelphi.pas"/>
<Caret Line="623" Column="8" TopLine="607"/> <Caret Line="16" Column="28" TopLine="8"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
<Debugging>
<BreakPoints Count="1">
<Item1>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsLocal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="..\Source\FasmOnDelphi.pas"/>
<Line Value="622"/>
</Item1>
</BreakPoints>
</Debugging>
</CONFIG> </CONFIG>

BIN
FPCTests/fpcunitproject1.obj Normal file
View File

Binary file not shown.

17
Source/FasmOnDelphi.pas
View File

@@ -759,22 +759,7 @@ var
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
initialization initialization
{$IFDEF FPC} {$IFDEF FPC}
{$IFDEF MSWINDOWS} GetTempDir;
begin
SetLength(FasmTemp,MAX_PATH);
Len:=GetTempPath(MAX_PATH,PChar(FasmTemp));
if Len<>0 then
begin
Len:=GetLongPathNameA(PChar(FasmTemp),nil,0);
GetLongPathNameA(PChar(FasmTemp),PChar(FasmTemp),Len);
SetLength(FasmTemp,Len-1);
end
else
FasmTemp:='';
end;
{$ELSE}
FasmTemp:='/tmp/';
{$ENDIF}
{$ELSE} {$ELSE}
FasmTemp:=TPath.GetTempPath; FasmTemp:=TPath.GetTempPath;
{$ENDIF} {$ENDIF}