Explorar o código

Merged revision(s) 33435-33436 from trunk:
* pas2jni: Fixed exit code.
........
* pas2jni: Minor fix to exe extension.
........

git-svn-id: branches/fixes_3_0@33437 -

yury %!s(int64=9) %!d(string=hai) anos
pai
achega
30c1bd9125
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 3 3
      utils/pas2jni/pas2jni.pas
  2. 1 1
      utils/pas2jni/ppuparser.pas

+ 3 - 3
utils/pas2jni/pas2jni.pas

@@ -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.
 

+ 1 - 1
utils/pas2jni/ppuparser.pas

@@ -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