[Scummvm-git-logs] scummvm master -> aa24872dc69fcec8c75376e4b909b85cd102b133
orgads
noreply at scummvm.org
Fri Jan 14 10:53:33 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c20f81e430 CREATE_PROJECT: Sparkle override/final
aa24872dc6 CREATE_PROJECT: Accept std::ostream in writeFileListToProject
Commit: c20f81e4308cbe0112f854b42cd4c7a6e4b17336
https://github.com/scummvm/scummvm/commit/c20f81e4308cbe0112f854b42cd4c7a6e4b17336
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-01-14T12:53:21+02:00
Commit Message:
CREATE_PROJECT: Sparkle override/final
Changed paths:
devtools/create_project/cmake.h
devtools/create_project/codeblocks.h
devtools/create_project/msbuild.h
devtools/create_project/msvc.h
devtools/create_project/xcode.h
diff --git a/devtools/create_project/cmake.h b/devtools/create_project/cmake.h
index 67162c125c3..f2e3047c658 100644
--- a/devtools/create_project/cmake.h
+++ b/devtools/create_project/cmake.h
@@ -31,25 +31,25 @@ namespace CreateProjectTool {
*
* Generated CMake projects are minimal, and will only work with GCC.
*/
-class CMakeProvider : public ProjectProvider {
+class CMakeProvider final : public ProjectProvider {
public:
CMakeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version = 0);
protected:
- void createWorkspace(const BuildSetup &setup);
+ void createWorkspace(const BuildSetup &setup) final;
- void createOtherBuildFiles(const BuildSetup &) {}
+ void createOtherBuildFiles(const BuildSetup &) final {}
- void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) {}
+ void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) final {}
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList);
+ const StringList &includeList, const StringList &excludeList) final;
void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix);
+ const std::string &objPrefix, const std::string &filePrefix) final;
- const char *getProjectExtension();
+ const char *getProjectExtension() final;
private:
enum SDLVersion {
diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h
index e3b8b9cd86d..fbd82bc182d 100644
--- a/devtools/create_project/codeblocks.h
+++ b/devtools/create_project/codeblocks.h
@@ -26,27 +26,27 @@
namespace CreateProjectTool {
-class CodeBlocksProvider : public ProjectProvider {
+class CodeBlocksProvider final : public ProjectProvider {
public:
CodeBlocksProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version = 0);
protected:
- void createWorkspace(const BuildSetup &setup);
+ void createWorkspace(const BuildSetup &setup) final;
- void createOtherBuildFiles(const BuildSetup &) {}
+ void createOtherBuildFiles(const BuildSetup &) final {}
- void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList);
+ void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) final;
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList);
+ const StringList &includeList, const StringList &excludeList) final;
void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix);
+ const std::string &objPrefix, const std::string &filePrefix) final;
- void writeReferences(const BuildSetup &setup, std::ofstream &output);
+ void writeReferences(const BuildSetup &setup, std::ofstream &output) final;
- const char *getProjectExtension();
+ const char *getProjectExtension() final;
private:
void writeWarnings(const std::string &name, std::ofstream &output) const;
diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index d44ed164f15..f92376b0f0b 100644
--- a/devtools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
@@ -26,7 +26,7 @@
namespace CreateProjectTool {
-class MSBuildProvider : public MSVCProvider {
+class MSBuildProvider final : public MSVCProvider {
public:
MSBuildProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc);
diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h
index f0290b20d49..c0e496e5cc7 100644
--- a/devtools/create_project/msvc.h
+++ b/devtools/create_project/msvc.h
@@ -53,11 +53,11 @@ protected:
std::string getLibraryFromFeature(const char *feature, const BuildSetup &setup, bool isRelease) const;
std::string outputLibraryDependencies(const BuildSetup &setup, bool isRelease) const;
- void createWorkspace(const BuildSetup &setup);
+ void createWorkspace(const BuildSetup &setup) override;
- void createOtherBuildFiles(const BuildSetup &setup);
+ void createOtherBuildFiles(const BuildSetup &setup) override;
- void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList);
+ void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) override;
/**
* Create the global project properties.
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 1dfbdc4e91e..5305d9c3191 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -29,23 +29,23 @@
namespace CreateProjectTool {
-class XcodeProvider : public ProjectProvider {
+class XcodeProvider final : public ProjectProvider {
public:
XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version = 0);
protected:
- void createWorkspace(const BuildSetup &setup);
+ void createWorkspace(const BuildSetup &setup) final;
- void createOtherBuildFiles(const BuildSetup &setup);
+ void createOtherBuildFiles(const BuildSetup &setup) final;
- void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList);
+ void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) final;
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList);
+ const StringList &includeList, const StringList &excludeList) final;
void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix);
+ const std::string &objPrefix, const std::string &filePrefix) final;
private:
enum {
kSettingsAsList = 0x01,
Commit: aa24872dc69fcec8c75376e4b909b85cd102b133
https://github.com/scummvm/scummvm/commit/aa24872dc69fcec8c75376e4b909b85cd102b133
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-01-14T12:53:21+02:00
Commit Message:
CREATE_PROJECT: Accept std::ostream in writeFileListToProject
Changed paths:
devtools/create_project/cmake.cpp
devtools/create_project/cmake.h
devtools/create_project/codeblocks.cpp
devtools/create_project/codeblocks.h
devtools/create_project/create_project.cpp
devtools/create_project/create_project.h
devtools/create_project/msbuild.cpp
devtools/create_project/msbuild.h
devtools/create_project/xcode.cpp
devtools/create_project/xcode.h
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 7077b6a8bdc..c421d699c2d 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -330,7 +330,7 @@ void CMakeProvider::writeDefines(const BuildSetup &setup, std::ofstream &output)
}
}
-void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) {
std::string lastName;
diff --git a/devtools/create_project/cmake.h b/devtools/create_project/cmake.h
index f2e3047c658..8f62e22b573 100644
--- a/devtools/create_project/cmake.h
+++ b/devtools/create_project/cmake.h
@@ -46,7 +46,7 @@ protected:
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
const StringList &includeList, const StringList &excludeList) final;
- void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+ void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) final;
const char *getProjectExtension() final;
diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index 14183521405..2921fe6be46 100644
--- a/devtools/create_project/codeblocks.cpp
+++ b/devtools/create_project/codeblocks.cpp
@@ -248,7 +248,7 @@ void CodeBlocksProvider::writeDefines(const StringList &defines, std::ofstream &
output << "\t\t\t\t\t<Add option=\"-D" << *i << "\" />\n";
}
-void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) {
for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) {
diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h
index fbd82bc182d..340b77bf429 100644
--- a/devtools/create_project/codeblocks.h
+++ b/devtools/create_project/codeblocks.h
@@ -41,7 +41,7 @@ protected:
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
const StringList &includeList, const StringList &excludeList) final;
- void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+ void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) final;
void writeReferences(const BuildSetup &setup, std::ofstream &output) final;
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index d93468eff85..4e945a71692 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1800,7 +1800,7 @@ std::string ProjectProvider::getLastPathComponent(const std::string &path) {
return path.substr(pos + 1);
}
-void ProjectProvider::addFilesToProject(const std::string &dir, std::ofstream &projectFile,
+void ProjectProvider::addFilesToProject(const std::string &dir, std::ostream &projectFile,
const StringList &includeList, const StringList &excludeList,
const std::string &filePrefix) {
FileNode *files = scanFiles(dir, includeList, excludeList);
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index feb7615fc93..af2450bb021 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -551,7 +551,7 @@ protected:
* @param objPrefix Prefix to use for object files, which would name clash.
* @param filePrefix Generic prefix to all files of the node.
*/
- virtual void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+ virtual void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) = 0;
/**
@@ -575,7 +575,7 @@ protected:
* @param excludeList Files to exclude (must have a relative directory as prefix).
* @param filePrefix Prefix to use for relative path arguments.
*/
- void addFilesToProject(const std::string &dir, std::ofstream &projectFile,
+ void addFilesToProject(const std::string &dir, std::ostream &projectFile,
const StringList &includeList, const StringList &excludeList,
const std::string &filePrefix);
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 574d2cf3850..f866a089f71 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -506,7 +506,7 @@ void MSBuildProvider::outputNasmCommand(std::ostream &projectFile, const std::st
}
}
-void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int,
+void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int,
const std::string &objPrefix, const std::string &filePrefix) {
// Reset lists
_filters.clear();
diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index f92376b0f0b..cd0f4d992a8 100644
--- a/devtools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
@@ -36,7 +36,7 @@ protected:
void outputProjectSettings(std::ofstream &project, const std::string &name, const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration);
- void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+ void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) override;
void writeReferences(const BuildSetup &setup, std::ofstream &output) override;
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index a25d7dabf23..bd9b56062f0 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -375,7 +375,7 @@ void XcodeProvider::outputMainProjectFile(const BuildSetup &setup) {
//////////////////////////////////////////////////////////////////////////
// Files
//////////////////////////////////////////////////////////////////////////
-void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) {
// Ensure that top-level groups are generated for i.e. engines/
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 5305d9c3191..c5a01e733ee 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -44,7 +44,7 @@ protected:
void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
const StringList &includeList, const StringList &excludeList) final;
- void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
+ void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation,
const std::string &objPrefix, const std::string &filePrefix) final;
private:
enum {
More information about the Scummvm-git-logs
mailing list