RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-01 23:00:58 +00:00
Code Issues Projects Releases Wiki Activity

Build codegen_emoji without GUI dependencies.

Browse Source 
We need GUI dependencies only when we generate images.
This commit is contained in:
John Preston 2017-04-03 21:49:07 +03:00
parent afa9393f38
commit 50586eb06d
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/codegen/emoji/generator.cpp
View File

@ -28,6 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtCore/QDir> #include <QtCore/QDir>
#ifdef SUPPORT_IMAGE_GENERATION
Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QWebpPlugin)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
@ -36,6 +37,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#else // !Q_OS_MAC && !Q_OS_WIN #else // !Q_OS_MAC && !Q_OS_WIN
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif // !Q_OS_MAC && !Q_OS_WIN #endif // !Q_OS_MAC && !Q_OS_WIN
#endif // SUPPORT_IMAGE_GENERATION
namespace codegen { namespace codegen {
namespace emoji { namespace emoji {
@ -126,7 +128,11 @@ QString computeId(Id id) {
} // namespace } // namespace
Generator::Generator(const Options &options) : project_(Project), writeImages_(options.writeImages), data_(PrepareData()) { Generator::Generator(const Options &options) : project_(Project)
#ifdef SUPPORT_IMAGE_GENERATION
, writeImages_(options.writeImages)
#endif // SUPPORT_IMAGE_GENERATION
, data_(PrepareData()) {
QDir dir(options.outputPath); QDir dir(options.outputPath);
if (!dir.mkpath(".")) { if (!dir.mkpath(".")) {
common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString(); common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
@ -142,13 +148,11 @@ int Generator::generate() {
return -1; return -1;
} }
#ifdef SUPPORT_IMAGE_GENERATION
if (writeImages_) { if (writeImages_) {
#ifdef Q_OS_MAC
return writeImages() ? 0 : -1; return writeImages() ? 0 : -1;
#else // Q_OS_MAC
common::logError(common::kErrorInternal, "Command Line") << "can not generate images in this OS.";
#endif // Q_OS_MAC
} }
#endif // SUPPORT_IMAGE_GENERATION
if (!writeSource()) { if (!writeSource()) {
return -1; return -1;
@ -163,6 +167,7 @@ int Generator::generate() {
constexpr auto kVariantsCount = 5; constexpr auto kVariantsCount = 5;
constexpr auto kEmojiInRow = 40; constexpr auto kEmojiInRow = 40;
#ifdef SUPPORT_IMAGE_GENERATION
QImage Generator::generateImage(int variantIndex) { QImage Generator::generateImage(int variantIndex) {
constexpr int kEmojiSizes[kVariantsCount + 1] = { 18, 22, 27, 36, 45, 180 }; constexpr int kEmojiSizes[kVariantsCount + 1] = { 18, 22, 27, 36, 45, 180 };
constexpr bool kBadSizes[kVariantsCount] = { true, true, false, false, false }; constexpr bool kBadSizes[kVariantsCount] = { true, true, false, false, false };
@ -261,6 +266,7 @@ bool Generator::writeImages() {
} }
return true; return true;
} }
#endif // SUPPORT_IMAGE_GENERATION
bool Generator::writeSource() { bool Generator::writeSource() {
source_ = std::make_unique<common::CppFile>(outputPath_ + ".cpp", project_); source_ = std::make_unique<common::CppFile>(outputPath_ + ".cpp", project_);

5
Telegram/SourceFiles/codegen/emoji/generator.h
View File

@ -39,8 +39,11 @@ public:
int generate(); int generate();
private: private:
#ifdef SUPPORT_IMAGE_GENERATION
QImage generateImage(int variantIndex); QImage generateImage(int variantIndex);
bool writeImages(); bool writeImages();
#endif // SUPPORT_IMAGE_GENERATION
bool writeSource(); bool writeSource();
bool writeHeader(); bool writeHeader();
@ -56,7 +59,9 @@ private:
const common::ProjectInfo &project_; const common::ProjectInfo &project_;
int colorsCount_ = 0; int colorsCount_ = 0;
#ifdef SUPPORT_IMAGE_GENERATION
bool writeImages_ = false; bool writeImages_ = false;
#endif // SUPPORT_IMAGE_GENERATION
QString outputPath_; QString outputPath_;
QString spritePath_; QString spritePath_;
std::unique_ptr<common::CppFile> source_; std::unique_ptr<common::CppFile> source_;

7
Telegram/SourceFiles/codegen/emoji/main.cpp
View File

@ -24,7 +24,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "codegen/emoji/generator.h" #include "codegen/emoji/generator.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
#ifdef SUPPORT_IMAGE_GENERATION
#ifndef Q_OS_MAC
#error "Image generation is supported only on macOS"
#endif // Q_OS_MAC
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
#else // SUPPORT_IMAGE_GENERATION
QCoreApplication app(argc, argv);
#endif // SUPPORT_IMAGE_GENERATION
auto options = codegen::emoji::parseOptions(); auto options = codegen::emoji::parseOptions();

2
Telegram/SourceFiles/codegen/emoji/options.cpp
View File

@ -50,8 +50,10 @@ Options parseOptions() {
} }
} else if (arg.startsWith("-o")) { } else if (arg.startsWith("-o")) {
result.outputPath = arg.mid(2); result.outputPath = arg.mid(2);
#ifdef SUPPORT_IMAGE_GENERATION
} else if (arg == "--images") { } else if (arg == "--images") {
result.writeImages = true; result.writeImages = true;
#endif // SUPPORT_IMAGE_GENERATION
} }
} }
if (result.outputPath.isEmpty()) { if (result.outputPath.isEmpty()) {

3
Telegram/SourceFiles/codegen/emoji/options.h
View File

@ -28,7 +28,10 @@ namespace emoji {
struct Options { struct Options {
QString outputPath = "."; QString outputPath = ".";
#ifdef SUPPORT_IMAGE_GENERATION
bool writeImages = false; bool writeImages = false;
#endif // SUPPORT_IMAGE_GENERATION
}; };
// Parsing failed if inputPath is empty in the result. // Parsing failed if inputPath is empty in the result.