mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-15 00:05:02 +02:00
convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073
This commit is contained in:
@ -1,25 +1,25 @@
|
||||
/*
|
||||
* ERMScriptModule.h, part of VCMI engine
|
||||
*
|
||||
* Authors: listed in file AUTHORS in main folder
|
||||
*
|
||||
* License: GNU General Public License v2.0 or later
|
||||
* Full text of license available in license.txt file, in main folder
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../../lib/CScriptingModule.h"
|
||||
|
||||
class ERMScriptModule : public scripting::Module
|
||||
{
|
||||
public:
|
||||
ERMScriptModule();
|
||||
|
||||
std::string compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const override;
|
||||
|
||||
std::shared_ptr<scripting::ContextBase> createContextFor(const scripting::Script * source, const Environment * env) const override;
|
||||
|
||||
void registerSpellEffect(spells::effects::Registry * registry, const scripting::Script * source) const override;
|
||||
};
|
||||
|
||||
/*
|
||||
* ERMScriptModule.h, part of VCMI engine
|
||||
*
|
||||
* Authors: listed in file AUTHORS in main folder
|
||||
*
|
||||
* License: GNU General Public License v2.0 or later
|
||||
* Full text of license available in license.txt file, in main folder
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../../lib/CScriptingModule.h"
|
||||
|
||||
class ERMScriptModule : public scripting::Module
|
||||
{
|
||||
public:
|
||||
ERMScriptModule();
|
||||
|
||||
std::string compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const override;
|
||||
|
||||
std::shared_ptr<scripting::ContextBase> createContextFor(const scripting::Script * source, const Environment * env) const override;
|
||||
|
||||
void registerSpellEffect(spells::effects::Registry * registry, const scripting::Script * source) const override;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user