diff --git a/developer/src/common/delphi/compiler/CompileErrorCodes.pas b/developer/src/common/delphi/compiler/CompileErrorCodes.pas deleted file mode 100644 index 81c0c5334fb..00000000000 --- a/developer/src/common/delphi/compiler/CompileErrorCodes.pas +++ /dev/null @@ -1,235 +0,0 @@ -(* - Name: CompileErrorCodes - Copyright: Copyright (C) SIL International. - Documentation: - Description: - Create Date: 6 Mar 2014 - - Modified Date: 24 Aug 2015 - Authors: mcdurdin - Related Files: - Dependencies: - - Bugs: - Todo: - Notes: - History: 06 Mar 2014 - mcdurdin - I4118 - V9.0 - KMW compiler should warn when extended shift flags are used - 19 Mar 2014 - mcdurdin - I4141 - V9.0 - Warn when unusable key ids are used - 19 Mar 2014 - mcdurdin - I4142 - V9.0 - Validate key ids are in an acceptable format - 04 May 2015 - mcdurdin - I4688 - V9.0 - Add build path to project settings - 24 Aug 2015 - mcdurdin - I4872 - OSK font and Touch Layout font should be the same in Developer - 28 Feb 2018 - jahorton - Imported the "SomewhereIGotItWrong" error code for use in KMW compilation - 22 Jul 2020 - eddieantonio - Add lexical model range https://github.com/keymanapp/keyman/pull/3385 -*) -unit CompileErrorCodes; - -interface - -const - CHINT_FLAG = $1000; - CWARN_FLAG = $2000; - CERR_FLAG = $4000; - CFATAL_FLAG = $8000; - -// Any messages from the lexical model compiler occupy this range: - CERR_LEXICAL_MODEL_MIN = $0800; - CERR_LEXICAL_MODEL_MAX = $08FF; - - CERR_None = $0000; - CERR_EndOfFile = $0001; - - CERR_BadCallParams = $8002; - CERR_CannotAllocateMemory = $9004; - CERR_InfileNotExist = $8005; - CERR_CannotCreateOutfile = $8006; - CERR_UnableToWriteFully = $8007; - CERR_CannotReadInfile = $8008; - CERR_SomewhereIGotItWrong = $8009; - - CERR_InvalidToken = $400A; - CERR_InvalidBegin = $400B; - CERR_InvalidName = $400C; - CERR_InvalidVersion = $400D; - CERR_InvalidLanguageLine = $400E; - CERR_LayoutButNoLanguage = $400F; - CERR_InvalidLayoutLine = $4010; - CERR_NoVersionLine = $4011; - CERR_InvalidGroupLine = $4012; - CERR_InvalidStoreLine = $4013; - CERR_InvalidCodeInKeyPartOfRule = $4014; - CERR_InvalidDeadkey = $4015; - CERR_InvalidValue = $4016; - CERR_ZeroLengthString = $4017; - CERR_TooManyIndexToKeyRefs = $4018; - CERR_UnterminatedString = $4019; - CERR_StringInVirtualKeySection = $401A; - CERR_AnyInVirtualKeySection = $401B; - CERR_InvalidAny = $401C; - CERR_StoreDoesNotExist = $401D; - CERR_BeepInVirtualKeySection = $401E; - CERR_IndexInVirtualKeySection = $401F; - CERR_InvalidIndex = $4020; - CERR_OutsInVirtualKeySection = $4021; - CERR_InvalidOuts = $4022; - CERR_ContextInVirtualKeySection = $4024; - CERR_InvalidUse = $4025; - CERR_GroupDoesNotExist = $4026; - CERR_VirtualKeyNotAllowedHere = $4027; - CERR_InvalidSwitch = $4028; - CERR_NoTokensFound = $4029; - CERR_InvalidLineContinuation = $402A; - CERR_LineTooLong = $402B; - CERR_InvalidCopyright = $402C; - CERR_CodeInvalidInThisSection = $402D; - CERR_InvalidMessage = $402E; - CERR_InvalidLanguageName = $402F; - CERR_InvalidBitmapLine = $4030; - CERR_CannotReadBitmapFile = $4031; - CERR_IndexDoesNotPointToAny = $4032; - CERR_ReservedCharacter = $4033; - CERR_InvalidCharacter = $4034; - CERR_InvalidCall = $4035; - CERR_CallInVirtualKeySection = $4036; - CERR_CodeInvalidInKeyStore = $4037; - CERR_CannotLoadIncludeFile = $4038; - - CERR_60FeatureOnly_EthnologueCode = $4039; - CERR_60FeatureOnly_MnemonicLayout = $403A; - CERR_60FeatureOnly_OldCharPosMatching = $403B; - CERR_60FeatureOnly_NamedCodes = $403C; - CERR_60FeatureOnly_Contextn = $403D; - CERR_501FeatureOnly_Call = $403E; - - CERR_InvalidNamedCode = $403F; - CERR_InvalidSystemStore = $4040; - - CERR_CallIsProfessionalFeature = $4041; - CERR_IncludeCodesIsProfessionalFeature = $4042; - CERR_MnemonicLayoutIsProfessionalFeature = $4043; - CERR_60FeatureOnly_VirtualCharKey = $4044; - - CERR_VersionAlreadyIncluded = $4045; - - CERR_70FeatureOnly = $4046; - - CERR_80FeatureOnly = $4047; - CERR_InvalidInVirtualKeySection = $4048; - CERR_InvalidIf = $4049; - CERR_InvalidReset = $404A; - CERR_InvalidSet = $404B; - CERR_InvalidSave = $404C; - - CERR_InvalidEthnologueCode = $404D; - - CERR_CannotCreateTempfile = $804E; - - CERR_90FeatureOnly_IfSystemStores = $404F; - CERR_IfSystemStore_NotFound = $4050; - CERR_90FeatureOnly_SetSystemStores = $4051; - CERR_SetSystemStore_NotFound = $4052; - CERR_90FeatureOnlyVirtualKeyDictionary = $4053; - - CERR_NotSupportedInKeymanWebContext = $4054; - CERR_NotSupportedInKeymanWebOutput = $4055; - CERR_NotSupportedInKeymanWebStore = $4056; - CERR_VirtualCharacterKeysNotSupportedInKeymanWeb = $4057; - CERR_VirtualKeysNotValidForMnemonicLayouts = $4058; - CERR_InvalidTouchLayoutFile = $4059; - CERR_TouchLayoutInvalidIdentifier = $405A; // I4142 - CERR_InvalidKeyCode = $405B; // I4142 - - CERR_90FeatureOnlyLayoutFile = $405C; - CERR_90FeatureOnlyKeyboardVersion = $405D; - CERR_KeyboardVersionFormatInvalid = $405E; - CERR_ContextExHasInvalidOffset = $405F; - CERR_90FeatureOnlyEmbedCSS = $4060; - CERR_90FeatureOnlyTargets = $4061; - CERR_ContextAndIndexInvalidInMatchNomatch = $4062; - CERR_140FeatureOnlyContextAndNotAnyWeb = $4063; - - CERR_ExpansionMustFollowCharacterOrVKey = $4064; - CERR_VKeyExpansionMustBeFollowedByVKey = $4065; - CERR_CharacterExpansionMustBeFollowedByCharacter = $4066; - CERR_VKeyExpansionMustUseConsistentShift = $4067; - CERR_ExpansionMustBePositive = $4068; - - CERR_CasedKeysMustContainOnlyVirtualKeys = $4069; - CERR_CasedKeysMustNotIncludeShiftStates = $406A; - CERR_CasedKeysNotSupportedWithMnemonicLayout = $406B; - - CERR_CannotUseReadWriteGroupFromReadonlyGroup = $406C; - CERR_StatementNotPermittedInReadonlyGroup = $406D; - CERR_OutputInReadonlyGroup = $406E; - CERR_NewContextGroupMustBeReadonly = $406F; - CERR_PostKeystrokeGroupMustBeReadonly = $4070; - - CERR_DuplicateGroup = $4071; - CERR_DuplicateStore = $4072; - CERR_RepeatedBegin = $4073; - CERR_VirtualKeyInContext = $4074; - - CWARN_TooManyWarnings = $2080; - CWARN_OldVersion = $2081; - CWARN_BitmapNotUsed = $2082; - CWARN_CustomLanguagesNotSupported = $2083; - CWARN_KeyBadLength = $2084; - CWARN_IndexStoreShort = $2085; - CWARN_UnicodeInANSIGroup = $2086; - CWARN_ANSIInUnicodeGroup = $2087; - CWARN_UnicodeSurrogateUsed = $2088; - CWARN_ReservedCharacter = $2089; - CWARN_Info = $208A; - CWARN_VirtualKeyWithMnemonicLayout = $208B; - CWARN_VirtualCharKeyWithPositionalLayout = $208C; - CWARN_StoreAlreadyUsedAsOptionOrCall = $208D; - CWARN_StoreAlreadyUsedAsStoreOrCall = $208E; - CWARN_StoreAlreadyUsedAsStoreOrOption = $208F; - - CWARN_PunctuationInEthnologueCode = $2090; - - CWARN_TouchLayoutMissingLayer = $2091; - CWARN_TouchLayoutCustomKeyNotDefined = $2092; - CWARN_TouchLayoutMissingRequiredKeys = $2093; - CWARN_HelpFileMissing = $2094; - CWARN_EmbedJsFileMissing = $2095; - CWARN_TouchLayoutFileMissing = $2096; - CWARN_VisualKeyboardFileMissing = $2097; - CWARN_ExtendedShiftFlagsNotSupportedInKeymanWeb = $2098; // I4118 - CWARN_TouchLayoutUnidentifiedKey = $2099; // I4142 - CHINT_UnreachableKeyCode = $109A; // I4141 - - CWARN_CouldNotCopyJsonFile = $209B; // I4688 - CWARN_PlatformNotInTargets = $209C; - - CWARN_HeaderStatementIsDeprecated = $209D; - CWARN_UseNotLastStatementInRule = $209E; - - CWARN_TouchLayoutFontShouldBeSameForAllPlatforms = $209F; // I4872 - CWARN_InvalidJSONMetadataFile = $20A0; // I4872 - CWARN_JSONMetadataOSKFontShouldMatchTouchFont = $20A1; // I4872 - - CWARN_DontMixChiralAndNonChiralModifiers = $20A3; - CWARN_MixingLeftAndRightModifiers = $20A4; - - CWARN_LanguageHeadersDeprecatedInKeyman10 = $20A5; - - CHINT_NonUnicodeFile = $10A6; - - CWARN_TooManyErrorsOrWarnings = $20A7; - - CWARN_HotkeyHasInvalidModifier = $20A8; - - CWARN_TouchLayoutSpecialLabelOnNormalKey = $20A9; - - CWARN_OptionStoreNameInvalid = $20AA; - - CWARN_NulNotFirstStatementInContext = $20AB; - CWARN_IfShouldBeAtStartOfContext = $20AC; - - CWARN_KeyShouldIncludeNCaps = $20AD; - - CHINT_UnreachableRule = $10AE; - -implementation - -end. diff --git a/developer/src/common/delphi/compiler/compile.pas b/developer/src/common/delphi/compiler/compile.pas deleted file mode 100644 index 4dcf1e191f7..00000000000 --- a/developer/src/common/delphi/compiler/compile.pas +++ /dev/null @@ -1,183 +0,0 @@ -(* - Name: compile - Copyright: Copyright (C) SIL International. - Documentation: - Description: - Create Date: 20 Jun 2006 - - Modified Date: 24 Aug 2015 - Authors: mcdurdin - Related Files: - Dependencies: - - Bugs: - Todo: - Notes: - History: 20 Jun 2006 - mcdurdin - Initial version - 06 Oct 2006 - mcdurdin - Fix record packing - 27 Mar 2008 - mcdurdin - refactor constants into kmxfileconsts - 28 Jul 2008 - mcdurdin - Use Compile Targets - 10 Dec 2010 - mcdurdin - I2556 - Crash in Keyman Developer compiling KeymanWeb keyboard - 17 Aug 2012 - mcdurdin - I3310 - V9.0 - Unicode in Delphi fixes - 27 Aug 2012 - mcdurdin - I3438 - V9.0 - Add support for custom virtual keys - 11 May 2015 - mcdurdin - I4706 - V9.0 - Update compile logging for silent and warning-as-error cleanness - 22 Jun 2015 - mcdurdin - I4770 - If kmcmpdll.dll does not exist in debug path, try default paths - 24 Aug 2015 - mcdurdin - I4865 - Add treat hints and warnings as errors into project - 24 Aug 2015 - mcdurdin - I4866 - Add warn on deprecated features to project and compile - -*) -unit compile; - -interface - -uses - Winapi.Windows, - kmxfileconsts; - -{$IFDEF WIN64} -{$A16} -{$ENDIF} - -type - // These structures must match the structures in compfile.h - FILE_STORE = record - dwSystemID: DWORD; - szName: array[0..SZMAX_STORENAME-1] of WCHAR; // the name of the store - dpString: PWideChar; // from start of store structure - fIsStore: BOOL; // I2556 - fIsReserved: BOOL; // I2556 - fIsOption: BOOL; // I2556 - fIsDebug: BOOL; // I2556 - fIsCall: BOOL; // I2556 - line: Integer; - end; - - PFILE_STORE = ^FILE_STORE; - - FILE_KEY = record - Key: WCHAR; // WCHAR -- actually a WORD - LineStoreIndex: WORD; - Line: DWORD; - ShiftFlags: DWORD; - dpOutput: PWideChar; // from start of key structure - dpContext:PWideChar; // from start of key structure - end; - - PFILE_KEY = ^FILE_KEY; - - FILE_GROUP = record - szName: array[0..SZMAX_GROUPNAME-1] of WCHAR; - dpKeyArray: PFILE_KEY; // address of first item in key array, from start of group structure - dpMatch: PWideChar; // from start of group structure - dpNoMatch: PWideChar; // from start of group structure - cxKeyArray: DWORD; // in array items - fUsingKeys: BOOL; // group(xx) [using keys] <-- specified or not - fReadOnly: BOOL; - Line: DWORD; - end; - - PFILE_GROUP = ^FILE_GROUP; - - FILE_DEADKEY = record - szName: array[0..SZMAX_DEADKEYNAME-1] of WCHAR; - end; - - PFILE_DEADKEY = ^FILE_DEADKEY; - - FILE_VKDICTIONARY = record // I3438 - szName: array[0..SZMAX_VKDICTIONARYNAME-1] of WCHAR; - end; - - PFILE_VKDICTIONARY = ^FILE_VKDICTIONARY; - - FILE_KEYBOARD = record - KeyboardID: DWORD; // as stored in HKEY_LOCAL_MACHINE//system//currentcontrolset//control//keyboard layouts - - version: DWORD; // keyboard file version with VERSION keyword - - dpStoreArray: PFILE_STORE; // address of first item in store array, from start of store structure - dpGroupArray: PFILE_GROUP; // address of first item in group array, from start of group structure - - cxStoreArray: DWORD; // in number of items - cxGroupArray: DWORD; // in number of items - StartGroup: array[0..1] of DWORD; // index of starting groups [ANSI=0, Unicode=1] - - dwHotKey: DWORD; // standard windows hotkey (hiword=shift/ctrl/alt stuff, loword=vkey) - - szName: array[0..SZMAX_KEYBOARDNAME-1] of WCHAR; // Keyboard layout name - szLanguageName: array[0..SZMAX_LANGUAGENAME-1] of WCHAR; // Language name - szCopyright: array[0..SZMAX_COPYRIGHT-1] of WCHAR; // Copyright information - szMessage: array[0..SZMAX_MESSAGE-1] of WCHAR; // General information about the keyboard - lpBitmap: PBYTE; - dwBitmapSize: DWORD; - dwFlags: DWORD; // Flags for the keyboard file - - currentGroup: DWORD; // temp - current processing group - currentStore: DWORD; // temp - current processing store - cxDeadKeyArray: DWORD; - dpDeadKeyArray: PFILE_DEADKEY; // temp - dead key array - cxVKDictionary: DWORD; // I3438 - dpVKDictionary: PFILE_VKDICTIONARY; // I3438 // temp - virtual key dictionary - - extra: Pointer; - end; - - PFILE_KEYBOARD = ^FILE_KEYBOARD; - -{$IFDEF WIN64} -{$A8} -{$ENDIF} - -type - TCompilerCallbackW = function( line: Integer; msgcode: LongWord; const text: string): Integer; // not available to C++ in this form - -const - CKF_KEYMAN = 0; - CKF_KEYMANWEB = 1; - -// TODO: REMOVE THESE: -const - CERR_FATAL = $00008000; - CERR_ERROR = $00004000; - CERR_WARNING = $00002000; - CERR_HINT = $00001000; - CWARN_Info = $0000208A; - -const - // kcframe --sizeof returns these values -{$IFDEF WIN64} - FILE_KEYBOARD_SIZE = 2992; - FILE_GROUP_SIZE = 200; - FILE_STORE_SIZE = 200; - FILE_KEY_SIZE = 32; - FILE_DEADKEY_SIZE = 160; -{$ELSE} - FILE_KEYBOARD_SIZE = 2956; - FILE_GROUP_SIZE = 188; - FILE_STORE_SIZE = 192; - FILE_KEY_SIZE = 20; - FILE_DEADKEY_SIZE = 160; -{$ENDIF} - -implementation - -uses - System.SysUtils; - -initialization - try - Assert(sizeof(FILE_KEYBOARD) = FILE_KEYBOARD_SIZE, 'Assertion failure: sizeof(FILE_KEYBOARD) = FILE_KEYBOARD_SIZE'); - Assert(sizeof(FILE_GROUP) = FILE_GROUP_SIZE, 'Assertion failure: sizeof(FILE_GROUP) = FILE_GROUP_SIZE'); - Assert(sizeof(FILE_STORE) = FILE_STORE_SIZE, 'Assertion failure: sizeof(FILE_STORE) = FILE_STORE_SIZE'); - Assert(sizeof(FILE_KEY) = FILE_KEY_SIZE, 'Assertion failure: sizeof(FILE_KEY) = FILE_KEY_SIZE'); - Assert(sizeof(FILE_DEADKEY) = FILE_DEADKEY_SIZE, 'Assertion failure: sizeof(FILE_DEADKEY) = FILE_DEADKEY_SIZE'); - except - on E:Exception do - begin - // We emit to the console manually because this exception is otherwise - // completely silent, which is a pain for testing. - writeln(E.Message); - raise; - end; - end; -end. diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index 3452b73d301..be9aeae418e 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -75,7 +75,6 @@ uses KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', Keyman.System.Util.RenderLanguageIcon in '..\..\..\common\windows\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas', utilicon in '..\..\..\common\windows\delphi\general\utilicon.pas', - CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas', Keyman.Developer.System.ModelProjectTemplate in 'Keyman.Developer.System.ModelProjectTemplate.pas', Keyman.Developer.System.Project.modelTsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas', Keyman.Developer.System.Project.wordlistTsvProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 73defed445c..cb90099eff2 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -181,7 +181,6 @@ - diff --git a/developer/src/test/auto/Makefile b/developer/src/test/auto/Makefile index e90c9f88f2b..bb5e826f817 100644 --- a/developer/src/test/auto/Makefile +++ b/developer/src/test/auto/Makefile @@ -17,7 +17,6 @@ developer-tests: \ compile-supplementary-support \ keyboard-js-info \ kmcomp \ - kmcomp-x64-structures \ kmconvert \ kmx-file-languages \ model-ts-parser \ @@ -50,10 +49,6 @@ kmcomp: .virtual cd $(DEVELOPER_ROOT)\src\test\auto\kmcomp $(MAKE) $(TARGET) -kmcomp-x64-structures: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\kmcomp-x64-structures - $(MAKE) $(TARGET) - kmconvert: .virtual cd $(DEVELOPER_ROOT)\src\test\auto\kmconvert $(MAKE) $(TARGET) diff --git a/developer/src/test/auto/developer-test-auto.groupproj b/developer/src/test/auto/developer-test-auto.groupproj index b680dfb6aec..b818594f34b 100644 --- a/developer/src/test/auto/developer-test-auto.groupproj +++ b/developer/src/test/auto/developer-test-auto.groupproj @@ -6,9 +6,6 @@ - - - @@ -38,15 +35,6 @@ - - - - - - - - - diff --git a/developer/src/test/auto/kmcomp-x64-structures/.gitignore b/developer/src/test/auto/kmcomp-x64-structures/.gitignore deleted file mode 100644 index 741528af87d..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -32-passtructsize.txt -32-cppstructsize.txt -64-passtructsize.txt -64-cppstructsize.txt diff --git a/developer/src/test/auto/kmcomp-x64-structures/Makefile b/developer/src/test/auto/kmcomp-x64-structures/Makefile deleted file mode 100644 index c54d804c14e..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Test that struct sizes in tike and kmcmplib match -# for each of x86 and x64 -# - -!include ..\..\..\Defines.mak - -test: build - passtructsize\$(WIN32_TARGET_PATH)\passtructsize.exe > 32-passtructsize.txt - cppstructsize\$(WIN32_TARGET_PATH)\cppstructsize.exe > 32-cppstructsize.txt - echo Comparing 32-bit sizes - fc 32-passtructsize.txt 32-cppstructsize.txt - - passtructsize\$(WIN64_TARGET_PATH)\passtructsize.exe > 64-passtructsize.txt - cppstructsize\$(X64_TARGET_PATH)\cppstructsize.exe > 64-cppstructsize.txt - echo Comparing 64-bit sizes - fc 64-passtructsize.txt 64-cppstructsize.txt - -build: - $(DELPHI_MSBUILD) passtructsize\passtructsize.dproj "/p:Platform=Win32" - $(DELPHI_MSBUILD) passtructsize\passtructsize.dproj "/p:Platform=Win64" - $(MSBUILD) $(MSBUILD_BUILD) cppstructsize\cppstructsize.sln "/p:Platform=Win32" - $(MSBUILD) $(MSBUILD_BUILD) cppstructsize\cppstructsize.sln "/p:Platform=x64" - -clean: def-clean - -rd /s/q Win32 - -rd /s/q Win64 - -rd /s/q x64 - -del *structsize.txt - -!include ..\..\..\Target.mak diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.cpp b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.cpp deleted file mode 100644 index 2241323f60c..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// cppstructsize.cpp : This file contains the 'main' function. Program execution begins and ends there. -// - -#include "pch.h" -#include "../../../../kmcmplib/src/compfile.h" -#include - -int main() -{ - std::cout << "sz_FILE_STORE = " << sz_FILE_STORE << "\n"; - std::cout << "sz_FILE_KEY = " << sz_FILE_KEY << "\n"; - std::cout << "sz_FILE_GROUP = " << sz_FILE_GROUP << "\n"; - std::cout << "sz_FILE_DEADKEY = " << sz_FILE_DEADKEY << "\n"; - std::cout << "sz_FILE_VKDICTIONARY = " << sz_FILE_VKDICTIONARY << "\n"; - std::cout << "sz_FILE_KEYBOARD = " << sz_FILE_KEYBOARD << "\n"; -} diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.sln b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.sln deleted file mode 100644 index 57ef4ed8033..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.705 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppstructsize", "cppstructsize.vcxproj", "{A2CAE0E1-703A-419C-B82D-24080839E395}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2CAE0E1-703A-419C-B82D-24080839E395}.Debug|Win32.ActiveCfg = Debug|Win32 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Debug|Win32.Build.0 = Debug|Win32 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Debug|x64.ActiveCfg = Debug|x64 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Debug|x64.Build.0 = Debug|x64 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Release|Win32.ActiveCfg = Release|Win32 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Release|Win32.Build.0 = Release|Win32 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Release|x64.ActiveCfg = Release|x64 - {A2CAE0E1-703A-419C-B82D-24080839E395}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F058E766-ADAF-4972-AA75-DA04FD59FA1D} - EndGlobalSection -EndGlobal diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj deleted file mode 100644 index 6e43e65a0b0..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj +++ /dev/null @@ -1,181 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {A2CAE0E1-703A-419C-B82D-24080839E395} - Win32Proj - cppstructsize - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)\..\..\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\kmcmplib\include;$(IncludePath) - - - true - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)\..\..\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\kmcmplib\include;$(IncludePath) - - - false - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)\..\..\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\kmcmplib\include;$(IncludePath) - - - false - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)\..\..\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\kmcmplib\include;$(IncludePath) - - - - Use - Level3 - Disabled - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h - - - Console - true - - - - - Use - Level3 - Disabled - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h - - - Console - true - - - - - Use - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h - - - Console - true - true - true - - - - - Use - Level3 - MaxSpeed - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h - - - Console - true - true - true - - - - - - - - - - Create - Create - Create - Create - - - - - - \ No newline at end of file diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj.filters b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj.filters deleted file mode 100644 index 193b3bb1371..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/cppstructsize.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.cpp b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.cpp deleted file mode 100644 index 3a3d12b5a71..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// pch.cpp: source file corresponding to pre-compiled header; necessary for compilation to succeed - -#include "pch.h" - -// In general, ignore this file, but keep it around if you are using pre-compiled headers. diff --git a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.h b/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.h deleted file mode 100644 index 258aff0af45..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/cppstructsize/pch.h +++ /dev/null @@ -1,15 +0,0 @@ -// Tips for Getting Started: -// 1. Use the Solution Explorer window to add/manage files -// 2. Use the Team Explorer window to connect to source control -// 3. Use the Output window to see build output and other messages -// 4. Use the Error List window to view errors -// 5. Go to Project > Add New Item to create new code files, or Project > Add Existing Item to add existing code files to the project -// 6. In the future, to open this project again, go to File > Open > Project and select the .sln file - -#ifndef PCH_H -#define PCH_H - -// TODO: add headers that you want to pre-compile here -#include - -#endif //PCH_H diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize.res b/developer/src/test/auto/kmcomp-x64-structures/passtructsize.res deleted file mode 100644 index 93e7e944f20..00000000000 Binary files a/developer/src/test/auto/kmcomp-x64-structures/passtructsize.res and /dev/null differ diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr deleted file mode 100644 index 39516d1123d..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr +++ /dev/null @@ -1,39 +0,0 @@ -program passtructsize; - -{$APPTYPE CONSOLE} - -{$R *.res} - -uses - System.SysUtils, - compile in '..\..\..\..\common\delphi\compiler\compile.pas', - kmxfileconsts in '..\..\..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas', - RegistryKeys in '..\..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas', - KeymanVersion in '..\..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas', - RedistFiles in '..\..\..\..\tike\main\RedistFiles.pas', - ErrorControlledRegistry in '..\..\..\..\..\..\common\windows\delphi\vcl\ErrorControlledRegistry.pas', - Upload_Settings in '..\..\..\..\..\..\common\windows\delphi\general\Upload_Settings.pas', - DebugPaths in '..\..\..\..\..\..\common\windows\delphi\general\DebugPaths.pas', - KeymanPaths in '..\..\..\..\..\..\common\windows\delphi\general\KeymanPaths.pas', - VersionInfo in '..\..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas'; - -{ - These size values are used in unit tests to ensure - that the structure sizes correspond precisely across - compilers (pas and c++). -} -const sz_FILE_STORE = sizeof(FILE_STORE); -const sz_FILE_KEY = sizeof(FILE_KEY); -const sz_FILE_GROUP = sizeof(FILE_GROUP); -const sz_FILE_DEADKEY = sizeof(FILE_DEADKEY); -const sz_FILE_VKDICTIONARY = sizeof(FILE_VKDICTIONARY); -const sz_FILE_KEYBOARD = sizeof(FILE_KEYBOARD); - -begin - writeln('sz_FILE_STORE = '+IntToStr(sz_FILE_STORE)); - writeln('sz_FILE_KEY = '+IntToStr(sz_FILE_KEY)); - writeln('sz_FILE_GROUP = '+IntToStr(sz_FILE_GROUP)); - writeln('sz_FILE_DEADKEY = '+IntToStr(sz_FILE_DEADKEY)); - writeln('sz_FILE_VKDICTIONARY = '+IntToStr(sz_FILE_VKDICTIONARY)); - writeln('sz_FILE_KEYBOARD = '+IntToStr(sz_FILE_KEYBOARD)); -end. diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj deleted file mode 100644 index e3fe3e8ed83..00000000000 --- a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj +++ /dev/null @@ -1,996 +0,0 @@ - - - {766E074A-91D9-4651-8CB0-66EAF581A91E} - 18.8 - None - passtructsize.dpr - True - Debug - Win64 - 3 - Console - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - .\obj\$(Platform)\$(Config) - .\bin\$(Platform)\$(Config) - false - false - false - false - false - System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - passtructsize - - - DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;tethering;svnui;mbColorLibD10;dsnapcon;FireDACADSDriver;scFontCombo;DCPdelphi2009;FireDACMSAccDriver;fmxFireDAC;vclimg;Jcl;FireDAC;vcltouch;JvCore;vcldb;bindcompfmx;svn;FireDACSqliteDriver;FireDACPgDriver;inetdb;CEF4Delphi;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;EmbeddedWebBrowser_XE;VCLRESTComponents;soapserver;dbxcds;VclSmp;JvDocking;adortl;JclVcl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;keyman_components;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - Debug - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= - 1033 - true - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - - - DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;tethering;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;Jcl;FireDAC;vcltouch;vcldb;bindcompfmx;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;JclVcl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) - true - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - Debug - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= - 1033 - - - DEBUG;$(DCC_Define) - true - false - true - true - true - - - false - - - false - RELEASE;$(DCC_Define) - 0 - 0 - - - - MainSource - - - - - - - - - - - - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - Delphi.Personality.12 - Application - - - - passtructsize.dpr - - - - - - true - - - - - true - - - - - true - - - - - passtructsize.exe - true - - - - - passtructsize.exe - true - - - - - passtructsize.rsm - true - - - - - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - classes - 1 - - - classes - 1 - - - - - res\xml - 1 - - - res\xml - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\armeabi - 1 - - - library\lib\armeabi - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\mips - 1 - - - library\lib\mips - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\values-v21 - 1 - - - res\values-v21 - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-ldpi - 1 - - - res\drawable-ldpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-small - 1 - - - res\drawable-small - 1 - - - - - res\drawable-normal - 1 - - - res\drawable-normal - 1 - - - - - res\drawable-large - 1 - - - res\drawable-large - 1 - - - - - res\drawable-xlarge - 1 - - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - Contents\MacOS - 1 - .framework - - - Contents\MacOS - 1 - .framework - - - 0 - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .dll;.bpl - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .bpl - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - Contents\Resources\StartUp\ - 0 - - - Contents\Resources\StartUp\ - 0 - - - 0 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - 1 - - - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - Contents - 1 - - - Contents - 1 - - - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - - - - - - - - - - - True - True - - - 12 - - - - - diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.res b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.res deleted file mode 100644 index 93e7e944f20..00000000000 Binary files a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.res and /dev/null differ diff --git a/developer/src/tike/child/UfrmKeymanWizard.pas b/developer/src/tike/child/UfrmKeymanWizard.pas index 44e34411ed3..9d511388d66 100644 --- a/developer/src/tike/child/UfrmKeymanWizard.pas +++ b/developer/src/tike/child/UfrmKeymanWizard.pas @@ -571,7 +571,6 @@ implementation CharacterInfo, CharMapDropTool, Clipbrd, - compile, dmActionsMain, KeymanDeveloperOptions, KeymanVersion, @@ -2993,7 +2992,6 @@ procedure TfrmKeymanWizard.OSKImportKMX(Sender: TObject; var KMXFileName: TTempF Free; end; - TProject.CompilerMessageFile := ProjectFile; frmMessages.Clear; w := TKmcWrapper.Create; try @@ -3007,7 +3005,6 @@ procedure TfrmKeymanWizard.OSKImportKMX(Sender: TObject; var KMXFileName: TTempF w.Free; DeleteFile(KMNFileName); end; - TProject.CompilerMessageFile := nil; end; procedure TfrmKeymanWizard.OSKImportKMXFinished(Sender: TObject; KMXFileName: TTempFile); // I4181 diff --git a/developer/src/tike/compile/Keyman.Developer.System.KmcWrapper.pas b/developer/src/tike/compile/Keyman.Developer.System.KmcWrapper.pas index 5d51c42941a..9778119e9f3 100644 --- a/developer/src/tike/compile/Keyman.Developer.System.KmcWrapper.pas +++ b/developer/src/tike/compile/Keyman.Developer.System.KmcWrapper.pas @@ -11,6 +11,11 @@ TKmcWrapper = class function Compile(ProjectFile: TProjectFile; const infile, outfile: string; debug: Boolean): Boolean; end; +const + // TODO: these are still used for messages raised from the IDE, perhaps need to be factored out + CERR_ERROR = $00004000; + CERR_WARNING = $00002000; + implementation uses @@ -20,7 +25,6 @@ implementation Keyman.Developer.System.Project.Project, Keyman.Developer.System.Project.ProjectLog, Keyman.Developer.System.KeymanDeveloperPaths, - compile, utilexecute; { TKmcWrapper } diff --git a/developer/src/tike/main/UfrmMain.pas b/developer/src/tike/main/UfrmMain.pas index 18dc12c59d5..97cd169f8bd 100644 --- a/developer/src/tike/main/UfrmMain.pas +++ b/developer/src/tike/main/UfrmMain.pas @@ -440,7 +440,6 @@ implementation Keyman.System.CEFManager, CharMapDropTool, - compile, HTMLHelpViewer, KLog, KeymanVersion, diff --git a/developer/src/tike/main/UfrmMessages.pas b/developer/src/tike/main/UfrmMessages.pas index 9db9586855d..21d11fe6921 100644 --- a/developer/src/tike/main/UfrmMessages.pas +++ b/developer/src/tike/main/UfrmMessages.pas @@ -162,7 +162,6 @@ procedure TfrmMessages.Clear; begin FMessageItems.Clear; memoMessage.Clear; - ProjectCompilerMessageClear; end; procedure TfrmMessages.memoMessageDblClick(Sender: TObject); diff --git a/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFile.pas b/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFile.pas index 84fd6f6ebc9..66b858a3ba7 100644 --- a/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFile.pas +++ b/developer/src/tike/project/Keyman.Developer.System.Project.ProjectFile.pas @@ -172,9 +172,6 @@ TProject = class property Busy: Boolean read FBusy write FBusy; property MustSave: Boolean read FMustSave write FMustSave; - - public - class var CompilerMessageFile: TProjectFile; // I4694 end; { TProjectFile and associated classes } @@ -311,9 +308,6 @@ TProjectOptions = class // I4688 WM_USER_ProjectUpdateDisplayState = WM_USER; function GlobalProjectStateWndHandle: THandle; -function ProjectCompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 // I4694 -function ProjectCompilerMessageW(line: Integer; msgcode: LongWord; const text: string): Integer; -procedure ProjectCompilerMessageClear; function ProjectTypeFromString(s: string): TProjectType; function ProjectTypeToString(pt: TProjectType): string; @@ -329,7 +323,6 @@ implementation System.StrUtils, System.Variants, - CompileErrorCodes, Keyman.Developer.System.Project.Project, Keyman.Developer.System.Project.ProjectFileType, Keyman.Developer.System.Project.ProjectLoader, @@ -1154,64 +1147,6 @@ procedure TProjectFileStates.SetItem(Index, Value: WideString); end; end; -const - MAX_MESSAGES = 100; - -var - MessageCount: Integer = 0; - -procedure ProjectCompilerMessageClear; -begin - MessageCount := 0; -end; - -function ProjectCompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 // I4694 -begin - Result := ProjectCompilerMessageW(line, msgcode, String_AtoU(text)); -end; - -function ProjectCompilerMessageW(line: Integer; msgcode: LongWord; const text: string): Integer; // I3310 // I4694 -const // from compile.pas - CERR_FATAL = $00008000; - CERR_ERROR = $00004000; - CERR_WARNING = $00002000; - CERR_HINT = $00001000; - CWARN_Info = $0000208A; -var - FLogState: TProjectLogState; -begin - FLogState := plsInfo; - - if msgcode <> CWARN_Info then - case msgcode and $F000 of - CERR_HINT: FLogState := plsHint; - CERR_WARNING: FLogState := plsWarning; - CERR_ERROR: FLogState := plsError; - CERR_FATAL: FLogState := plsFatal; - end; - - if FLogState = plsWarning then // I4706 - TProject.CompilerMessageFile.FHasWarning := True; - - if FLogState in [plsWarning, plsError, plsFatal] then - begin - Inc(MessageCount); - if MessageCount > MAX_MESSAGES then - Exit(1); - end; - - TProject.CompilerMessageFile.Log(FLogState, text, msgcode, line); // I4706 - - if (FLogState <> plsInfo) and (MessageCount = MAX_MESSAGES) then - TProject.CompilerMessageFile.Log( - plsWarning, - Format('More than %d warnings or errors received; suppressing further messages', [MAX_MESSAGES]), - CWARN_TooManyErrorsOrWarnings, - line); - - Result := 1; -end; - { TProjectOptions } constructor TProjectOptions.Create; diff --git a/developer/src/tike/project/Keyman.Developer.System.Project.kmnProjectFileAction.pas b/developer/src/tike/project/Keyman.Developer.System.Project.kmnProjectFileAction.pas index ce952d979ee..11ad57ee934 100644 --- a/developer/src/tike/project/Keyman.Developer.System.Project.kmnProjectFileAction.pas +++ b/developer/src/tike/project/Keyman.Developer.System.Project.kmnProjectFileAction.pas @@ -28,7 +28,6 @@ implementation System.Variants, Winapi.Windows, - compile, Keyman.Developer.System.Project.ProjectLog, Keyman.System.KeyboardUtils, Keyman.Developer.System.KmcWrapper; diff --git a/developer/src/tike/project/Keyman.Developer.System.Project.modelTsProjectFileAction.pas b/developer/src/tike/project/Keyman.Developer.System.Project.modelTsProjectFileAction.pas index 399b127aa8c..834045aa177 100644 --- a/developer/src/tike/project/Keyman.Developer.System.Project.modelTsProjectFileAction.pas +++ b/developer/src/tike/project/Keyman.Developer.System.Project.modelTsProjectFileAction.pas @@ -29,8 +29,8 @@ implementation System.Variants, Winapi.Windows, - compile, Keyman.System.LexicalModelUtils, + Keyman.Developer.System.KmcWrapper, Keyman.Developer.System.LexicalModelCompile, VisualKeyboard; @@ -54,26 +54,21 @@ procedure TmodelTsProjectFileAction.CheckFilenameConventions; function TmodelTsProjectFileAction.CompileModel: Boolean; begin - TProject.CompilerMessageFile := Self; HasCompileWarning := False; // I4706 - try - CheckFilenameConventions; + CheckFilenameConventions; - Log(plsInfo, Format('Compiling ''%s''%s...', [Filename, IfThen(IsDebug, ' with debug symbols ', '')]), 0, 0); + Log(plsInfo, Format('Compiling ''%s''%s...', [Filename, IfThen(IsDebug, ' with debug symbols ', '')]), 0, 0); - //compile the model - ForceDirectories(ExtractFileDir(TargetFileName)); - Result := CompileModelFile(Self, FileName, TargetFileName, IsDebug); + //compile the model + ForceDirectories(ExtractFileDir(TargetFileName)); + Result := CompileModelFile(Self, FileName, TargetFileName, IsDebug); - if HasCompileWarning and (WarnAsError or OwnerProject.Options.CompilerWarningsAsErrors) then Result := False; // I4706 + if HasCompileWarning and (WarnAsError or OwnerProject.Options.CompilerWarningsAsErrors) then Result := False; // I4706 - if Result - then Log(plsSuccess, Format('''%s'' was compiled successfully to ''%s''.', [FileName, TargetFileName]), 0, 0) // I4504 - else Log(plsFailure, Format('''%s'' was not compiled successfully.', [FileName]), 0, 0); // I4504 - finally - TProject.CompilerMessageFile := nil; - end; + if Result + then Log(plsSuccess, Format('''%s'' was compiled successfully to ''%s''.', [FileName, TargetFileName]), 0, 0) // I4504 + else Log(plsFailure, Format('''%s'' was not compiled successfully.', [FileName]), 0, 0); // I4504 end; initialization diff --git a/developer/src/tike/tike.dpr b/developer/src/tike/tike.dpr index 11ac819f88b..bd2e6639331 100644 --- a/developer/src/tike/tike.dpr +++ b/developer/src/tike/tike.dpr @@ -13,7 +13,6 @@ uses UfrmAboutTike in 'dialogs\UfrmAboutTike.pas' {frmAboutTike}, RegistryKeys in '..\..\..\common\windows\delphi\general\RegistryKeys.pas', VersionInfo in '..\..\..\common\windows\delphi\general\VersionInfo.pas', - compile in '..\common\delphi\compiler\compile.pas', KeymanDeveloperOptions in 'main\KeymanDeveloperOptions.pas', UfrmKeyTest in 'debug\UfrmKeyTest.pas' {frmKeyTest}, KeymanDeveloperUtils in 'main\KeymanDeveloperUtils.pas', @@ -182,7 +181,6 @@ uses TempFileManager in '..\..\..\common\windows\delphi\general\TempFileManager.pas', UfrmKeymanWizard in 'child\UfrmKeymanWizard.pas' {frmKeymanWizard}, UfrmKeyboardFonts in 'dialogs\UfrmKeyboardFonts.pas' {frmKeyboardFonts}, - CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas', KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', TikeUnicodeData in 'main\TikeUnicodeData.pas', diff --git a/developer/src/tike/tike.dproj b/developer/src/tike/tike.dproj index 3ff3d319ca9..81d0469dca5 100644 --- a/developer/src/tike/tike.dproj +++ b/developer/src/tike/tike.dproj @@ -134,7 +134,6 @@ -
frmKeyTest
@@ -413,7 +412,6 @@
frmKeyboardFonts
 - diff --git a/windows/src/test/manual-tests/regressiontest/UfrmRegressionTests.pas b/windows/src/test/manual-tests/regressiontest/UfrmRegressionTests.pas index 43848fb0c8c..70f79c16ad8 100644 --- a/windows/src/test/manual-tests/regressiontest/UfrmRegressionTests.pas +++ b/windows/src/test/manual-tests/regressiontest/UfrmRegressionTests.pas @@ -1,18 +1,18 @@ (* Name: UfrmRegressionTests Copyright: Copyright (C) 2003-2017 SIL International. - Documentation: - Description: + Documentation: + Description: Create Date: 3 May 2011 Modified Date: 22 Jun 2015 Authors: mcdurdin - Related Files: - Dependencies: + Related Files: + Dependencies: - Bugs: - Todo: - Notes: + Bugs: + Todo: + Notes: History: 03 May 2011 - mcdurdin - I2890 - Record diagnostic data when encountering registry errors 22 Jun 2015 - mcdurdin - I4771 - Update regressiontest app for Engine and Developer 9.0 *) @@ -136,7 +136,6 @@ implementation keymanapi_TLB, DebugUtils, - compile, ErrorControlledRegistry, keyman32_int, msctf, @@ -476,7 +475,7 @@ function TfrmRegressionTests.DecodeXString(s: string; var sout: widestring): str end else if (s[1] = 'U') or (s[1] = 'u') then begin - Result := Result + '?'; + Result := Result + '?'; sout := sout + wchr(StrToInt('$' + Copy(s, 3, 4))); delete(s, 1, 6); end diff --git a/windows/src/test/manual-tests/regressiontest/regressiontest.dpr b/windows/src/test/manual-tests/regressiontest/regressiontest.dpr index 7170f19acf6..30e33f2c110 100644 --- a/windows/src/test/manual-tests/regressiontest/regressiontest.dpr +++ b/windows/src/test/manual-tests/regressiontest/regressiontest.dpr @@ -24,7 +24,6 @@ uses VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas', klog in '..\..\..\..\common\windows\delphi\general\klog.pas', keyman32_int in '..\..\global\delphi\general\keyman32_int.pas', - compile in '..\..\..\..\developer\src\common\delphi\compiler\compile.pas', SystemDebugPath in '..\..\global\delphi\general\SystemDebugPath.pas', msctf in '..\..\global\delphi\winapi\msctf.pas', DebugUtils in 'DebugUtils.pas', diff --git a/windows/src/test/manual-tests/regressiontest/regressiontest.dproj b/windows/src/test/manual-tests/regressiontest/regressiontest.dproj index 54009c3a729..12966cd2878 100644 --- a/windows/src/test/manual-tests/regressiontest/regressiontest.dproj +++ b/windows/src/test/manual-tests/regressiontest/regressiontest.dproj @@ -117,7 +117,6 @@ -