diff options
| author | Shawn Napora <shawn@napora.me> | 2018-03-01 08:30:48 -0500 |
|---|---|---|
| committer | Shawn Napora <shawn@napora.me> | 2018-03-01 08:30:48 -0500 |
| commit | 80a7c0d205b88adcbf028900a0a296f3aff1f3b1 (patch) | |
| tree | 337ee2bf62383c1661c3fedda51a3bee344c8561 | |
| parent | c936b794b4eb7c02834627984c2e1c3f36ef2e6d (diff) | |
| download | pidgin-80a7c0d205b88adcbf028900a0a296f3aff1f3b1.tar.gz | |
Various build fixes:
* Added bitbucket-pipelines.yml for CI
* Removed old plugins/win32/transparency from build
* Added updated plugins/transparency.c for translation
| -rw-r--r-- | bitbucket-pipelines.yml | 20 | ||||
| -rw-r--r-- | pidgin/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
3 files changed, 21 insertions, 3 deletions
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 index 0000000000..8173adf0ce --- /dev/null +++ b/bitbucket-pipelines.yml @@ -0,0 +1,20 @@ +# vi:et:ts=2 sw=2 sts=2 +image: pidgin/builder-debian:buster +pipelines: + default: + - step: + script: + - set -ex + - meson -Dsilc=false -Ddoc=true -Ddebug=true build + - ninja -C build + - ninja -C build test + branches: + release-2.x.y: + - step: + image: pidgin/release-builder:release-2.x.y + script: + - set -ex + - ./autogen.sh --enable-debug + - make -s -j$(nproc) + - make -s -j$(nproc) check + - make distcheck diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am index bdf7a337d0..a5bc35739a 100644 --- a/pidgin/plugins/Makefile.am +++ b/pidgin/plugins/Makefile.am @@ -133,8 +133,6 @@ EXTRA_DIST = \ mailchk.c \ pidgininc.c \ raw.c \ - win32/transparency/Makefile.mingw \ - win32/transparency/win2ktrans.c \ win32/winprefs/gtkappbar.c \ win32/winprefs/gtkappbar.h \ win32/winprefs/Makefile.mingw \ diff --git a/po/POTFILES.in b/po/POTFILES.in index a3155331b6..5ccc6cba47 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -223,9 +223,9 @@ pidgin/plugins/themeedit.c pidgin/plugins/ticker/ticker.c pidgin/plugins/timestamp.c pidgin/plugins/timestamp_format.c +pidgin/plugins/transparency.c pidgin/plugins/unity.c pidgin/plugins/vvconfig.c -pidgin/plugins/win32/transparency/win2ktrans.c pidgin/plugins/win32/winprefs/winprefs.c pidgin/plugins/xmppconsole.c pidgin/win32/nsis/nsis_translations.desktop.in |