compatibility fixes

project-jedi · Aug 11, 2018 · 3a616b8 · 3a616b8
1 parent ed4a752
commit 3a616b8
Show file tree

Hide file tree

Showing 13 changed files with 1,108 additions and 122 deletions.
diff --git a/jcl/packages/fpc/Jcl.lpk b/jcl/packages/fpc/Jcl.lpk
@@ -1,17 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="Jcl"/>
-    <AddToProjectUsesSection Value="False"/>
     <Author Value="Project JEDI"/>
     <AutoUpdate Value="OnRebuildingAll"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="..\..\source\include\"/>
-        <OtherUnitFiles Value=".;..\..\source\common;..\..\source\windows;;..\..\lib\fpc\$(TargetCPU)-$(TargetOS)"/>
+        <IncludeFiles Value="..\..\source\include"/>
+        <OtherUnitFiles Value=".;..\..\source\common;..\..\source\windows;..\..\lib\fpc\$(TargetCPU)-$(TargetOS);..\..\source\fpc"/>
         <UnitOutputDirectory Value="..\..\lib\fpc\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
@@ -24,23 +23,21 @@
       </Parsing>
       <CodeGeneration>
         <Optimizations>
-          <VariablesInRegisters Value="True"/>
           <OptimizationLevel Value="3"/>
+          <VariablesInRegisters Value="True"/>
         </Optimizations>
       </CodeGeneration>
       <Linking>
         <Debugging>
+          <GenerateDebugInfo Value="False"/>
           <UseLineInfoUnit Value="False"/>
         </Debugging>
       </Linking>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="JEDI Code Library RTL package"/>
     <License Value="Copyright (C) 1999, 2014 Project JEDI"/>
-    <Version Major="2" Minor="7" Release="0" Build="5300"/>
-    <Files Count="74">
+    <Version Major="2" Minor="7" Build="5300"/>
+    <Files Count="77">
       <Item1>
         <Filename Value="..\..\source\common\bzip2.pas"/>
         <UnitName Value="bzip2"/>
@@ -337,6 +334,18 @@
         <Filename Value="..\..\source\windows\Snmp.pas"/>
         <UnitName Value="Snmp"/>
       </Item74>
+      <Item75>
+        <Filename Value="..\..\source\fpc\FpLibcCompatibility.pas"/>
+        <UnitName Value="FpLibcCompatibility"/>
+      </Item75>
+      <Item76>
+        <Filename Value="..\..\source\fpc\FpStringHash.pas"/>
+        <UnitName Value="FpStringHash"/>
+      </Item76>
+      <Item77>
+        <Filename Value="..\..\source\fpc\FpWinAPICompatibility.pas"/>
+        <UnitName Value="FpWinAPICompatibility"/>
+      </Item77>
     </Files>
     <RequiredPkgs Count="1">
       <Item1>

diff --git a/jcl/packages/fpc/Jcl.pas b/jcl/packages/fpc/Jcl.pas
@@ -1,92 +1,27 @@
-{
------------------------------------------------------------------------------
-     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
-            ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
 
-     Last generated: 14-08-2012  09:49:00 UTC
------------------------------------------------------------------------------
-}
-
-unit Jcl; 
+unit Jcl;
 
 interface
 
 uses
-  bzip2,
-  Jcl8087,
-  JclAnsiStrings,
-  JclBase,
-  JclCharsets,
-  JclComplex,
-  JclCompression,
-  JclCounter,
-  JclDateTime,
-  JclFileUtils,
-  JclIniFiles,
-  JclLogic,
-  JclMath,
-  JclMIDI,
-  JclMime,
-  JclNotify,
-  JclPCRE,
-  JclResources,
-  JclRTTI,
-  JclSchedule,
-  JclSimpleXml,
-  JclStatistics,
-  JclStreams,
-  JclStringConversions,
-  JclStringLists,
-  JclStrings,
-  JclSynch,
-  JclSysInfo,
-  JclSysUtils,
-  JclUnicode,
-  JclUnitConv,
-  JclUnitVersioning,
-  JclUnitVersioningProviders,
-  JclValidation,
-  JclWideStrings,
-  pcre,
-  zlibh,
-  Hardlinks,
-  JclAppInst,
-  JclCIL,
-  JclCLR,
-  JclCOM,
-  JclConsole,
-  JclCppException,
-  JclDebug,
-  JclDebugSerialization,
-  JclDebugXMLDeserializer,
-  JclDebugXMLSerializer,
-  JclDotNet,
-  JclHookExcept,
-  JclLANMan,
-  JclLocales,
-  JclMetadata,
-  JclMiscel,
-  JclMsdosSys,
-  JclMultimedia,
-  JclNTFS,
-  JclPeImage,
-  JclRegistry,
-  JclSecurity,
-  JclShell,
-  JclStructStorage,
-  JclSvcCtrl,
-  JclTask,
-  JclTD32,
-  JclTimeZones,
-  JclWin32,
-  JclWin32Ex,
-  JclWinMIDI,
-  mscoree_TLB,
-  mscorlib_TLB,
-  MSTask,
-  sevenzip,
-  Snmp
-  ;
+  bzip2, Jcl8087, JclAnsiStrings, JclBase, JclCharsets, JclComplex, 
+  JclCompression, JclCounter, JclDateTime, JclFileUtils, JclIniFiles, 
+  JclLogic, JclMath, JclMIDI, JclMime, JclNotify, JclPCRE, JclResources, 
+  JclRTTI, JclSchedule, JclSimpleXml, JclStatistics, JclStreams, 
+  JclStringConversions, JclStringLists, JclStrings, JclSynch, JclSysInfo, 
+  JclSysUtils, JclUnicode, JclUnitConv, JclUnitVersioning, 
+  JclUnitVersioningProviders, JclValidation, JclWideStrings, pcre, zlibh, 
+  Hardlinks, JclAppInst, JclCIL, JclCLR, JclCOM, JclConsole, JclCppException, 
+  JclDebug, JclDebugSerialization, JclDebugXMLDeserializer, 
+  JclDebugXMLSerializer, JclDotNet, JclHookExcept, JclLANMan, JclLocales, 
+  JclMetadata, JclMiscel, JclMsdosSys, JclMultimedia, JclNTFS, JclPeImage, 
+  JclRegistry, JclSecurity, JclShell, JclStructStorage, JclSvcCtrl, JclTask, 
+  JclTD32, JclTimeZones, JclWin32, JclWin32Ex, JclWinMIDI, mscoree_TLB, 
+  mscorlib_TLB, MSTask, sevenzip, Snmp, FpLibcCompatibility, FpStringHash, 
+  FpWinAPICompatibility;
 
 implementation