commit:     54c5c9ebbf701f9dcd9f78da9f13ae967f922243
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 09:34:47 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:52:54 2023 +0000
URL:        https://gitweb.gentoo.org/proj/java-config.git/commit/?id=54c5c9eb

Use Meson as build system

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .gitignore                    |   1 +
 AUTHORS                       |   1 +
 COPYING                       | 339 ++++++++++++++++++++++++++++++++++++++++++
 Makefile                      |  10 ++
 config/jdk-defaults.conf      |   1 +
 config/meson.build            |  26 ++++
 man/meson.build               |  14 ++
 meson.build                   |  38 +++++
 meson.options                 |  15 ++
 pyproject.toml                |  17 +++
 setup.py                      | 122 ---------------
 src/depend-java-query         |  16 +-
 src/gjl                       |  13 +-
 src/java-config-2             |  14 +-
 src/java_config_2/__init__.py |   7 +-
 src/java_config_2/meson.build |  20 +++
 src/launcher.bash             |  15 +-
 src/meson.build               |  36 +++++
 tests/meson.build             |  24 +++
 tests/testsuite/__init__.py   |   9 --
 20 files changed, 584 insertions(+), 154 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c18dd8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__/

diff --git a/AUTHORS b/AUTHORS
index fe0214c..aaf30fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,3 +11,4 @@ karltk: Karl Trygve Kalleberg <kar...@gentoo.org>
 sera: Ralph Sennhauser <s...@gentoo.org>
 serkan: Serkan Kaba <ser...@gentoo.org>
 monsieurp: Patrice Clement <monsie...@gentoo.org>
+flow: Florian Schmaus <f...@gentoo.org>

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..0e845b5
--- /dev/null
+++ b/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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+  <signature of Ty Coon>, 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/Makefile b/Makefile
new file mode 100644
index 0000000..7bfb80c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+build:
+       meson setup build
+
+.PHONY: test
+test: build
+       meson test -C build --verbose
+
+.PHONY: test
+test-install: build
+       meson install -C build --destdir /var/tmp/java-config-destdir

diff --git a/config/jdk-defaults.conf b/config/jdk-defaults.conf
new file mode 100644
index 0000000..d15644d
--- /dev/null
+++ b/config/jdk-defaults.conf
@@ -0,0 +1 @@
+@JDK_DEFAULTS@

diff --git a/config/meson.build b/config/meson.build
new file mode 100644
index 0000000..ee8f5d5
--- /dev/null
+++ b/config/meson.build
@@ -0,0 +1,26 @@
+arch = get_option('arch')
+
+jdk_defaults = '*= icedtea'
+if arch in ['amd64', 'x86']
+    jdk_defaults = '*= icedtea6 icedtea6-bin icedtea7 icedtea7-bin'
+elif arch in ['ppc-macos', 'x64-macos', 'x86-macos']
+    jdk_defaults = '*= apple-jdk-bin'
+elif arch in ['ppc', 'ppc64', 'ppc-linux', 'ppc-aix']
+    jdk_defaults = '*= ibm-jdk-bin'
+elif arch in ['arm']
+    jdk_defaults = '*= icedtea-7 icedtea-6 icedtea-bin-7 icedtea-bin-6'
+endif
+
+java_config_confdir = sysconfdir / 'java-config-2'
+
+configure_file(
+  input: 'jdk-defaults.conf',
+  output: 'jdk-defaults.conf',
+  configuration: { 'JDK_DEFAULTS': jdk_defaults },
+  install_dir: java_config_confdir,
+)
+
+install_data(
+  ['virtuals'],
+  install_dir: java_config_confdir
+)

diff --git a/man/meson.build b/man/meson.build
new file mode 100644
index 0000000..c30f82e
--- /dev/null
+++ b/man/meson.build
@@ -0,0 +1,14 @@
+man_pages_out = []
+man_pages_in = [
+    'java-config-2.1',
+]
+
+foreach man_page : man_pages_in
+    man_pages_out += configure_file(
+        input : man_page,
+        output : man_page,
+        configuration : conf_data
+    )
+endforeach
+
+install_man(man_pages_out)

diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..3dff1fd
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,38 @@
+project(
+  'java-config',
+  version: '2.3.3-SNAPSHOT',
+  license: 'GPL-2.0',
+  meson_version: '>=1.1.1'
+)
+
+py_mod = import('python')
+py = py_mod.find_installation(pure : true)
+
+system_wide = get_option('system-wide')
+python_only = get_option('python-only')
+
+eprefix = get_option('eprefix')
+datadir = get_option('datadir')
+
+sysconfdir = system_wide ? get_option('sysconfdir') \
+                         : datadir / 'etc'
+
+conf_data = configuration_data({
+  'VERSION': meson.project_version(),
+  'EPREFIX': eprefix
+})
+
+subdir('src')
+subdir('tests')
+
+if python_only
+  subdir_done()
+endif
+
+subdir('config')
+
+if not system_wide
+  subdir_done()
+endif
+
+subdir('man')

diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..711f0f4
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,15 @@
+option('system-wide', type: 'boolean', value: true,
+    description: 'Install system-wide rather than isolated inside a Python 
environment'
+)
+
+option('eprefix', type: 'string',
+    description: 'Prefix directory to operate under'
+)
+
+option('python-only', type: 'boolean', value: false,
+       description: 'Only install the Python parts',
+)
+
+option('arch', type: 'string', value: 'unknown',
+       description: 'The official Gentoo-specific acronym for the 
architecture',
+)

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..33e28ca
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,17 @@
+[project]
+name = 'java-config'
+dynamic = ['version']
+description = 'Java environment configuration query tool'
+readme = 'README'
+requires-python = '>=3.9'
+license = {file = "COPYING"}
+authors = [
+  {name = 'Gentoo Java Project', email = 'j...@gentoo.org'},
+]
+
+[build-system]
+build-backend = 'mesonpy'
+requires = ['meson-python']
+
+[tool.meson-python.args]
+setup = ['-Dsystem-wide=false']

diff --git a/setup.py b/setup.py
deleted file mode 100644
index bfb0761..0000000
--- a/setup.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-#######################################
-package_version = '2.3.2'
-#######################################
-
-from distutils.cmd import Command
-from distutils.command.build import build
-from distutils.command.install import install
-from distutils.command.sdist import sdist
-
-
-import fileinput
-import os
-import subprocess
-import sys
-import tempfile
-import unittest
-
-
-eprefix = os.getenv('EPREFIX', '')
-
-
-class jc_build(build):
-       def run(self):
-               build.run(self)
-
-               for base, dirs, files in os.walk(self.build_base):
-                       for f in files:
-                               for line in fileinput.input(os.path.join(base, 
f),inplace=True):
-                                       
sys.stdout.write(line.replace('@PACKAGE_VERSION@', package_version))
-                               for line in fileinput.input(os.path.join(base, 
f),inplace=True):
-                                       
sys.stdout.write(line.replace('@GENTOO_PORTAGE_EPREFIX@', eprefix))
-
-
-class jc_test(Command):
-       user_options = []
-
-       def initialize_options(self):
-               self.build_base = None
-               self.build_lib = None
-
-       def finalize_options(self):
-               self.set_undefined_options('build', ('build_lib', 'build_lib'))
-
-       def run(self):
-               self.run_command('build')
-
-               sys.path.insert(0, 'tests')
-               sys.path.insert(0, self.build_lib)
-
-               import testsuite
-               suite = 
unittest.defaultTestLoader.loadTestsFromNames(testsuite.__all__, testsuite)
-
-               result = unittest.TextTestRunner().run(suite)
-               sys.exit(not result.wasSuccessful())
-
-
-class jc_install(install):
-       """
-       Generate and install the jdk defaults configuration file.
-
-       For the most part useless, wasn't updated in a long time either and 
doesn't
-       reflect reality anymore. Doing it here is at least a lot more 
maintainable
-       then a couple dozen files where it was defined before.
-       Also what should be default is a downstream decision and java-config
-       shouldn't have any business here. Still keeping it for the time being.
-       """
-
-       def run(self):
-               install.run(self)
-
-               arch = os.getenv('ARCH', 'unknown')
-               defaults = '*= icedtea'
-               if arch in ['amd64', 'x86']:
-                       defaults = '*= icedtea6 icedtea6-bin icedtea7 
icedtea7-bin'
-               elif arch in ['ppc-macos', 'x64-macos', 'x86-macos']:
-                       defaults = '*= apple-jdk-bin'
-               elif arch in ['ppc', 'ppc64', 'ppc-linux', 'ppc-aix']:
-                       defaults = '*= ibm-jdk-bin'
-               elif arch in ['arm']:
-                       defaults = '*= icedtea-7 icedtea-6 icedtea-bin-7 
icedtea-bin-6'
-
-               with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
-                       f.write("# Supported JDKs\n")
-                       f.write(defaults + "\n")
-               confdir = self.root + eprefix + 
'/usr/share/java-config-2/config/'
-               self.mkpath(confdir)
-               self.copy_file(f.name, confdir + 'jdk-defaults.conf', 
preserve_mode=0)
-               os.remove(f.name)
-
-from distutils.core import setup
-
-setup(
-       cmdclass = {
-               'build' : jc_build,
-               'test' : jc_test,
-               'install' : jc_install,
-       },
-       name = 'java-config',
-       version = package_version,
-       description = 'java enviroment configuration tool',
-       long_description = \
-       """
-               java-config is a tool for configuring various enviroment
-               variables and configuration files involved in the java
-               environment for Gentoo Linux.
-       """,
-       maintainer = 'Gentoo Java Team',
-       maintainer_email = 'j...@gentoo.org',
-       url = 'http://www.gentoo.org',
-       packages = ['java_config_2'],
-       package_dir = { 'java_config_2' : 'src/java_config_2' },
-       scripts = ['src/java-config-2','src/depend-java-query','src/gjl'],
-       data_files = [
-               (eprefix + '/usr/share/java-config-2/launcher', 
['src/launcher.bash']),
-               (eprefix + '/usr/share/man/man1/', ['man/java-config-2.1']),
-               (eprefix + '/etc/java-config-2/', ['config/virtuals']),
-       ]
-)
-
-# vim: noet:ts=4:

diff --git a/src/depend-java-query b/src/depend-java-query
index 04414f2..394b7e3 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -1,5 +1,5 @@
-#!/@GENTOO_PORTAGE_EPREFIX@usr/bin/python -E
-# -*- coding: UTF-8 -*-
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # Copyright 2004-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
@@ -15,7 +15,8 @@ import sys
 from optparse import OptionParser, make_option, OptionValueError
 
 def version(option, opt, value, parser):
-     printer._print("%H%BJava Dep Query Utility %GVersion @PACKAGE_VERSION@")
+     import java_config_2
+     printer._print(f"%H%BJava Dep Query Utility %GVersion 
{java_config_2.version}")
      raise SystemExit()
 
 def nocolor(option, opt, value, parser):
@@ -62,15 +63,16 @@ def parse_depend_string(option, opt, value, parse):
 
 if __name__ == '__main__':
     global printer, manager, verman
+    import java_config_2
     printer = OutputFormatter(True, True)
-    manager = EnvironmentManager(os.getenv('ROOT', ''), os.getenv('EPREFIX', 
'@GENTOO_PORTAGE_EPREFIX@'))
+    manager = EnvironmentManager(os.getenv('ROOT', ''), java_config_2.eprefix)
     verman = VersionManager(manager)
 
     usage =  "depend-java-query [options]\n\n"
-    usage += "Java Dep Query Utility Version @PACKAGE_VERSION@\n"
-    usage += "Copyright 2004-2013 Gentoo Foundation\n"
+    usage += f"Java Dep Query Utility Version {java_config_2.version}\n"
+    usage += "Copyright 2004-2023 Gentoo Authors\n"
     usage += "Distributed under the terms of the GNU General Public License 
v2\n"
-    usage += "Please contact the Gentoo Java Herd <j...@gentoo.org> with 
problems."
+    usage += "Please contact the Gentoo Java Project <j...@gentoo.org> with 
problems."
 
     options_list = [
                     make_option ("-V", "--version",     action="callback", 
callback=version,       help="Print version information"),

diff --git a/src/gjl b/src/gjl
index 1baa899..b5eafbe 100755
--- a/src/gjl
+++ b/src/gjl
@@ -1,5 +1,5 @@
-#!/@GENTOO_PORTAGE_EPREFIX@usr/bin/python -E
-# -*- coding: UTF-8 -*-
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # Copyright 2004-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
@@ -91,11 +91,12 @@ def normpath(mypath):
     return newpath
 
 if __name__ == '__main__':
+    import java_config_2
     usage =  "%prog [options]\n\n"
-    usage += "Java Utility Version @PACKAGE_VERSION@\n"
-    usage += "Copyright 2004-2013 Gentoo Foundation\n"
+    usage += f"Java Utility Version {java_config_2.version}\n"
+    usage += "Copyright 2004-2023 Gentoo Authors\n"
     usage += "Distributed under the terms of the GNU General Public License 
v2\n"
-    usage += "Please contact the Gentoo Java Herd <j...@gentoo.org> with 
problems."
+    usage += "Please contact the Gentoo Java Project <j...@gentoo.org> with 
problems."
 
     options_list = [
                      make_option ("-p", "--package",  action="store", 
type="string", dest="package", help="The package"),
@@ -109,7 +110,7 @@ if __name__ == '__main__':
 
     global printer, manager, verman
     printer = OutputFormatter(True, True)
-    manager = EnvironmentManager(os.getenv('ROOT', ''), os.getenv('EPREFIX', 
'@GENTOO_PORTAGE_EPREFIX@'))
+    manager = EnvironmentManager(os.getenv('ROOT', ''), java_config_2.eprefix)
     verman = VersionManager(manager)
 
     if not options.package:

diff --git a/src/java-config-2 b/src/java-config-2
index d542d66..3f140b8 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -1,5 +1,5 @@
-#!/@GENTOO_PORTAGE_EPREFIX@usr/bin/python -E
-# -*- coding: UTF-8 -*-
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # Copyright 2004-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
@@ -20,7 +20,8 @@ except ImportError:
 from optparse import OptionParser, OptionGroup
 
 def version(option, opt, value, parser):
-    printer._print("%H%BJava Configuration Utility %GVersion 
@PACKAGE_VERSION@")
+    import java_config_2
+    printer._print(f"%H%BJava Configuration Utility %GVersion 
{java_config_2.version}")
     raise SystemExit()
 
 def nocolor(option, opt, value, parser):
@@ -183,11 +184,12 @@ def fatalError(msg):
 
 if __name__ == '__main__':
     global printer, manager
+    import java_config_2
     printer = OutputFormatter(True, True)
-    manager = EnvironmentManager(os.getenv('ROOT', ''), os.getenv('EPREFIX', 
'@GENTOO_PORTAGE_EPREFIX@'))
+    manager = EnvironmentManager(os.getenv('ROOT', ''), java_config_2.eprefix)
 
-    usage = """java-config [options]
-Java Configuration Utility Version @PACKAGE_VERSION@
+    usage = f"""java-config [options]
+Java Configuration Utility Version {java_config_2.version}
 Copyright 2004-2013 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2
 Please contact the Gentoo Java Herd <j...@gentoo.org> with problems."""

diff --git a/src/java_config_2/__init__.py b/src/java_config_2/__init__.py
index b30192a..eacd90e 100644
--- a/src/java_config_2/__init__.py
+++ b/src/java_config_2/__init__.py
@@ -1 +1,6 @@
-__version__ = '@PACKAGE_VERSION@'
+import os
+
+version = '@VERSION@' if not '@VERSION@'.startswith('@') else 'unknown'
+
+eprefix_fallback = '@EPREFIX@' if not '@EPREFIX@'.startswith('@') else ''
+eprefix = os.getenv('EPREFIX', eprefix_fallback)

diff --git a/src/java_config_2/meson.build b/src/java_config_2/meson.build
new file mode 100644
index 0000000..417430d
--- /dev/null
+++ b/src/java_config_2/meson.build
@@ -0,0 +1,20 @@
+__init__py = configure_file(
+    input : '__init__.py',
+    output : '__init__.py',
+    configuration : conf_data
+)
+
+py.install_sources(
+  [
+    'EnvironmentManager.py',
+    'Errors.py',
+    'FileParser.py',
+    'OutputFormatter.py',
+    'Package.py',
+    'VM.py',
+    'VersionManager.py',
+    'Virtual.py',
+    __init__py,
+  ],
+  subdir: 'java_config_2',
+)

diff --git a/src/launcher.bash b/src/launcher.bash
old mode 100644
new mode 100755
index 12f7103..36a1782
--- a/src/launcher.bash
+++ b/src/launcher.bash
@@ -1,4 +1,4 @@
-#!/@GENTOO_PORTAGE_EPREFIX@bin/bash
+#!/usr/bin/env bash
 
 abort() {
        echo ${@} >&2
@@ -18,10 +18,19 @@ unset GENTOO_PYTHON_WRAPPER_SCRIPT_PATH
 unset GENTOO_PYTHON_TARGET_SCRIPT_PATH
 unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION
 
+if [[ ! -v EPREFIX ]]; then
+       INJECTED_PREFIX="@EPREFIX@"
+       if [[ ${INJECTED_PREFIX} == @* ]]; then
+               EPREFIX=""
+       else
+               EPREFIX="${INJECTED_PREFIX}"
+       fi
+fi
+
 # Source package env
 # ---------------------
-gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}"
-gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
+gjl_user_env="${HOME}/.gentoo${EPREFIX}/java-config-2/launcher.d/${gjl_package}"
+gjl_system_env="${EPREFIX}/etc/java-config-2/launcher.d/${gjl_package}"
 if [[ -f "${gjl_user_env}" ]]; then
        source "${gjl_user_env}"
 elif [[ -f "${gjl_system_env}" ]]; then

diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..c3a4dd9
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,36 @@
+subdir('java_config_2')
+
+py_bins = [
+  'depend-java-query',
+  'gjl',
+  'java-config-2',
+]
+
+# It might seem sensible to use py.install_sources() to install the Python
+# scripts, but it's really just a wrapper around install_data that forces the
+# install_dir. Meson 1.2.0 and later also optimize to bytecode, but Gentoo does
+# this in the ebuild.
+install_data(
+    py_bins,
+    install_dir: get_option('bindir'),
+    install_mode: 'rwxr-xr-x',
+)
+
+if python_only
+  subdir_done()
+endif
+
+launcherdir_rel =  'share' / 'java-config-2' / 'launcher'
+launcherdir = system_wide ? eprefix / launcherdir_rel \
+                         : datadir / eprefix / launcherdir_rel
+
+launcher_bash = configure_file(
+  input: 'launcher.bash',
+  output: 'launcher.bash',
+  configuration: conf_data,
+)
+
+install_data(
+  [launcher_bash],
+  install_dir: launcherdir,
+)

diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 0000000..9192707
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,24 @@
+py_test_env = environment()
+tests_python_paths = [
+  meson.project_source_root(),
+  meson.project_source_root() / 'src',
+]
+py_test_env.append('PYTHONPATH', tests_python_paths)
+
+py_tests = [
+  'EnvironmentManager',
+  'Package',
+  'VM',
+  'VersionManager',
+  'VersionManagerEnv2',
+  'Virtual',
+]
+
+foreach py_test : py_tests
+  test(
+    'python-unittest-' + py_test,
+    py,
+    args: ['-m', 'unittest', 'tests.testsuite.' + py_test],
+    env: py_test_env,
+  )
+endforeach

diff --git a/tests/testsuite/__init__.py b/tests/testsuite/__init__.py
index bd9e014..e69de29 100644
--- a/tests/testsuite/__init__.py
+++ b/tests/testsuite/__init__.py
@@ -1,9 +0,0 @@
-__all__ = [ 'VM', 'Virtual', 'Package', 'VersionManager', 
'VersionManagerEnv2', 'EnvironmentManager' ]
-from . import VM
-from . import Virtual
-from . import Package
-from . import VersionManager
-from . import VersionManagerEnv2
-from . import EnvironmentManager
-
-# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:


Reply via email to