paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-30 21:00:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 33435-33436 from trunk:

Browse Source 
* pas2jni: Fixed exit code.
........
* pas2jni: Minor fix to exe extension.
........

git-svn-id: branches/fixes_3_0@33437 -
This commit is contained in:
yury 2016-04-07 13:25:44 +00:00
parent f7e1b90f59
commit 30c1bd9125
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/pas2jni/pas2jni.pas
View File

@ -76,7 +76,7 @@ begin
Result:=False;
if ParamCount = 0 then begin
ShowUsage;
ErrorCode:=1;
ExitCode:=1;
exit;
end;
for i:=1 to Paramcount do begin
@ -158,7 +158,7 @@ begin
else
begin
writeln('Illegal parameter: -', s);
ErrorCode:=1;
ExitCode:=1;
exit;
end;
end;
@ -187,7 +187,7 @@ begin
end;
except
writeln(Exception(ExceptObject).Message);
ErrorCode:=2;
ExitCode:=2;
end;
end.

2
utils/pas2jni/ppuparser.pas
View File

@ -737,7 +737,7 @@ var
i, j: integer;
begin
try
fpc:=ExtractFilePath(ppudumpprog) + 'fpc' + ExtractFileExt(ppudumpprog);
fpc:=ExtractFilePath(ppudumpprog) + 'fpc' + ExtractFileExt(ParamStr(0));
if not FileExists(fpc) then
exit;
// Find the compiler binary