瀏覽代碼

* Check for ppudump in the same folder as pas2jni only if there is a path to pas2jni executable is available in ParamStr(0).

git-svn-id: trunk@24326 -
yury 12 年之前
父節點
當前提交
226fb92d61
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      utils/pas2jni/ppuparser.pas

+ 8 - 3
utils/pas2jni/ppuparser.pas

@@ -176,11 +176,16 @@ begin
   p:=TProcess.Create(nil);
   try
     if ppudumpprog = '' then begin
+      ppudumpprog:='ppudump';
       // Check for ppudump in the same folder as pas2jni
-      ppudumpprog:=ExtractFilePath(ParamStr(0)) + 'ppudump' + ExtractFileExt(ParamStr(0));
-      if not FileExists(ppudumpprog) then
-        ppudumpprog:='ppudump';
+      s:=ExtractFilePath(ParamStr(0));
+      if s <> '' then begin
+        s:=s + ppudumpprog + ExtractFileExt(ParamStr(0));
+        if FileExists(s) then
+          ppudumpprog:=s;
+      end;
     end;
+    writeln(ppudumpprog);
     p.Executable:=ppudumpprog;
     p.Parameters.Add(un);
     p.Options:=[poUsePipes, poNoConsole, poStderrToOutPut];