updated demos

demo/hotreload/hotreload.lpi

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <ProjectOptions>
+  <ProjectOptions BuildModesCount="1">
     <Version Value="12"/>
     <General>
       <Flags>
@@ -8,19 +8,18 @@
         <MainUnitHasTitleStatement Value="False"/>
         <MainUnitHasScaledStatement Value="False"/>
         <Runnable Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="hotreload"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <CustomData Count="2">
-      <Item0 Name="PasJSPort" Value="0"/>
-      <Item1 Name="PasJSWebBrowserProject" Value="1"/>
+    <CustomData Count="1">
+      <Item0 Name="PasJSWebBrowserProject" Value="1"/>
     </CustomData>
     <BuildModes>
-      <Item Name="Default" Default="True"/>
+      <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -30,11 +29,11 @@
       <FormatVersion Value="2"/>
       <Modes Count="0"/>
     </RunParams>
-    <Units>
-      <Unit>
+    <Units Count="1">
+      <Unit0>
         <Filename Value="hotreload.lpr"/>
         <IsPartOfProject Value="True"/>
-      </Unit>
+      </Unit0>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -43,6 +42,7 @@
       <Filename Value="hotreload"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="js"/>
     </SearchPaths>
     <Parsing>

demo/jquery/demoadd.lpi

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <ProjectOptions>
-    <Version Value="11"/>
+  <ProjectOptions BuildModesCount="1">
+    <Version Value="12"/>
     <General>
       <Flags>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
         <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="demoadd"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes Count="1">
+    <BuildModes>
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
@@ -26,11 +26,6 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
-      <Item1>
-        <PackageName Value="pas2js_rtl"/>
-      </Item1>
-    </RequiredPackages>
     <Units Count="1">
       <Unit0>
         <Filename Value="demoadd.pas"/>
@@ -46,13 +41,26 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <AllowLabel Value="False"/>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+    </Linking>
     <Other>
+      <CustomOptions Value="-Jc -Jirtl.js -Jminclude"/>
+      <CompilerPath Value="$(pas2js)"/>
       <ExecuteBefore>
         <Command Value="$MakeExe(pas2js) -Jirtl.js -Tbrowser -Fu$(ProjUnitPath) -o$NameOnly($(ProjFile)).js $Name($(ProjFile)) -O-"/>
         <ScanForFPCMsgs Value="True"/>
+        <CompileReasons Compile="False" Build="False" Run="False"/>
       </ExecuteBefore>
     </Other>
-    <CompileReasons Compile="False" Build="False" Run="False"/>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">

demo/jspdf/basic.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
@@ -10,7 +10,6 @@
         <MainUnitHasScaledStatement Value="False"/>
         <Runnable Value="False"/>
       </Flags>
-      <MainUnit Value="0"/>
       <Title Value="basic"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
@@ -19,8 +18,8 @@
       <Item0 Name="MaintainHTML" Value="1"/>
       <Item1 Name="PasJSWebBrowserProject" Value="1"/>
     </CustomData>
-    <BuildModes Count="1" Active="Default">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes Active="Default">
+      <Item Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -30,20 +29,16 @@
       <FormatVersion Value="2"/>
       <Modes Count="0"/>
     </RunParams>
-    <RequiredPackages Count="1">
-      <Item1>
-        <PackageName Value="pas2js_rtl"/>
-      </Item1>
-    </RequiredPackages>
-    <Units Count="2">
-      <Unit0>
+    <Units>
+      <Unit>
         <Filename Value="basic.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="126" Y="6"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="55" Y="16"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
+      </Unit>
+      <Unit>
         <Filename Value="basic.html"/>
         <IsPartOfProject Value="True"/>
         <CustomData Count="1">
@@ -51,7 +46,7 @@
         </CustomData>
         <UsageCount Value="20"/>
         <DefaultSyntaxHighlighter Value="HTML"/>
-      </Unit1>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -79,7 +74,7 @@
       </Debugging>
     </Linking>
     <Other>
-      <CustomOptions Value="-Jc -Jirtl.js -Jminclude -Jeutf-8 -Tbrowser"/>
+      <CustomOptions Value="-Jc -Jirtl.js -Jminclude -Jeutf-8"/>
       <CompilerPath Value="$(pas2js)"/>
     </Other>
   </CompilerOptions>

packages/fcl-base/fcl_base_pas2js.lpk

@@ -10,13 +10,21 @@
       <SearchPaths>
         <UnitOutputDirectory Value="."/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <AllowLabel Value="False"/>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
       <Other>
-        <ExecuteBefore>
-          <Command Value="$MakeExe(IDE,pas2js) -O- -Jc -vbq fcl_base_pas2js.pas"/>
-          <ScanForFPCMsgs Value="True"/>
-        </ExecuteBefore>
+        <CustomOptions Value="-Jc"/>
+        <CompilerPath Value="$(pas2js)"/>
       </Other>
-      <SkipCompiler Value="True"/>
     </CompilerOptions>
     <Description Value="Free Pascal Component Library - Base
 Port to pas2js."/>
@@ -40,11 +48,6 @@ Port to pas2js."/>
         <UnitName Value="fpexprpars"/>
       </Item4>
     </Files>
-    <RequiredPkgs Count="1">
-      <Item1>
-        <PackageName Value="pas2js_rtl"/>
-      </Item1>
-    </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>

packages/fpcunit/fpcunit_pas2js.lpk

@@ -9,11 +9,19 @@
       <SearchPaths>
         <UnitOutputDirectory Value="js"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <AllowLabel Value="False"/>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
       <Other>
-        <ExecuteBefore>
-          <Command Value="$MakeExe(pas2js) -O- -Jc -vbq fpcunit_pas2js.pas"/>
-          <ScanForFPCMsgs Value="True"/>
-        </ExecuteBefore>
+        <CustomOptions Value="-Jc"/>
       </Other>
       <SkipCompiler Value="True"/>
     </CompilerOptions>
@@ -53,13 +61,10 @@
         <UnitName Value="htmltestreport"/>
       </Item8>
     </Files>
-    <RequiredPkgs Count="2">
+    <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="fcl_base_pas2js"/>
       </Item1>
-      <Item2>
-        <PackageName Value="pas2js_rtl"/>
-      </Item2>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="."/>