Bläddra i källkod

demo: updated lpi

mattias 6 år sedan
förälder
incheckning
3dcbbfe508
5 ändrade filer med 41 tillägg och 50 borttagningar
  1. 6 14
      demo/fcldb/demodb.lpi
  2. 5 12
      demo/fcldb/demoload.lpi
  3. 19 14
      demo/fcldb/demorest.lpi
  4. 2 3
      demo/fcldb/restdata.pp
  5. 9 7
      demo/fcldb/restserver.lpi

+ 6 - 14
demo/fcldb/demodb.lpi

@@ -1,12 +1,13 @@
 <?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"/>
@@ -19,8 +20,8 @@
       <Item1 Name="PasJSPort" Value="3039"/>
       <Item2 Name="PasJSWebBrowserProject" Value="1"/>
     </CustomData>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes>
+      <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -31,18 +32,11 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="2">
-      <Item1>
-        <PackageName Value="pas2js_fcldb"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="pas2js_rtl"/>
-      </Item2>
-    </RequiredPackages>
     <Units Count="1">
       <Unit0>
         <Filename Value="demodb.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="demoxhr"/>
       </Unit0>
     </Units>
   </ProjectOptions>
@@ -71,9 +65,7 @@
       <CustomOptions Value="-Jminclude -Jc -Jirtl.js"/>
       <CompilerPath Value="$(pas2js)"/>
       <ExecuteBefore>
-        <Command Value="$MakeExe(pas2js) -Tbrowser -Jirtl.js -Jc -O- $Name($(ProjFile))"/>
         <ScanForFPCMsgs Value="True"/>
-        <CompileReasons Compile="False" Build="False" Run="False"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

+ 5 - 12
demo/fcldb/demoload.lpi

@@ -1,12 +1,13 @@
 <?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"/>
@@ -14,8 +15,8 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes>
+      <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -26,14 +27,6 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="2">
-      <Item1>
-        <PackageName Value="pas2js_fcldb"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="pas2js_rtl"/>
-      </Item2>
-    </RequiredPackages>
     <Units Count="1">
       <Unit0>
         <Filename Value="demoload.lpr"/>

+ 19 - 14
demo/fcldb/demorest.lpi

@@ -1,12 +1,13 @@
 <?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"/>
@@ -14,8 +15,8 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes>
+      <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -26,14 +27,6 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="2">
-      <Item1>
-        <PackageName Value="pas2js_fcldb"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="pas2js_rtl"/>
-      </Item2>
-    </RequiredPackages>
     <Units Count="1">
       <Unit0>
         <Filename Value="demorest.lpr"/>
@@ -50,14 +43,26 @@
       <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <AllowLabel Value="False"/>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+    </Linking>
     <Other>
-      <CustomOptions Value="-Jc -Jirtl.js"/>
+      <CustomOptions Value="-Jc -Jirtl.js -Jminclude"/>
+      <CompilerPath Value="$(pas2js)"/>
       <ExecuteBefore>
         <Command Value="$MakeExe(pas2js) -Tbrowser -Jirtl.js -Jc $Name($(ProjFile))"/>
         <ScanForFPCMsgs Value="True"/>
+        <CompileReasons Compile="False" Build="False" Run="False"/>
       </ExecuteBefore>
     </Other>
-    <CompileReasons Compile="False" Build="False" Run="False"/>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">

+ 2 - 3
demo/fcldb/restdata.pp

@@ -136,8 +136,7 @@ end;
 Procedure GetRecords(aRequest : TRequest; AResponse : TResponse);
 
 Var
-  P : String;
-  I,ID,First,Last : Integer;
+  ID,First,Last : Integer;
 
 begin
   First:=0;
@@ -212,7 +211,7 @@ end;
 Procedure CreateRecord(aRequest : TRequest; AResponse : TResponse);
 
 Var
-  O,D,F : TJSONObject;
+  O,D: TJSONObject;
   I : integer;
   R : String;
 

+ 9 - 7
demo/fcldb/restserver.lpi

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <ProjectOptions>
-    <Version Value="10"/>
+  <ProjectOptions BuildModesCount="1">
+    <Version Value="12"/>
     <General>
       <Flags>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
@@ -13,16 +14,17 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes>
+      <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <Units Count="2">
       <Unit0>