diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_freeze_module.vcxproj | 22 | ||||
| -rw-r--r-- | PCbuild/_freeze_module.vcxproj.filters | 391 | ||||
| -rw-r--r-- | PCbuild/python.vcxproj | 7 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 21 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 23 |
5 files changed, 456 insertions, 8 deletions
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj index 54fef9c..7b2df4b 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -104,6 +104,7 @@ <ClCompile Include="..\Modules\faulthandler.c" /> <ClCompile Include="..\Modules\gcmodule.c" /> <ClCompile Include="..\Modules\getbuildinfo.c" /> + <ClCompile Include="..\Modules\getpath_noop.c" /> <ClCompile Include="..\Modules\posixmodule.c" /> <ClCompile Include="..\Modules\signalmodule.c" /> <ClCompile Include="..\Modules\_tracemalloc.c" /> @@ -168,7 +169,6 @@ <ClCompile Include="..\Parser\string_parser.c" /> <ClCompile Include="..\Parser\token.c" /> <ClCompile Include="..\Parser\tokenizer.c" /> - <ClCompile Include="..\PC\getpathp.c" /> <ClCompile Include="..\PC\invalid_parameter_handler.c" /> <ClCompile Include="..\PC\msvcrtmodule.c" /> <ClCompile Include="..\PC\winreg.c" /> @@ -374,9 +374,29 @@ </None> <!-- END frozen modules --> </ItemGroup> + <ItemGroup> + <!-- We manually freeze getpath.py rather than through freeze_modules --> + <GetPath Include="..\Modules\getpath.py"> + <ModName>getpath</ModName> + <IntFile>$(IntDir)getpath.g.h</IntFile> + <OutFile>$(PySourcePath)Modules\getpath.h</OutFile> + </GetPath> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> + <Target Name="_RebuildGetPath" AfterTargets="_RebuildFrozen" Condition="$(Configuration) != 'PGUpdate'"> + <Exec Command='"$(TargetPath)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' /> + + <Copy SourceFiles="%(GetPath.IntFile)" + DestinationFiles="%(GetPath.OutFile)" + Condition="!Exists(%(GetPath.OutFile)) or (Exists(%(GetPath.IntFile)) and '$([System.IO.File]::ReadAllText(%(GetPath.OutFile)).Replace(`
`, `
`))' != '$([System.IO.File]::ReadAllText(%(GetPath.IntFile)).Replace(`
`, `
`))')"> + <Output TaskParameter="CopiedFiles" ItemName="_UpdatedGetPath" /> + </Copy> + + <Message Text="Updated files: @(_UpdatedGetPath->'%(Filename)%(Extension)',', ')" + Condition="'@(_UpdatedGetPath)' != ''" Importance="high" /> + </Target> <Target Name="_RebuildFrozen" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGUpdate'"> <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.DeepIntFile)"' /> diff --git a/PCbuild/_freeze_module.vcxproj.filters b/PCbuild/_freeze_module.vcxproj.filters index 5894909..1c8f1b0 100644 --- a/PCbuild/_freeze_module.vcxproj.filters +++ b/PCbuild/_freeze_module.vcxproj.filters @@ -13,6 +13,395 @@ <ClCompile Include="..\Programs\_freeze_module.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\Modules\_io\_iomodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_tracemalloc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\_warnings.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\abstract.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\accu.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\asdl.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\ast.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\ast_opt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\ast_unparse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\atexitmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\bltinmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\boolobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\bootstrap_hash.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\bufferedio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\bytearrayobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\bytes_methods.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\bytesio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\bytesobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\call.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\capsule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\cellobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\ceval.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\classobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\codecs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\codeobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\compile.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\complexobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\PC\config_minimal.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\context.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\descrobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\dictobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\dtoa.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\dynamic_annotations.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\dynload_win.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\enumobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\errors.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\exceptions.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\faulthandler.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\fileio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\fileobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\fileutils.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\floatobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\formatter_unicode.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\frame.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\frameobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\funcobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\future.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\gcmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\genericaliasobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\genobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getargs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\getbuildinfo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getcompiler.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getcopyright.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\getpath_noop.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getplatform.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\getversion.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\hamt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\hashtable.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\import.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\importdl.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\initconfig.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\interpreteridobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\PC\invalid_parameter_handler.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\iobase.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\iterobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\listobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\longobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\marshal.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\memoryobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\methodobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\modsupport.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\moduleobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\PC\msvcrtmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\myreadline.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\mysnprintf.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\mystrtoul.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\namespaceobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\object.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\obmalloc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\odictobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\parser.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pathconfig.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\peg_api.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\pegen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\picklebufobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\posixmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\preconfig.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pyarena.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pyctype.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pyfpe.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pyhash.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pylifecycle.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pymath.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pystate.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pystrcmp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pystrhex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pystrtod.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\Python-ast.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pythonrun.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\Python-tokenize.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\pytime.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\rangeobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\setobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\signalmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\sliceobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\specialize.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\string_parser.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\stringio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\structmember.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\structseq.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\suggestions.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\symtable.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\sysmodule.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\textio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\thread.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\token.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Parser\tokenizer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Python\traceback.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\tupleobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\typeobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\unicodectype.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\unicodeobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\unionobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Objects\weakrefobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\Modules\_io\winconsoleio.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\PC\winreg.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <None Include="..\Modules\getpath.py"> + <Filter>Python Files</Filter> + </None> </ItemGroup> <ItemGroup> <!-- BEGIN frozen modules --> @@ -78,4 +467,4 @@ </None> <!-- END frozen modules --> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index b58945a..0b4329d 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -147,4 +147,11 @@ $(_PGOPath) </PropertyGroup> <WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" /> </Target> + <Target Name="GeneratePyBuildDirTxt" BeforeTargets="AfterBuild"> + <PropertyGroup> + <_Content>$(OutDir)</_Content> + <_ExistingContent Condition="Exists('$(OutDir)pybuilddir.txt')">$([System.IO.File]::ReadAllText('$(OutDir)pybuilddir.txt'))</_ExistingContent> + </PropertyGroup> + <WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" /> + </Target> </Project> diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 9d96f4b..b446e09 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -110,6 +110,19 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\Modules\getpath.c"> + <PreprocessorDefinitions> + PREFIX=NULL; + EXEC_PREFIX=NULL; + VERSION=NULL; + VPATH="..\\.."; + PYDEBUGEXT="$(PyDebugExt)"; + PLATLIBDIR="DLLs"; + %(PreprocessorDefinitions) + </PreprocessorDefinitions> + </ClCompile> + </ItemGroup> + <ItemGroup> <ClInclude Include="..\Include\Python.h" /> <ClInclude Include="..\Include\abstract.h" /> <ClInclude Include="..\Include\boolobject.h" /> @@ -349,6 +362,7 @@ <ClCompile Include="..\Modules\errnomodule.c" /> <ClCompile Include="..\Modules\faulthandler.c" /> <ClCompile Include="..\Modules\gcmodule.c" /> + <ClCompile Include="..\Modules\getbuildinfo.c" /> <ClCompile Include="..\Modules\itertoolsmodule.c" /> <ClCompile Include="..\Modules\main.c" /> <ClCompile Include="..\Modules\mathmodule.c" /> @@ -442,7 +456,6 @@ <ClCompile Include="..\PC\invalid_parameter_handler.c" /> <ClCompile Include="..\PC\winreg.c" /> <ClCompile Include="..\PC\config.c" /> - <ClCompile Include="..\PC\getpathp.c" /> <ClCompile Include="..\PC\msvcrtmodule.c" /> <ClCompile Include="..\Python\pyhash.c" /> <ClCompile Include="..\Python\_warnings.c" /> @@ -570,7 +583,7 @@ </PropertyGroup> <Message Text="Building $(GitTag):$(GitVersion) $(GitBranch)" Importance="high" /> <ItemGroup> - <ClCompile Include="..\Modules\getbuildinfo.c"> + <ClCompile Condition="$(Filename) == 'getbuildinfo'"> <PreprocessorDefinitions>GITVERSION="$(GitVersion)";GITTAG="$(GitTag)";GITBRANCH="$(GitBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemGroup> @@ -590,4 +603,8 @@ <Target Name="_CleanVCRuntime" AfterTargets="Clean"> <Delete Files="@(VCRuntimeDLL->'$(OutDir)%(Filename)%(Extension)')" /> </Target> + + <Target Name="_DeletePyBuildDirTxt" BeforeTargets="PrepareForBuild"> + <Delete Files="$(OutDir)pybuilddir.txt" /> + </Target> </Project> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index b19f027..c1667e3 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -648,6 +648,9 @@ <ClInclude Include="$(zlibDir)\zutil.h"> <Filter>Modules\zlib</Filter> </ClInclude> + <ClInclude Include="..\Include\internal\pycore_structseq.h"> + <Filter>Include\internal</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\Modules\_abc.c"> @@ -971,9 +974,6 @@ <ClCompile Include="..\PC\dl_nt.c"> <Filter>PC</Filter> </ClCompile> - <ClCompile Include="..\PC\getpathp.c"> - <Filter>PC</Filter> - </ClCompile> <ClCompile Include="..\PC\msvcrtmodule.c"> <Filter>PC</Filter> </ClCompile> @@ -1229,10 +1229,25 @@ <ClCompile Include="..\Objects\unionobject.c"> <Filter>Objects</Filter> </ClCompile> + <ClCompile Include="..\Python\frame.c"> + <Filter>Python</Filter> + </ClCompile> + <ClCompile Include="..\Modules\getpath.c"> + <Filter>Modules</Filter> + </ClCompile> + <ClCompile Include="..\Python\suggestions.c"> + <Filter>Python</Filter> + </ClCompile> + <ClCompile Include="..\Python\Python-tokenize.c"> + <Filter>Python</Filter> + </ClCompile> + <ClCompile Include="..\Modules\getbuildinfo.c"> + <Filter>Modules</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\PC\python_nt.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project> +</Project>
\ No newline at end of file |