From cc60ee2ea9e913ec9bea35f6f4e254fef8043b8d Mon Sep 17 00:00:00 2001 From: Gaetan Semet Date: Sat, 14 Apr 2018 19:23:00 +0200 Subject: [PATCH] move guake/data to data Signed-off-by: Gaetan Semet --- .gitignore | 2 +- Makefile | 44 +++++++++--------- {guake/data => data}/about.glade | 0 {guake/data => data}/autostart-guake.desktop | 0 data/gschemas.compiled | Bin 0 -> 7645 bytes .../guake-prefs.template.desktop | 0 {guake/data => data}/guake.glade | 0 {guake/data => data}/guake.template.desktop | 0 {guake/data => data}/org.guake.gschema.xml | 0 {guake/data => data}/pixmaps/add_tab.png | Bin {guake/data => data}/pixmaps/guake-128.png | Bin {guake/data => data}/pixmaps/guake-48.png | Bin {guake/data => data}/pixmaps/guake-64.png | Bin .../pixmaps/guake-notification.png | Bin {guake/data => data}/pixmaps/guake-tray.png | Bin {guake/data => data}/pixmaps/guake-tray.svg | 0 {guake/data => data}/pixmaps/guake.png | Bin {guake/data => data}/pixmaps/quick-open.png | Bin {guake/data => data}/prefs.glade | 0 guake/data/__init__.py | 0 20 files changed, 24 insertions(+), 22 deletions(-) rename {guake/data => data}/about.glade (100%) rename {guake/data => data}/autostart-guake.desktop (100%) create mode 100644 data/gschemas.compiled rename {guake/data => data}/guake-prefs.template.desktop (100%) rename {guake/data => data}/guake.glade (100%) rename {guake/data => data}/guake.template.desktop (100%) rename {guake/data => data}/org.guake.gschema.xml (100%) rename {guake/data => data}/pixmaps/add_tab.png (100%) rename {guake/data => data}/pixmaps/guake-128.png (100%) rename {guake/data => data}/pixmaps/guake-48.png (100%) rename {guake/data => data}/pixmaps/guake-64.png (100%) rename {guake/data => data}/pixmaps/guake-notification.png (100%) rename {guake/data => data}/pixmaps/guake-tray.png (100%) rename {guake/data => data}/pixmaps/guake-tray.svg (100%) rename {guake/data => data}/pixmaps/guake.png (100%) rename {guake/data => data}/pixmaps/quick-open.png (100%) rename {guake/data => data}/prefs.glade (100%) delete mode 100644 guake/data/__init__.py diff --git a/.gitignore b/.gitignore index 9ed01415..4b641dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,7 @@ ChangeLog .venv .vscode/ -guake/data/gschemas.compiled +data/gschemas.compiled .pytest_cache/ releasenotes/notes/reno.cache guake/paths.py diff --git a/Makefile b/Makefile index 4beaa599..15940c7c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ PYTHON_SITE_PACKAGE_NAME:=$(shell $(PYTHON_INTERPRETER) -c "import site; import PYTHON_SITE_PACKAGE_DIR=$(prefix)/lib/python$(shell $(PYTHON_INTERPRETER) -c "import sys; v = sys.version_info; print('{}.{}'.format(v.major, v.minor))")/$(PYTHON_SITE_PACKAGE_NAME) OLD_PREFIX:=$(DESTDIR)usr ROOT_DIR=$(shell pwd) -DATA_DIR=$(ROOT_DIR)/guake/data +DATA_DIR=$(ROOT_DIR)/data COMPILE_SCHEMA:=1 datarootdir:=$(prefix)/share @@ -24,6 +24,7 @@ gsettingsschemadir:=$(datarootdir)/glib-2.0/schemas AUTOSTART_FOLDER:=~/.config/autostart +DEV_DATA_DIR:=$(DATA_DIR) DEV_IMAGE_DIR:=$(DATA_DIR)/pixmaps DEV_LOCALE_DIR:=$(localedir) DEV_GLADE_DIR:=$(DATA_DIR) @@ -105,19 +106,19 @@ install-old-locale: @find $(OLD_PREFIX)/share/locale/ -name "guake.mo" -exec rm -f {} \; install-schemas: - install -Dm644 "guake/data/guake.desktop" "$(DESTDIR)$(prefix)/share/applications/guake.desktop" - install -Dm644 "guake/data/guake-prefs.desktop" "$(DESTDIR)$(prefix)/share/applications/guake-prefs.desktop" + install -Dm644 "$(DEV_DATA_DIR)/guake.desktop" "$(DESTDIR)$(prefix)/share/applications/guake.desktop" + install -Dm644 "$(DEV_DATA_DIR)/guake-prefs.desktop" "$(DESTDIR)$(prefix)/share/applications/guake-prefs.desktop" mkdir -p $(DESTDIR)$(IMAGE_DIR) - install -Dm644 guake/data/pixmaps/*.png "$(DESTDIR)$(IMAGE_DIR)/" - install -Dm644 guake/data/pixmaps/*.svg "$(DESTDIR)$(IMAGE_DIR)/" - install -Dm644 guake/data/pixmaps/guake.png "$(DESTDIR)$(prefix)/share/pixmaps/guake.png" + install -Dm644 $(DEV_DATA_DIR)/pixmaps/*.png "$(DESTDIR)$(IMAGE_DIR)/" + install -Dm644 $(DEV_DATA_DIR)/pixmaps/*.svg "$(DESTDIR)$(IMAGE_DIR)/" + install -Dm644 $(DEV_DATA_DIR)/pixmaps/guake.png "$(DESTDIR)$(prefix)/share/pixmaps/guake.png" mkdir -p $(DESTDIR)$(SHARE_DIR) mkdir -p $(DESTDIR)$(GLADE_DIR) - install -Dm644 guake/data/*.glade "$(DESTDIR)$(GLADE_DIR)" + install -Dm644 $(DEV_DATA_DIR)/*.glade "$(DESTDIR)$(GLADE_DIR)" mkdir -p $(DESTDIR)$(SHARE_DIR) - install -Dm644 "guake/data/autostart-guake.desktop" "$(DESTDIR)$(SHARE_DIR)" + install -Dm644 "$(DEV_DATA_DIR)/autostart-guake.desktop" "$(DESTDIR)$(SHARE_DIR)" mkdir -p $(DESTDIR)$(SCHEMA_DIR) - install -Dm644 "guake/data/org.guake.gschema.xml" "$(DESTDIR)$(SCHEMA_DIR)/" + install -Dm644 "$(DEV_DATA_DIR)/org.guake.gschema.xml" "$(DESTDIR)$(SCHEMA_DIR)/" compile-shemas: if [ $(COMPILE_SCHEMA) = 1 ]; then glib-compile-schemas $(DESTDIR)$(gsettingsschemadir); fi @@ -150,10 +151,10 @@ reinstall: sudo make uninstall && make && sudo make install && $(DESTDIR)$(bindir)/guake compile-glib-schemas-dev: clean-schemas - glib-compile-schemas --strict guake/data/ + glib-compile-schemas --strict $(DEV_DATA_DIR) clean-schemas: - rm -f guake/data/gschemas.compiled + rm -f $(DEV_DATA_DIR)/gschemas.compiled style: fiximports autopep8 yapf @@ -282,7 +283,7 @@ clean: rm-dists clean-docs clean-po clean-schemas clean-py clean-paths clean-py: @pipenv --rm ; true @find . -name "*.pyc" -exec rm -f {} \; - @rm -f guake/data/guake-prefs.desktop guake/data/guake.desktop + @rm -f $(DEV_DATA_DIR)/guake-prefs.desktop $(DEV_DATA_DIR)/guake.desktop @rm -rf .venv .eggs *.egg-info po/*.pot clean-paths: @@ -295,12 +296,13 @@ clean-docs: rm -rf doc/_build update-po: + echo "generating pot file" @find guake -iname "*.py" | xargs xgettext --from-code=UTF-8 --output=guake-python.pot - @find guake/data -iname "*.glade" | xargs xgettext --from-code=UTF-8 \ + @find $(DEV_DATA_DIR) -iname "*.glade" | xargs xgettext --from-code=UTF-8 \ -L Glade \ --output=guake-glade.pot @(\ - find guake/data -iname "*.desktop" | xargs xgettext --from-code=UTF-8 \ + find $(DEV_DATA_DIR) -iname "*.desktop" | xargs xgettext --from-code=UTF-8 \ -L Desktop \ --output=guake-desktop.pot \ ) || ( \ @@ -308,7 +310,7 @@ update-po: touch guake-desktop.pot) @msgcat --use-first guake-python.pot guake-glade.pot guake-desktop.pot > po/guake.pot @rm guake-python.pot guake-glade.pot guake-desktop.pot - for f in $$(find po -iname "*.po"); do \ + @for f in $$(find po -iname "*.po"); do \ echo "updating $$f"; \ msgcat --use-first "$$f" po/guake.pot > "$$f.new"; \ mv "$$f.new" $$f; \ @@ -326,16 +328,16 @@ generate-mo: generate-desktop: @echo "generating desktop files" - @msgfmt --desktop --template=guake/data/guake.template.desktop \ + @msgfmt --desktop --template=$(DEV_DATA_DIR)/guake.template.desktop \ -d po \ - -o guake/data/guake.desktop || ( \ + -o $(DEV_DATA_DIR)/guake.desktop || ( \ echo "Skipping .desktop files, is your gettext version < 0.19.1?" && \ - cp guake/data/guake.template.desktop guake/data/guake.desktop) - @msgfmt --desktop --template=guake/data/guake-prefs.template.desktop \ + cp $(DEV_DATA_DIR)/guake.template.desktop $(DEV_DATA_DIR)/guake.desktop) + @msgfmt --desktop --template=$(DEV_DATA_DIR)/guake-prefs.template.desktop \ -d po \ - -o guake/data/guake-prefs.desktop || ( \ + -o $(DEV_DATA_DIR)/guake-prefs.desktop || ( \ echo "Skipping .desktop files, is your gettext version < 0.19.1?" && \ - cp guake/data/guake-prefs.template.desktop guake/data/guake-prefs.desktop) + cp $(DEV_DATA_DIR)/guake-prefs.template.desktop $(DEV_DATA_DIR)/guake-prefs.desktop) generate-paths: cp -f guake/paths.py.in guake/paths.py diff --git a/guake/data/about.glade b/data/about.glade similarity index 100% rename from guake/data/about.glade rename to data/about.glade diff --git a/guake/data/autostart-guake.desktop b/data/autostart-guake.desktop similarity index 100% rename from guake/data/autostart-guake.desktop rename to data/autostart-guake.desktop diff --git a/data/gschemas.compiled b/data/gschemas.compiled new file mode 100644 index 0000000000000000000000000000000000000000..7ca4945b04026b23d15ed05c50cc29124ccb717d GIT binary patch literal 7645 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 a#1rv33s*WD{qQ6hEB?f%Mgw+68vh5OU4N_q literal 0 HcmV?d00001 diff --git a/guake/data/guake-prefs.template.desktop b/data/guake-prefs.template.desktop similarity index 100% rename from guake/data/guake-prefs.template.desktop rename to data/guake-prefs.template.desktop diff --git a/guake/data/guake.glade b/data/guake.glade similarity index 100% rename from guake/data/guake.glade rename to data/guake.glade diff --git a/guake/data/guake.template.desktop b/data/guake.template.desktop similarity index 100% rename from guake/data/guake.template.desktop rename to data/guake.template.desktop diff --git a/guake/data/org.guake.gschema.xml b/data/org.guake.gschema.xml similarity index 100% rename from guake/data/org.guake.gschema.xml rename to data/org.guake.gschema.xml diff --git a/guake/data/pixmaps/add_tab.png b/data/pixmaps/add_tab.png similarity index 100% rename from guake/data/pixmaps/add_tab.png rename to data/pixmaps/add_tab.png diff --git a/guake/data/pixmaps/guake-128.png b/data/pixmaps/guake-128.png similarity index 100% rename from guake/data/pixmaps/guake-128.png rename to data/pixmaps/guake-128.png diff --git a/guake/data/pixmaps/guake-48.png b/data/pixmaps/guake-48.png similarity index 100% rename from guake/data/pixmaps/guake-48.png rename to data/pixmaps/guake-48.png diff --git a/guake/data/pixmaps/guake-64.png b/data/pixmaps/guake-64.png similarity index 100% rename from guake/data/pixmaps/guake-64.png rename to data/pixmaps/guake-64.png diff --git a/guake/data/pixmaps/guake-notification.png b/data/pixmaps/guake-notification.png similarity index 100% rename from guake/data/pixmaps/guake-notification.png rename to data/pixmaps/guake-notification.png diff --git a/guake/data/pixmaps/guake-tray.png b/data/pixmaps/guake-tray.png similarity index 100% rename from guake/data/pixmaps/guake-tray.png rename to data/pixmaps/guake-tray.png diff --git a/guake/data/pixmaps/guake-tray.svg b/data/pixmaps/guake-tray.svg similarity index 100% rename from guake/data/pixmaps/guake-tray.svg rename to data/pixmaps/guake-tray.svg diff --git a/guake/data/pixmaps/guake.png b/data/pixmaps/guake.png similarity index 100% rename from guake/data/pixmaps/guake.png rename to data/pixmaps/guake.png diff --git a/guake/data/pixmaps/quick-open.png b/data/pixmaps/quick-open.png similarity index 100% rename from guake/data/pixmaps/quick-open.png rename to data/pixmaps/quick-open.png diff --git a/guake/data/prefs.glade b/data/prefs.glade similarity index 100% rename from guake/data/prefs.glade rename to data/prefs.glade diff --git a/guake/data/__init__.py b/guake/data/__init__.py deleted file mode 100644 index e69de29b..00000000