From ca31386a93498c84cdcbb15b6eb55f3ad24c51ba Mon Sep 17 00:00:00 2001 From: Olly Date: Thu, 8 Aug 2019 21:42:27 +0100 Subject: [PATCH] RC2 --- Projects/Simba/Simba.lpi | 383 +++-------------------------------- Units/MMLCore/mufasabase.pas | 2 +- 2 files changed, 28 insertions(+), 357 deletions(-) diff --git a/Projects/Simba/Simba.lpi b/Projects/Simba/Simba.lpi index d1eb87c96..ffa6b254d 100644 --- a/Projects/Simba/Simba.lpi +++ b/Projects/Simba/Simba.lpi @@ -10,7 +10,6 @@ - <UseXPManifest Value="True"/> <Icon Value="0"/> <Resources Count="3"> <Resource_0 FileName="..\..\Units\Misc\Web\openssl\linux64.zip" Type="RCDATA" ResourceName="OPENSSL_LINUX64"/> @@ -22,12 +21,11 @@ <VersionInfo> <UseVersionInfo Value="True"/> <MajorVersionNr Value="1"/> - <MinorVersionNr Value="2"/> - <BuildNr Value="6"/> + <MinorVersionNr Value="3"/> + <BuildNr Value="2"/> <Language Value="0809"/> <CharSet Value="04B0"/> - <Attributes pvaDebug="True"/> - <StringTable CompanyName="Villavu.com" FileDescription="Simba: http://wizzup.org/simba/" OriginalFilename="Simba.exe" ProductName="Simba" ProductVersion="1.2.0-RC6"/> + <StringTable CompanyName="Villavu.com" FileDescription="Simba: http://wizzup.org/simba/" OriginalFilename="Simba.exe" ProductName="Simba" ProductVersion="1.3 RC2"/> </VersionInfo> <BuildModes Count="2"> <Item1 Name="Debug" Default="True"/> @@ -40,7 +38,7 @@ <SearchPaths> <IncludeFiles Value="$(ProjOutDir);../../Units/lape;../../Units/MMLAddon/imports/lape;$(LazarusDir)/components/synedit;../../Units/Misc/MatchTemplate;../../Units/MMLAddon/oswindow;../../Units/MMLAddon/windowselector"/> <Libraries Value="../../Units/lape/extensions/ffi/bin/$(TargetOS)"/> - <OtherUnitFiles Value="$(ProjPath);$(ProjPath)../../Units/MMLCore;$(ProjPath)../../Units/MMLAddon;$(ProjPath)../../Units/lape;$(ProjPath)../../Units/Misc;$(ProjPath)../../Units/Misc/DCPCrypt;$(ProjPath)../../Units/Misc/DCPCrypt/Hashes;$(ProjPath)../../Units/Misc/DCPCrypt/Ciphers;$(ProjPath)../../Units/Linux;$(ProjPath)../../Units/Synapse;$(LazarusDir)/components/mouseandkeyinput;../../Units/lape/extensions/ffi;$(ProjPath)../ScriptManager;$(ProjPath)../FormDesigner;$(ProjPath)../../Projects/FormDesigner/CodeGen;../../Units/MMLAddon/imports;../../Units/MMLAddon/imports/classes/MML;../../Units/MMLAddon/imports/classes/LCL;../Tools;../../Units/Misc/MatchTemplate;../../Units/Misc/MatchTemplate/fftlib;../../Units/MMLAddon/oswindow;../../Units/Misc/Web;../../Units/Misc/Archive;package;../../Units/Misc/Web/fpc;../../Units/Misc/Archive/gzip;../../Units/MMLAddon/windowselector;../../Units/MMLCore/iomanager"/> + <OtherUnitFiles Value="$(ProjPath);$(ProjPath)../../Units/MMLCore;$(ProjPath)../../Units/MMLAddon;$(ProjPath)../../Units/lape;$(ProjPath)../../Units/Misc;$(ProjPath)../../Units/Misc/DCPCrypt;$(ProjPath)../../Units/Misc/DCPCrypt/Hashes;$(ProjPath)../../Units/Misc/DCPCrypt/Ciphers;$(ProjPath)../../Units/Linux;$(ProjPath)../../Units/Synapse;../../Units/lape/extensions/ffi;$(ProjPath)../ScriptManager;$(ProjPath)../FormDesigner;$(ProjPath)../../Projects/FormDesigner/CodeGen;../../Units/MMLAddon/imports;../../Units/MMLAddon/imports/classes/MML;../../Units/MMLAddon/imports/classes/LCL;../Tools;../../Units/Misc/MatchTemplate;../../Units/Misc/MatchTemplate/fftlib;../../Units/MMLAddon/oswindow;../../Units/Misc/Web;../../Units/Misc/Archive;package;../../Units/Misc/Web/fpc;../../Units/Misc/Archive/gzip;../../Units/MMLAddon/windowselector;../../Units/MMLCore/iomanager"/> <UnitOutputDirectory Value="$(ProjPath)../../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -69,9 +67,6 @@ </Other> </CompilerOptions> </Item2> - <SharedMatrixOptions Count="1"> - <Item1 ID="878677328708" Modes="Release" Value="pvaDebug:=False"/> - </SharedMatrixOptions> </BuildModes> <PublishOptions> <Version Value="2"/> @@ -101,7 +96,7 @@ <PackageName Value="LCL"/> </Item3> </RequiredPackages> - <Units Count="92"> + <Units Count="13"> <Unit0> <Filename Value="Simba.lpr"/> <IsPartOfProject Value="True"/> @@ -115,402 +110,78 @@ <UnitName Value="SimbaUnit"/> </Unit1> <Unit2> - <Filename Value="../../Units/MMLCore/client.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="Client"/> - </Unit2> - <Unit3> - <Filename Value="../../Units/MMLCore/mufasatypes.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="MufasaTypes"/> - </Unit3> - <Unit4> - <Filename Value="../../Units/MMLCore/files.pas"/> - <IsPartOfProject Value="True"/> - </Unit4> - <Unit5> - <Filename Value="../../Units/MMLAddon/mmisc.pas"/> - <IsPartOfProject Value="True"/> - </Unit5> - <Unit6> - <Filename Value="../../Units/MMLCore/finder.pas"/> - <IsPartOfProject Value="True"/> - </Unit6> - <Unit7> - <Filename Value="../../Units/MMLCore/bitmaps.pas"/> - <IsPartOfProject Value="True"/> - </Unit7> - <Unit8> - <Filename Value="../../Units/MMLCore/colour_conv.pas"/> - <IsPartOfProject Value="True"/> - </Unit8> - <Unit9> - <Filename Value="../../Units/MMLCore/dtm.pas"/> - <IsPartOfProject Value="True"/> - </Unit9> - <Unit10> - <Filename Value="../../Units/MMLAddon/colourpicker.pas"/> - <IsPartOfProject Value="True"/> - </Unit10> - <Unit11> - <Filename Value="../../Units/MMLCore/dtmutil.pas"/> - <IsPartOfProject Value="True"/> - </Unit11> - <Unit12> - <Filename Value="../../Units/MMLCore/mmath.pas"/> - <IsPartOfProject Value="True"/> - </Unit12> - <Unit13> - <Filename Value="../../Units/MMLCore/ocr.pas"/> - <IsPartOfProject Value="True"/> - </Unit13> - <Unit14> - <Filename Value="../../Units/MMLCore/web.pas"/> - <IsPartOfProject Value="True"/> - </Unit14> - <Unit15> <Filename Value="framescript.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="ScriptFrame"/> <HasResources Value="True"/> <ResourceBaseClass Value="Frame"/> - </Unit15> - <Unit16> + </Unit2> + <Unit3> <Filename Value="colourhistory.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="ColourHistoryForm"/> <ResourceBaseClass Value="Form"/> - </Unit16> - <Unit17> + </Unit3> + <Unit4> <Filename Value="about.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="AboutForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - </Unit17> - <Unit18> - <Filename Value="../../Units/MMLAddon/internets.pas"/> - <IsPartOfProject Value="True"/> - </Unit18> - <Unit19> - <Filename Value="../../Units/MMLCore/mufasabase.pas"/> - <IsPartOfProject Value="True"/> - </Unit19> - <Unit20> + </Unit4> + <Unit5> <Filename Value="debugimage.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="DebugImgForm"/> <ResourceBaseClass Value="Form"/> - </Unit20> - <Unit21> + </Unit5> + <Unit6> <Filename Value="framefunctionlist.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="FunctionList_Frame"/> <HasResources Value="True"/> <ResourceBaseClass Value="Frame"/> - </Unit21> - <Unit22> - <Filename Value="../../Units/MMLAddon/updater.pas"/> - <IsPartOfProject Value="True"/> - </Unit22> - <Unit23> + </Unit6> + <Unit7> <Filename Value="updateform.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="SimbaUpdateForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - </Unit23> - <Unit24> + </Unit7> + <Unit8> <Filename Value="simbasettingsold.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="SettingsForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="Simbasettingsold"/> - </Unit24> - <Unit25> - <Filename Value="extensionmanagergui.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="ExtensionsForm"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - </Unit25> - <Unit26> - <Filename Value="../../Units/MMLCore/libloader.pas"/> - <IsPartOfProject Value="True"/> - </Unit26> - <Unit27> - <Filename Value="../../Units/Misc/v_autocompleteform.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="v_AutoCompleteForm"/> - </Unit27> - <Unit28> - <Filename Value="../../Units/Misc/v_ideCodeParser.pas"/> - <IsPartOfProject Value="True"/> - </Unit28> - <Unit29> - <Filename Value="../../Units/Misc/ValistusDefines.inc"/> - <IsPartOfProject Value="True"/> - </Unit29> - <Unit30> - <Filename Value="../../Units/Misc/v_ideCodeInsight.pas"/> - <IsPartOfProject Value="True"/> - </Unit30> - <Unit31> - <Filename Value="../../Units/Misc/CastaliaPasLex.pas"/> - <IsPartOfProject Value="True"/> - </Unit31> - <Unit32> - <Filename Value="../../Units/Misc/CastaliaPasLexTypes.pas"/> - <IsPartOfProject Value="True"/> - </Unit32> - <Unit33> - <Filename Value="../../Units/Misc/CastaliaSimplePasPar.pas"/> - <IsPartOfProject Value="True"/> - </Unit33> - <Unit34> - <Filename Value="../../Units/Misc/CastaliaSimplePasParTypes.pas"/> - <IsPartOfProject Value="True"/> - </Unit34> - <Unit35> - <Filename Value="../../Units/Misc/v_Constants.pas"/> - <IsPartOfProject Value="True"/> - </Unit35> - <Unit36> - <Filename Value="../../Units/Misc/v_MiscFunctions.pas"/> - <IsPartOfProject Value="True"/> - </Unit36> - <Unit37> - <Filename Value="bitmapconv.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="BitmapConvForm"/> - <ResourceBaseClass Value="Form"/> - </Unit37> - <Unit38> - <Filename Value="../../Units/MMLCore/os_linux.pas"/> - <IsPartOfProject Value="True"/> - </Unit38> - <Unit39> + </Unit8> + <Unit9> <Filename Value="simbasettingssimple.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="SettingsSimpleForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - </Unit39> - <Unit40> - <Filename Value="../../Units/MMLCore/tpa.pas"/> - <IsPartOfProject Value="True"/> - </Unit40> - <Unit41> - <Filename Value="newsimbasettings.pas"/> - <IsPartOfProject Value="True"/> - </Unit41> - <Unit42> - <Filename Value="../../Units/MMLAddon/script_thread.pas"/> - <IsPartOfProject Value="True"/> - </Unit42> - <Unit43> - <Filename Value="../../Units/MMLAddon/imports/script_import_simba.pas"/> - <IsPartOfProject Value="True"/> - </Unit43> - <Unit44> - <Filename Value="../../Units/MMLAddon/imports/script_import_script.pas"/> - <IsPartOfProject Value="True"/> - </Unit44> - <Unit45> - <Filename Value="../../Units/MMLAddon/imports/script_import_time_date.pas"/> - <IsPartOfProject Value="True"/> - </Unit45> - <Unit46> - <Filename Value="../../Units/MMLAddon/imports/script_import_target.pas"/> - <IsPartOfProject Value="True"/> - </Unit46> - <Unit47> - <Filename Value="../../Units/MMLAddon/imports/script_import_file.pas"/> - <IsPartOfProject Value="True"/> - </Unit47> - <Unit48> - <Filename Value="../../Units/MMLAddon/imports/script_import_bitmap.pas"/> - <IsPartOfProject Value="True"/> - </Unit48> - <Unit49> - <Filename Value="../../Units/MMLAddon/imports/script_import_ocr.pas"/> - <IsPartOfProject Value="True"/> - </Unit49> - <Unit50> - <Filename Value="../../Units/MMLAddon/imports/script_import_colormath.pas"/> - <IsPartOfProject Value="True"/> - </Unit50> - <Unit51> - <Filename Value="../../Units/MMLAddon/imports/script_import_input.pas"/> - <IsPartOfProject Value="True"/> - </Unit51> - <Unit52> - <Filename Value="../../Units/MMLAddon/imports/script_import_arrays_algorithms.pas"/> - <IsPartOfProject Value="True"/> - </Unit52> - <Unit53> - <Filename Value="../../Units/MMLAddon/imports/script_import_math.pas"/> - <IsPartOfProject Value="True"/> - </Unit53> - <Unit54> - <Filename Value="../../Units/MMLAddon/imports/script_import_dtm.pas"/> - <IsPartOfProject Value="True"/> - </Unit54> - <Unit55> - <Filename Value="../../Units/MMLAddon/imports/script_import_web.pas"/> - <IsPartOfProject Value="True"/> - </Unit55> - <Unit56> - <Filename Value="../../Units/MMLAddon/imports/script_import_string.pas"/> - <IsPartOfProject Value="True"/> - </Unit56> - <Unit57> - <Filename Value="../../Units/MMLAddon/imports/script_import_settings.pas"/> - <IsPartOfProject Value="True"/> - </Unit57> - <Unit58> - <Filename Value="../../Units/MMLAddon/imports/script_import_finder.pas"/> - <IsPartOfProject Value="True"/> - </Unit58> - <Unit59> - <Filename Value="../../Units/MMLAddon/imports/script_import_system.pas"/> - <IsPartOfProject Value="True"/> - </Unit59> - <Unit60> - <Filename Value="../../Units/MMLAddon/imports/script_imports.pas"/> - <IsPartOfProject Value="True"/> - </Unit60> - <Unit61> - <Filename Value="../../Units/MMLAddon/imports/script_import_other.pas"/> - <IsPartOfProject Value="True"/> - </Unit61> - <Unit62> - <Filename Value="../../Units/MMLAddon/script_plugins.pas"/> - <IsPartOfProject Value="True"/> - </Unit62> - <Unit63> - <Filename Value="linux_startup.pas"/> - <IsPartOfProject Value="True"/> - </Unit63> - <Unit64> - <Filename Value="../../Units/MMLAddon/script_plugins_exports.pas"/> - <IsPartOfProject Value="True"/> - </Unit64> - <Unit65> + </Unit9> + <Unit10> <Filename Value="../Tools/dtm_editor.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="DTMForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - </Unit65> - <Unit66> + </Unit10> + <Unit11> <Filename Value="../Tools/aca_math.pas"/> <IsPartOfProject Value="True"/> - </Unit66> - <Unit67> + </Unit11> + <Unit12> <Filename Value="../Tools/aca.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="ACAForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="ACA"/> - </Unit67> - <Unit68> - <Filename Value="../../Units/MMLAddon/imports/script_import_deprecated.pas"/> - <IsPartOfProject Value="True"/> - </Unit68> - <Unit69> - <Filename Value="../../Units/MMLAddon/imports/script_import_crypto.pas"/> - <IsPartOfProject Value="True"/> - </Unit69> - <Unit70> - <Filename Value="../../Units/Linux/xlibhelpers.pas"/> - <IsPartOfProject Value="True"/> - </Unit70> - <Unit71> - <Filename Value="../../Units/MMLAddon/imports/script_import_oswindow.pas"/> - <IsPartOfProject Value="True"/> - </Unit71> - <Unit72> - <Filename Value="../../Units/MMLAddon/oswindow/oswindow_linux.inc"/> - <IsPartOfProject Value="True"/> - </Unit72> - <Unit73> - <Filename Value="../../Units/MMLAddon/oswindow/oswindow_windows.inc"/> - <IsPartOfProject Value="True"/> - </Unit73> - <Unit74> - <Filename Value="../../Units/MMLAddon/simba_threadpool.pas"/> - <IsPartOfProject Value="True"/> - </Unit74> - <Unit75> - <Filename Value="../../Units/Misc/Web/simba.httpclient.pas"/> - <IsPartOfProject Value="True"/> - </Unit75> - <Unit76> - <Filename Value="../../Units/Misc/Archive/simba.archive.pas"/> - <IsPartOfProject Value="True"/> - </Unit76> - <Unit77> - <Filename Value="../../Units/Misc/Web/simba.httpclient_async.pas"/> - <IsPartOfProject Value="True"/> - </Unit77> - <Unit78> - <Filename Value="../../Units/Misc/Web/fpc/simba.fphttpclient.pas"/> - <IsPartOfProject Value="True"/> - </Unit78> - <Unit79> - <Filename Value="simba.environment.pas"/> - <IsPartOfProject Value="True"/> - </Unit79> - <Unit80> - <Filename Value="../../Units/Misc/Archive/simba.tar.pas"/> - <IsPartOfProject Value="True"/> - </Unit80> - <Unit81> - <Filename Value="../../Units/Misc/Archive/simba.tar_gz.pas"/> - <IsPartOfProject Value="True"/> - </Unit81> - <Unit82> - <Filename Value="../../Units/Misc/Archive/simba.tar_bz2.pas"/> - <IsPartOfProject Value="True"/> - </Unit82> - <Unit83> - <Filename Value="../../Units/Misc/Web/simba.openssloader.pas"/> - <IsPartOfProject Value="True"/> - </Unit83> - <Unit84> - <Filename Value="package/simba.package_buttons.pas"/> - <IsPartOfProject Value="True"/> - </Unit84> - <Unit85> - <Filename Value="package/simba.package.pas"/> - <IsPartOfProject Value="True"/> - </Unit85> - <Unit86> - <Filename Value="package/simba.package_github_releases.pas"/> - <IsPartOfProject Value="True"/> - </Unit86> - <Unit87> - <Filename Value="package/simba.package_github_json.pas"/> - <IsPartOfProject Value="True"/> - </Unit87> - <Unit88> - <Filename Value="package/simba.package_github_url.pas"/> - <IsPartOfProject Value="True"/> - </Unit88> - <Unit89> - <Filename Value="../../Units/MMLAddon/windowselector/windowselector_linux.inc"/> - <IsPartOfProject Value="True"/> - </Unit89> - <Unit90> - <Filename Value="../../Units/MMLAddon/windowselector/simba.windowselector.pas"/> - <IsPartOfProject Value="True"/> - </Unit90> - <Unit91> - <Filename Value="../../Units/MMLAddon/windowselector/windowselector_windows.inc"/> - <IsPartOfProject Value="True"/> - </Unit91> + </Unit12> </Units> </ProjectOptions> <CompilerOptions> @@ -521,7 +192,7 @@ <SearchPaths> <IncludeFiles Value="$(ProjOutDir);../../Units/lape;../../Units/MMLAddon/imports/lape;$(LazarusDir)/components/synedit;../../Units/Misc/MatchTemplate;../../Units/MMLAddon/oswindow"/> <Libraries Value="../../Units/lape/extensions/ffi/bin/$(TargetOS)"/> - <OtherUnitFiles Value="$(ProjPath);$(ProjPath)../../Units/MMLCore;$(ProjPath)../../Units/MMLAddon;$(ProjPath)../../Units/lape;$(ProjPath)../../Units/Misc;$(ProjPath)../../Units/Misc/DCPCrypt;$(ProjPath)../../Units/Misc/DCPCrypt/Hashes;$(ProjPath)../../Units/Misc/DCPCrypt/Ciphers;$(ProjPath)../../Units/Linux;$(ProjPath)../../Units/Synapse;$(LazarusDir)/components/mouseandkeyinput;../../Units/lape/extensions/ffi;$(ProjPath)../ScriptManager;$(ProjPath)../FormDesigner;$(ProjPath)../../Projects/FormDesigner/CodeGen;../../Units/MMLAddon/imports;../../Units/MMLAddon/imports/classes/MML;../../Units/MMLAddon/imports/classes/LCL;../Tools;../../Units/Misc/MatchTemplate;../../Units/Misc/MatchTemplate/fftlib;../../Units/MMLAddon/oswindow;../../Units/Misc/Web;../../Units/Misc/Archive;package;../../Units/Misc/Web/fpc;../../Units/Misc/Archive/gzip;../../Units/MMLAddon/windowselector"/> + <OtherUnitFiles Value="$(ProjPath);$(ProjPath)../../Units/MMLCore;$(ProjPath)../../Units/MMLAddon;$(ProjPath)../../Units/lape;$(ProjPath)../../Units/Misc;$(ProjPath)../../Units/Misc/DCPCrypt;$(ProjPath)../../Units/Misc/DCPCrypt/Hashes;$(ProjPath)../../Units/Misc/DCPCrypt/Ciphers;$(ProjPath)../../Units/Linux;$(ProjPath)../../Units/Synapse;../../Units/lape/extensions/ffi;$(ProjPath)../ScriptManager;$(ProjPath)../FormDesigner;$(ProjPath)../../Projects/FormDesigner/CodeGen;../../Units/MMLAddon/imports;../../Units/MMLAddon/imports/classes/MML;../../Units/MMLAddon/imports/classes/LCL;../Tools;../../Units/Misc/MatchTemplate;../../Units/Misc/MatchTemplate/fftlib;../../Units/MMLAddon/oswindow;../../Units/Misc/Web;../../Units/Misc/Archive;package;../../Units/Misc/Web/fpc;../../Units/Misc/Archive/gzip;../../Units/MMLAddon/windowselector;../../Units/MMLCore/iomanager"/> <UnitOutputDirectory Value="$(ProjPath)../../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> diff --git a/Units/MMLCore/mufasabase.pas b/Units/MMLCore/mufasabase.pas index 0c6276e41..4603f5fa5 100644 --- a/Units/MMLCore/mufasabase.pas +++ b/Units/MMLCore/mufasabase.pas @@ -33,7 +33,7 @@ interface {$I Simba.inc} const - SimbaVersion = 1300; + SimbaVersion = 1302; SimbaMajor = 1300; // this should be 980 even if SimbaVersion is 981, etc SimbaURL = {$IFDEF WINDOWS}