[gentoo-commits] proj/java-config:master commit in: src/, /

[gentoo-commits] proj/java-config:master commit in: src/, /

[Florian Schmaus]

commit:     28b37e0e27ebb7c554dce46660c996093476571b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 07:49:49 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 07:50:15 2023 +0000
URL:        https://gitweb.gentoo.org/proj/java-config.git/commit/?id=28b37e0e

Rename bin/java-config-2 → bin/java-config

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

 NEWS                               | 3 +++
 src/{java-config-2 => java-config} | 0
 src/meson.build                    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index abe7595..2faa9d9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ For full ChangeLog generated from svn commit logs see ChangeLog.
 
   BGO:  https://bugs.gentoo.org
 
+2.3.4:
+* Install java-config-2 as java-config from now on
+
 2.3.3 / 2.3.2:
 * Correctly set java.library.path in launcher
 * Allow java-config to parse inverted conditions

diff --git a/src/java-config-2 b/src/java-config
similarity index 100%
rename from src/java-config-2
rename to src/java-config

diff --git a/src/meson.build b/src/meson.build
index c3a4dd9..c80b814 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,7 +3,7 @@ subdir('java_config_2')
 py_bins = [
   'depend-java-query',
   'gjl',
-  'java-config-2',
+  'java-config',
 ]
 
 # It might seem sensible to use py.install_sources() to install the Python

[gentoo-commits] proj/java-config:master commit in: src/, /

[Florian Schmaus]

commit:     fb3906c1fc78e99756dd025578d7fc96fe36b39b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 16:24:40 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 19:24:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/java-config.git/commit/?id=fb3906c1

Fix launcher location in Gentoo-prefix installations

The launcher was installed in $EPREFIX/share/java-config-2/launcher,
when it should be $EPREFIX/usr/share/java-config-2/launcher.

Bug: https://bugs.gentoo.org/933521
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 NEWS            | 1 +
 src/meson.build | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2faa9d9..1fa9a89 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ For full ChangeLog generated from svn commit logs see ChangeLog.
 
 2.3.4:
 * Install java-config-2 as java-config from now on
+* Fix launcher installation in Gentoo-prefix installations (#933521)
 
 2.3.3 / 2.3.2:
 * Correctly set java.library.path in launcher

diff --git a/src/meson.build b/src/meson.build
index c80b814..bdfaa31 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -20,9 +20,11 @@ if python_only
   subdir_done()
 endif
 
+prefix = get_option('prefix')
+
 launcherdir_rel =  'share' / 'java-config-2' / 'launcher'
-launcherdir = system_wide ? eprefix / launcherdir_rel \
-                         : datadir / eprefix / launcherdir_rel
+launcherdir = system_wide ? prefix / launcherdir_rel \
+                         : datadir / prefix / launcherdir_rel
 
 launcher_bash = configure_file(
   input: 'launcher.bash',