Explorar o código

* Undo last patch, too much committed

michael %!s(int64=5) %!d(string=hai) anos
pai
achega
7dc3c9659f

+ 3 - 2
demo/fpcunit/browsertest.lpi

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <ProjectOptions>
+  <ProjectOptions BuildModesCount="1">
     <Version Value="12"/>
     <General>
       <Flags>
@@ -10,11 +10,12 @@
         <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
+      <MainUnit Value="0"/>
       <Title Value="browsertest"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes Count="1">
+    <BuildModes>
       <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>

+ 3 - 78
demo/fpcunit/browsertest.lpr

@@ -1,91 +1,16 @@
 program browsertest;
 
 uses
-  SysUtils, TypInfo,BrowserTestRunner, demotests, frmrunform;
+  SysUtils, BrowserTestRunner, demotests, frmrunform;
 
 Var
   Application : TTestRunner;
 
-Type
-
-  { TMyMethod }
-{$M+}
-  TMyMethod = Class(TObject)
-  Public
-    Class Function MyMethodAddress (aName : String) : Pointer;
-  Published
-    Procedure DoIt;
-  end;
-
-  { TMyMethod2 }
-
-  TMyMethod2 = Class(TMyMethod)
-  Published
-    Procedure DoIt2;
-  end;
-
-{ TMyMethod2 }
-
-procedure TMyMethod2.DoIt2;
-begin
-  Writeln('OK 2');
-end;
-
-{ TMyMethod }
-
-class function TMyMethod.MyMethodAddress(aName: String): Pointer;
-
-Var
-  i : integer;
-  TI : TTypeInfoClass;
-  N,MN : String;
-
 begin
-  Result:=nil;
-  N:=LowerCase(aName);
-  TI:=TypeInfo(Self);
-  MN:='';
-  While (MN='') and Assigned(TI) do
-    begin
-    I:=0;
-    While (MN='') and (I<TI.MethodCount) do
-      begin
-      If TI.GetMethod(i).Name=aName then
-        MN:=TI.GetMethod(i).Name;
-      Inc(I);
-      end;
-    if MN='' then
-      TI:=TI.Ancestor;
-    end;
-  if MN<>'' then
-    asm
-    return this[MN];
-    end;
-end;
-
-procedure TMyMethod.DoIt;
-begin
-  Writeln('Doit 1');
-end;
-
-Var
-  A : TMyMethod;
-  B : TMyMethod2;
-
-begin
-  A:=TMyMethod.Create();
-  A.Doit;
-  B:=TMyMethod2.Create();
-  B.Doit2;
-
-  Writeln('Doit A',A.MyMethodAddress('doit')<>Nil);
-  Writeln('Doit B',B.MyMethodAddress('doit')<>Nil);
-  Writeln('Doit2 A',A.MyMethodAddress('doit2')<>Nil);
-  Writeln('Doit2 B',B.MyMethodAddress('doit2')<>Nil);
-{  Application:=TTestRunner.Create(Nil);
+  Application:=TTestRunner.Create(Nil);
   Application.RunFormClass:=TTestRunForm;
   Application.Initialize;
   Application.Run;
-  Application.Free;}
+  Application.Free;
 end.
 

+ 1 - 1
demo/webwidget/designdemo/designdemo.lpr

@@ -1,7 +1,7 @@
 program designdemo;
 
 {$mode objfpc}
-{ $DEFINE USEIDE}
+{$DEFINE USEIDE}
 
 uses
   browserapp, JS, Classes, SysUtils, Web, designer, webideclient;

+ 1 - 3
packages/rtl/pas2js_rtl.lpk

@@ -32,9 +32,7 @@
         <CompilerPath Value="pas2js"/>
         <ExecuteBefore>
           <Command Value="$MakeExe(IDE,pas2js) -O- -Jc -vbq pas2js_rtl.pas"/>
-          <Parsers Count="1">
-            <Item1 Value="Pas2JS"/>
-          </Parsers>
+          <ScanForFPCMsgs Value="True"/>
         </ExecuteBefore>
       </Other>
       <SkipCompiler Value="True"/>