[debian-edu-commits] debian-edu/ 03/08: Fix accidentally changed source files.

Dominik George natureshadow-guest at moszumanska.debian.org
Tue Jan 16 00:42:39 UTC 2018


This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository sdaps.

commit a805071682b70a37b65cbc0f4b07539894787a23
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Jan 16 00:46:43 2018 +0100

    Fix accidentally changed source files.
---
 sdaps/setuptex/__init__.py | 20 ++++++++++++++++++++
 setup.py                   |  6 ++++++
 2 files changed, 26 insertions(+)

diff --git a/sdaps/setuptex/__init__.py b/sdaps/setuptex/__init__.py
index a1faebb..f9ceab4 100644
--- a/sdaps/setuptex/__init__.py
+++ b/sdaps/setuptex/__init__.py
@@ -89,6 +89,26 @@ def setup(survey, questionnaire_tex, additionalqobjects=None, extra_files=[]):
 
         write_latex_override_file(survey, draft=True)
 
+        # Copy class and dictionary files
+        if paths.local_run:
+            cls_file = os.path.join(paths.source_dir, 'tex', 'sdaps.cls')
+            code128_file = os.path.join(paths.source_dir, 'tex', 'code128.tex')
+            qrcode_style = os.path.join(paths.source_dir, 'tex', 'qrcode.sty')
+            dict_files = os.path.join(paths.build_dir, 'tex', '*.dict')
+            dict_files = glob.glob(dict_files)
+        else:
+            cls_file = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'sdaps.cls')
+            code128_file = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'code128.tex')
+            qrcode_style = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'qrcode.sty')
+            dict_files = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', '*.dict')
+            dict_files = glob.glob(dict_files)
+
+        shutil.copyfile(cls_file, survey.path('sdaps.cls'))
+        shutil.copyfile(code128_file, survey.path('code128.tex'))
+        shutil.copyfile(qrcode_style, survey.path('qrcode.sty'))
+        for dict_file in dict_files:
+            shutil.copyfile(dict_file, survey.path(os.path.basename(dict_file)))
+
         for add_file in extra_files:
             shutil.copyfile(add_file, survey.path(os.path.basename(add_file)))
 
diff --git a/setup.py b/setup.py
index 1cfe669..9ed6042 100755
--- a/setup.py
+++ b/setup.py
@@ -190,6 +190,12 @@ the tools to later analyse the scanned data, and create a report.
                   ('share/sdaps/ui',
                    glob.glob("sdaps/gui/*.ui")
                   ),
+                  ('share/sdaps/tex', glob.glob('tex/*.cls')
+                  ),
+                  ('share/sdaps/tex', glob.glob('tex/*.tex')
+                  ),
+                  ('share/sdaps/tex', glob.glob('tex/*.sty')
+                  ),
                   ],
       cmdclass = { "build" : build_extra.build_extra,
                    "build_i18n" :  sdaps_build_i18n,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/sdaps.git



More information about the debian-edu-commits mailing list