Commit 83bd2f3a authored by Michael Terry's avatar Michael Terry

Various small fixes

- When a special dir isn't defined, don't use any include/excludes for it
- Drop dist make target
- Fix some NEWS.md markdown syntax
- Fix debian build
- Add a " (Devel)" suffix to the desktop file Name field when appropriate
- Add some gitignores for potential build artifact files
parent 81999942
Pipeline #52770 passed with stage
in 6 minutes and 47 seconds
.buildconfig
.cache
builddir
debian
flatpak/.flatpak-builder
prime
snap/.snapcraft
stage
tests/config.ini
tests/data
*.snap
\ No newline at end of file
......@@ -28,17 +28,9 @@ configure:
check: all
LC_ALL=C.UTF-8 meson test -C builddir
dist: pot
rm -f builddir/meson-dist/*
ninja -C builddir dist
gpg --armor --sign --detach-sig builddir/meson-dist/deja-dup-*.tar.xz
clean distclean:
rm -rf builddir
deb:
DEB_BUILD_OPTIONS=nocheck debuild
screenshots: all
@gsettings set org.gnome.desktop.interface font-name 'Cantarell 11'
@gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita'
......@@ -69,7 +61,7 @@ screenshots: all
pot: configure
ninja -C builddir deja-dup-pot help-org.gnome.DejaDup-pot
copy-po:
copy-po: pot
mkdir -p builddir
rm -r builddir/translations
bzr co --lightweight lp:~mterry/deja-dup/translations builddir/translations
......@@ -81,6 +73,9 @@ copy-po:
git add po/*.po
git add deja-dup/help/*/*.po
deb:
DEB_BUILD_OPTIONS=nocheck debuild
flatpak:
flatpak-builder --repo=$(HOME)/repo \
--force-clean \
......@@ -89,4 +84,4 @@ flatpak:
flatpak/org.gnome.DejaDupDevel.yaml
flatpak update --user -y org.gnome.DejaDupDevel
.PHONY: configure clean dist all copy-po check screenshots flatpak
.PHONY: configure clean all copy-po check screenshots flatpak
This diff is collapsed.
......@@ -59,6 +59,7 @@ test('validate-monitor-desktop', desktop_file_validate,
conf_data = configuration_data()
conf_data.set('icon', application_id)
conf_data.set('name_suffix', name_suffix)
vars = configure_file(input: 'org.gnome.DejaDup.desktop.in',
output: 'org.gnome.DejaDup.vars.desktop.in',
configuration: conf_data)
......
[Desktop Entry]
Version=1.1
Name=Backups
Name=Backups@name_suffix@
Comment=Change your backup settings
Icon=@icon@
......
......@@ -20,4 +20,4 @@ override_dh_auto_install:
DESTDIR=$(CURDIR)/debian/tmp ninja -v -C builddir install
override_dh_installchangelogs:
dh_installchangelogs NEWS
dh_installchangelogs NEWS.md
......@@ -163,7 +163,7 @@ public class DejaDupApp : Gtk.Application
main_window.destroy.connect(() => {this.main_window = null;});
// Translators: "Backups" is a noun
main_window.title = _("Backups");
main_window.title = _("Backups") + Config.NAME_SUFFIX;
main_window.resizable = false;
var header = new Gtk.HeaderBar();
......@@ -358,9 +358,7 @@ int main(string[] args)
// context is itself a reference to both the underlying command line tool
// "duplicity" and the act of duplicating data for backup. As a whole, the
// phrase "Déjà Dup" may not be very translatable.
var appname = _("Déjà Dup Backup Tool");
if (Config.PROFILE != "")
appname = "%s (%s)".printf(appname, Config.PROFILE);
var appname = _("Déjà Dup Backup Tool") + Config.NAME_SUFFIX;
Environment.set_application_name(appname);
Environment.set_prgname(Config.APPLICATION_ID);
......
......@@ -2,7 +2,7 @@
---
app-id: org.gnome.DejaDupDevel
runtime: org.gnome.Platform
runtime-version: 3.28
runtime-version: '3.28'
sdk: org.gnome.Sdk
command: deja-dup
......
......@@ -50,8 +50,9 @@ public string? parse_keywords(string dir)
for (int i = 0; i < dirs.length; i++) {
if (result.has_prefix(dirs[i])) {
var replacement = Environment.get_user_special_dir(enums[i]);
if (replacement != null)
result = result.replace(dirs[i], replacement);
if (replacement == null)
return null;
result = result.replace(dirs[i], replacement);
break;
}
}
......
......@@ -73,8 +73,10 @@ profile = get_option('profile')
application_id = 'org.gnome.DejaDup@0@'.format(profile)
if profile != ''
message('Using profile @0@.'.format(profile))
name_suffix = ' (@0@)'.format(profile)
else
message('Using default profile.')
name_suffix = ''
endif
common_vflags = [
......@@ -96,6 +98,7 @@ common_cflags = [
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
'-DVERSION="@0@"'.format(meson.project_version()),
'-DPROFILE="@0@"'.format(profile),
'-DNAME_SUFFIX="@0@"'.format(name_suffix),
'-DAPPLICATION_ID="@0@"'.format(application_id),
'-DICON_NAME="@0@"'.format(application_id),
'-DLOCALE_DIR="@0@"'.format(localedir),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment