From 522156b467369e5c3eaf5631c49be2d28c50b8b9 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 22 Mar 2019 07:26:51 +0100
Subject: [PATCH] Renamed generated .cc files (fonts, glyphs) so they don't
 need to be excluded in pymod builds.

---
 setup.py                               | 5 -----
 src/db/db/dbGlyphs.cc                  | 2 +-
 src/db/db/dbHershey.cc                 | 2 +-
 src/db/db/{fonts.cc => fonts.cc_gen}   | 0
 src/db/db/{glyphs.cc => glyphs.cc_gen} | 0
 5 files changed, 2 insertions(+), 7 deletions(-)
 rename src/db/db/{fonts.cc => fonts.cc_gen} (100%)
 rename src/db/db/{glyphs.cc => glyphs.cc_gen} (100%)

diff --git a/setup.py b/setup.py
index 2ec26284c..ecdaff2f4 100644
--- a/setup.py
+++ b/setup.py
@@ -389,11 +389,6 @@ config.add_extension(_pya)
 _db_path = os.path.join("src", "db", "db")
 _db_sources = set(glob.glob(os.path.join(_db_path, "*.cc")))
 
-# Not a real source:
-# Caveat, in source distribution tarballs from pypi, these files will
-# not exist. So we need an error-free discard method instead of list's remove.
-_db_sources.discard(os.path.join(_db_path, "fonts.cc"))
-
 _db = Library(config.root + '._db',
               define_macros=config.macros() + [('MAKE_DB_LIBRARY', 1)],
               include_dirs=[_tl_path, _gsi_path, _db_path],
diff --git a/src/db/db/dbGlyphs.cc b/src/db/db/dbGlyphs.cc
index 812fefe06..320c3dbfa 100644
--- a/src/db/db/dbGlyphs.cc
+++ b/src/db/db/dbGlyphs.cc
@@ -37,7 +37,7 @@
 #include <cctype>
 
 //  compiled with "scripts/compile_glyphs.rb":
-#include "glyphs.cc"
+#include "glyphs.cc_gen"
 
 namespace db
 {
diff --git a/src/db/db/dbHershey.cc b/src/db/db/dbHershey.cc
index 194019666..2abb5091c 100644
--- a/src/db/db/dbHershey.cc
+++ b/src/db/db/dbHershey.cc
@@ -67,7 +67,7 @@ struct HersheyFont
   int width, height;
 };
 
-#include "fonts.cc"
+#include "fonts.cc_gen"
 
 const int line_spacing = 4;
 
diff --git a/src/db/db/fonts.cc b/src/db/db/fonts.cc_gen
similarity index 100%
rename from src/db/db/fonts.cc
rename to src/db/db/fonts.cc_gen
diff --git a/src/db/db/glyphs.cc b/src/db/db/glyphs.cc_gen
similarity index 100%
rename from src/db/db/glyphs.cc
rename to src/db/db/glyphs.cc_gen