From 568271ee809163b9b8ac23a60810d7d036f0dfc7 Mon Sep 17 00:00:00 2001 From: Sergio Costas Date: Sun, 7 Nov 2021 17:51:42 +0100 Subject: [PATCH] Revert "test" This reverts commit dc6b805fe6a937546190be8faedb796e3638c5a1. --- setup.py | 14 +++++++------- src/devede_ng.py | 6 ------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 339eb71..1fd63a6 100755 --- a/setup.py +++ b/setup.py @@ -3,12 +3,11 @@ import os import sys from glob import glob -from setuptools import setup +from distutils.core import setup try: - from setuptools import dep_util + from distutils import dep_util except: - print("No") pass @@ -37,7 +36,7 @@ def get_data_files(): # translations must be always in /usr/share because Gtk.builder only # search there. If someone knows how to fix this... # share/locale/fr/LC_MESSAGES/ - target = os.path.join('share', 'locale', + target = os.path.join('/usr', 'share', 'locale', lang_name, 'LC_MESSAGES') data_files.append((target, [mofile])) @@ -64,9 +63,10 @@ def compile_translations(): if not os.path.isdir(modir): os.makedirs(modir) - os.system("msgfmt \"" + pofile + "\" -o \"" + mofile + "\"") + if not os.path.isfile(mofile) or dep_util.newer(pofile, mofile): + # msgfmt.make(pofile, mofile) + os.system("msgfmt \"" + pofile + "\" -o \"" + mofile + "\"") except: - print("Error") pass try: @@ -132,5 +132,5 @@ setup( scripts=['src/devede_ng.py', 'src/copy_files_verbose.py'], ) -if (len(sys.argv) >= 2) and (sys.argv[1] == "install"): +if (len(sys.argv) == 2) and (sys.argv[1] == "install"): os.system("gtk-update-icon-cache") diff --git a/src/devede_ng.py b/src/devede_ng.py index 655eed5..34566f7 100755 --- a/src/devede_ng.py +++ b/src/devede_ng.py @@ -27,12 +27,6 @@ import devedeng.project import devedeng.configuration_data import devedeng.choose_disc_type -import pkg_resources - -print(pkg_resources.resource_dir) -print(pkg_resources.resource_filename("devedeng", 'data/devede_ng.py.desktop')) - - config_data = devedeng.configuration_data.configuration.get_config() if config_data is None: