diff --git a/.gitlab-ci/run-eslint.sh b/.gitlab-ci/run-eslint.sh index 8b1f8c1a9..accbbecb0 100755 --- a/.gitlab-ci/run-eslint.sh +++ b/.gitlab-ci/run-eslint.sh @@ -23,7 +23,7 @@ run_eslint() { mkdir -p $(dirname $output) touch $output - eslint -f unix ${!extra_args} -o $output js + eslint -f unix ${!extra_args} -o $output js subprojects/extensions-app/js } list_commit_range_additions() { diff --git a/js/extensionPrefs/meson.build b/js/extensionPrefs/meson.build deleted file mode 100644 index b17fe9ad1..000000000 --- a/js/extensionPrefs/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -app_id = 'org.gnome.Extensions' -prgname = 'gnome-shell-extension-prefs' - -subdir('data') -subdir('js') diff --git a/js/meson.build b/js/meson.build index 8b131d8dd..4809f82b8 100644 --- a/js/meson.build +++ b/js/meson.build @@ -1,6 +1,5 @@ subdir('misc') subdir('dbusServices') -subdir('extensionPrefs') js_resources = gnome.compile_resources( 'js-resources', 'js-resources.gresource.xml', diff --git a/lint/eslintrc-shell.yml b/lint/eslintrc-shell.yml index 14617a810..bb0636f02 100644 --- a/lint/eslintrc-shell.yml +++ b/lint/eslintrc-shell.yml @@ -24,3 +24,8 @@ overrides: C_: readonly N_: readonly ngettext: readonly + - files: subprojects/extensions-app/js/** + globals: + _: readonly + C_: readonly + N_: readonly diff --git a/meson.build b/meson.build index 7dc73a22d..c5a70accc 100644 --- a/meson.build +++ b/meson.build @@ -140,7 +140,6 @@ mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir') python = find_program('python3') sassc = find_program('sassc') gjs = find_program('gjs') -appstream_util = find_program('appstream-util', required: false) cc = meson.get_compiler('c') @@ -266,6 +265,19 @@ if get_option('extensions_tool') ) endif +if get_option('extensions_app') + extensions_app = subproject('extensions-app', + default_options: [ + 'package_name=@0@'.format(meson.project_name()), + ] + ) + + extensions_app_version = extensions_app.get_variable('package_version') + assert(extensions_app_version == meson.project_version(), + 'Extensions app version does not match project version' + ) +endif + po_dir = join_paths(meson.current_source_dir(), 'po') @@ -285,6 +297,7 @@ meson.add_install_script('meson/postinstall.py') summary_options = { 'networkmanager': get_option('networkmanager'), 'systemd': get_option('systemd'), + 'extensions_app': get_option('extensions_app'), 'extensions_tool': get_option('extensions_tool'), 'man': get_option('man'), 'gtk_doc': get_option('gtk_doc'), diff --git a/meson_options.txt b/meson_options.txt index 2c5539012..ef76b73c3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,12 @@ option('extensions_tool', description: 'Build gnome-extensions CLI tool' ) +option('extensions_app', + type: 'boolean', + value: true, + description: 'Build gnome-extensions GUI application' +) + option('gtk_doc', type: 'boolean', value: false, diff --git a/po/POTFILES.in b/po/POTFILES.in index 92cdaf5ce..499d3a700 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,11 +5,6 @@ data/org.gnome.Shell.desktop.in.in data/org.gnome.shell.gschema.xml.in data/org.gnome.Shell.PortalHelper.desktop.in.in js/dbusServices/extensions/ui/extension-prefs-dialog.ui -js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in -js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in -js/extensionPrefs/js/main.js -js/extensionPrefs/data/ui/extension-row.ui -js/extensionPrefs/data/ui/extensions-window.ui js/gdm/authPrompt.js js/gdm/loginDialog.js js/gdm/util.js @@ -83,6 +78,11 @@ src/shell-global.c src/shell-keyring-prompt.c src/shell-polkit-authentication-agent.c src/shell-util.c +subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in +subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in +subprojects/extensions-app/js/main.js +subprojects/extensions-app/data/ui/extension-row.ui +subprojects/extensions-app/data/ui/extensions-window.ui subprojects/extensions-tool/src/command-create.c subprojects/extensions-tool/src/command-disable.c subprojects/extensions-tool/src/command-enable.c diff --git a/subprojects/extensions-app/COPYING b/subprojects/extensions-app/COPYING new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/subprojects/extensions-app/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/subprojects/extensions-app/README.md b/subprojects/extensions-app/README.md new file mode 100644 index 000000000..55b9c8cf4 --- /dev/null +++ b/subprojects/extensions-app/README.md @@ -0,0 +1,22 @@ +# gnome-extensions-app +gnome-extensions-app is a small application for managing GNOME Shell +extensions. It is usually built as part of gnome-shell, but can be +used as a stand-alone project as well. + +Bugs should be reported to the GNOME [bug tracking system][bug-tracker]. + +## Building +Before the project can be built stand-alone, the po directory has +to be populated with translations (from gnome-shell). + +To do that, simply run the included script: +```sh +$ ./generate-translations.sh +``` + +## License +gnome-extensions-app is distributed under the terms of the GNU General Public +License, version 2 or later. See the [COPYING][license] file for details. + +[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues +[license]: COPYING diff --git a/subprojects/extensions-app/build-aux/meson/postinstall.py b/subprojects/extensions-app/build-aux/meson/postinstall.py new file mode 120000 index 000000000..cf3400350 --- /dev/null +++ b/subprojects/extensions-app/build-aux/meson/postinstall.py @@ -0,0 +1 @@ +../../../../meson/postinstall.py \ No newline at end of file diff --git a/js/extensionPrefs/data/css/application.css b/subprojects/extensions-app/data/css/application.css similarity index 100% rename from js/extensionPrefs/data/css/application.css rename to subprojects/extensions-app/data/css/application.css diff --git a/js/extensionPrefs/data/dbus-interfaces/org.gnome.Shell.Extensions.xml b/subprojects/extensions-app/data/dbus-interfaces/org.gnome.Shell.Extensions.xml similarity index 100% rename from js/extensionPrefs/data/dbus-interfaces/org.gnome.Shell.Extensions.xml rename to subprojects/extensions-app/data/dbus-interfaces/org.gnome.Shell.Extensions.xml diff --git a/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg b/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg similarity index 100% rename from js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg rename to subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg diff --git a/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg b/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg similarity index 100% rename from js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg rename to subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg diff --git a/js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg b/subprojects/extensions-app/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg similarity index 100% rename from js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg rename to subprojects/extensions-app/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg diff --git a/js/extensionPrefs/data/icons/meson.build b/subprojects/extensions-app/data/icons/meson.build similarity index 100% rename from js/extensionPrefs/data/icons/meson.build rename to subprojects/extensions-app/data/icons/meson.build diff --git a/js/extensionPrefs/data/meson.build b/subprojects/extensions-app/data/meson.build similarity index 100% rename from js/extensionPrefs/data/meson.build rename to subprojects/extensions-app/data/meson.build diff --git a/js/extensionPrefs/data/metainfo/extensions-main.png b/subprojects/extensions-app/data/metainfo/extensions-main.png similarity index 100% rename from js/extensionPrefs/data/metainfo/extensions-main.png rename to subprojects/extensions-app/data/metainfo/extensions-main.png diff --git a/js/extensionPrefs/data/metainfo/extensions-remove.png b/subprojects/extensions-app/data/metainfo/extensions-remove.png similarity index 100% rename from js/extensionPrefs/data/metainfo/extensions-remove.png rename to subprojects/extensions-app/data/metainfo/extensions-remove.png diff --git a/js/extensionPrefs/data/metainfo/extensions-update.png b/subprojects/extensions-app/data/metainfo/extensions-update.png similarity index 100% rename from js/extensionPrefs/data/metainfo/extensions-update.png rename to subprojects/extensions-app/data/metainfo/extensions-update.png diff --git a/js/extensionPrefs/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build similarity index 95% rename from js/extensionPrefs/data/metainfo/meson.build rename to subprojects/extensions-app/data/metainfo/meson.build index a144a56d0..dcdb03bd6 100644 --- a/js/extensionPrefs/data/metainfo/meson.build +++ b/subprojects/extensions-app/data/metainfo/meson.build @@ -2,7 +2,7 @@ metainfo = app_id + '.metainfo.xml' i18n.merge_file(metainfo, input: metainfo + '.in', output: metainfo, - po_dir: '../../../../po', + po_dir: po_dir, install: true, install_dir: metainfodir ) diff --git a/js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in similarity index 87% rename from js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in rename to subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in index 80c18609a..b1139027e 100644 --- a/js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in +++ b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in @@ -43,13 +43,13 @@ - https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/js/extensionPrefs/data/metainfo/extensions-main.png + https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/subprojects/extensions-app/data/metainfo/extensions-main.png - https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/js/extensionPrefs/data/metainfo/extensions-update.png + https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/subprojects/extensions-app/data/metainfo/extensions-update.png - https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/js/extensionPrefs/data/metainfo/extensions-remove.png + https://gitlab.gnome.org/GNOME/gnome-shell/raw/master/subprojects/extensions-app/data/metainfo/extensions-remove.png diff --git a/js/extensionPrefs/data/org.gnome.Extensions.data.gresource.xml b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml similarity index 100% rename from js/extensionPrefs/data/org.gnome.Extensions.data.gresource.xml rename to subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml diff --git a/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in b/subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in similarity index 100% rename from js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in rename to subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in diff --git a/js/extensionPrefs/data/org.gnome.Extensions.service.in b/subprojects/extensions-app/data/org.gnome.Extensions.service.in similarity index 100% rename from js/extensionPrefs/data/org.gnome.Extensions.service.in rename to subprojects/extensions-app/data/org.gnome.Extensions.service.in diff --git a/js/extensionPrefs/data/ui/extension-row.ui b/subprojects/extensions-app/data/ui/extension-row.ui similarity index 100% rename from js/extensionPrefs/data/ui/extension-row.ui rename to subprojects/extensions-app/data/ui/extension-row.ui diff --git a/js/extensionPrefs/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui similarity index 100% rename from js/extensionPrefs/data/ui/extensions-window.ui rename to subprojects/extensions-app/data/ui/extensions-window.ui diff --git a/subprojects/extensions-app/generate-translations.sh b/subprojects/extensions-app/generate-translations.sh new file mode 100755 index 000000000..5891aa0ef --- /dev/null +++ b/subprojects/extensions-app/generate-translations.sh @@ -0,0 +1,19 @@ +#!/usr/bin/bash + +cd $(dirname $0) + +sed -e '/subprojects\/extensions-app/!d' \ + -e 's:subprojects/extensions-app/::' ../../po/POTFILES.in > po/POTFILES.in + +for l in $(= 0.47.0', + license: 'GPLv2+' +) + +app_id = 'org.gnome.Extensions' +prgname = 'gnome-shell-extension-prefs' + +gnome = import('gnome') +i18n = import('i18n') + +if meson.is_subproject() + package_name = get_option('package_name') + assert(package_name != '', + 'package_name must be specified for subproject builds') + + po_dir = join_paths(meson.current_source_dir(), '../../po') +else + package_name = meson.project_name() + po_dir = join_paths(meson.current_source_dir(), 'po') +endif + +package_version = meson.project_version() +prefix = get_option('prefix') + +bindir = join_paths(prefix, get_option('bindir')) +libdir = join_paths(prefix, get_option('libdir')) +datadir = join_paths(prefix, get_option('datadir')) +pkgdatadir = join_paths(datadir, package_name) + +desktopdir = join_paths(datadir, 'applications') +icondir = join_paths(datadir, 'icons') +localedir = join_paths(datadir, 'locale') +metainfodir = join_paths(datadir, 'metainfo') +servicedir = join_paths(datadir, 'dbus-1', 'services') + +gjs = find_program('gjs') +appstream_util = find_program('appstream-util', required: false) + +subdir('data') +subdir('js') + +if not meson.is_subproject() + subproject('shew', + default_options: [ + 'package_name=@0@'.format(meson.project_name()), + ] + ) + + subdir('po') + + meson.add_install_script('build-aux/meson/postinstall.py') + + summary_dirs = { + 'prefix': get_option('prefix'), + 'bindir': get_option('bindir'), + 'libdir': get_option('bindir'), + 'datadir': get_option('datadir'), + } + + summary_build = { + 'buildtype': get_option('buildtype'), + 'debug': get_option('debug'), + } + + if meson.version().version_compare('>= 0.53.0') + summary(summary_dirs, section: 'Directories') + summary(summary_build, section: 'Build Configuration') + endif +endif diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt new file mode 100644 index 000000000..435f237e6 --- /dev/null +++ b/subprojects/extensions-app/meson_options.txt @@ -0,0 +1,4 @@ +option('package_name', + type: 'string', + description: 'The gettext domain name', +) diff --git a/subprojects/extensions-app/po/.gitignore b/subprojects/extensions-app/po/.gitignore new file mode 100644 index 000000000..3b2228d1c --- /dev/null +++ b/subprojects/extensions-app/po/.gitignore @@ -0,0 +1,3 @@ +*.po +*.pot +POTFILES.in diff --git a/subprojects/extensions-app/po/LINGUAS b/subprojects/extensions-app/po/LINGUAS new file mode 120000 index 000000000..4fb83a533 --- /dev/null +++ b/subprojects/extensions-app/po/LINGUAS @@ -0,0 +1 @@ +../../../po/LINGUAS \ No newline at end of file diff --git a/subprojects/extensions-app/po/meson.build b/subprojects/extensions-app/po/meson.build new file mode 100644 index 000000000..5a1b0e29d --- /dev/null +++ b/subprojects/extensions-app/po/meson.build @@ -0,0 +1 @@ +i18n.gettext(package_name, preset: 'glib') diff --git a/subprojects/extensions-app/subprojects/shew b/subprojects/extensions-app/subprojects/shew new file mode 120000 index 000000000..50988a91b --- /dev/null +++ b/subprojects/extensions-app/subprojects/shew @@ -0,0 +1 @@ +../../shew/ \ No newline at end of file