[gentoo-commits] proj/java-config:master commit in: src/, src/java_config_2/
commit: 14e55a96446b17f3a3daabfeaafe26e55ef06641
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Jun 27 07:07:27 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jun 27 07:09:36 2024 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=14e55a96
Update copyright year
Signed-off-by: Florian Schmaus gentoo.org>
src/depend-java-query | 4 ++--
src/gjl | 4 ++--
src/java-config | 4 ++--
src/java_config_2/EnvironmentManager.py | 2 +-
src/java_config_2/Errors.py | 2 +-
src/java_config_2/FileParser.py | 2 +-
src/java_config_2/OutputFormatter.py| 2 +-
src/java_config_2/Package.py| 2 +-
src/java_config_2/VM.py | 2 +-
src/java_config_2/VersionManager.py | 2 +-
src/java_config_2/Virtual.py| 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/depend-java-query b/src/depend-java-query
index f1feefa..93131e2 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import OutputFormatter
@@ -70,7 +70,7 @@ if __name__ == '__main__':
usage = "depend-java-query [options]\n\n"
usage += f"Java Dep Query Utility Version {java_config_2.version}\n"
-usage += "Copyright 2004-2023 Gentoo Authors\n"
+usage += "Copyright 2004-2024 Gentoo Authors\n"
usage += "Distributed under the terms of the GNU General Public License
v2\n"
usage += "Please contact the Gentoo Java Project with
problems."
diff --git a/src/gjl b/src/gjl
index cca708a..da3d3d5 100755
--- a/src/gjl
+++ b/src/gjl
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import *
@@ -94,7 +94,7 @@ if __name__ == '__main__':
import java_config_2
usage = "%prog [options]\n\n"
usage += f"Java Utility Version {java_config_2.version}\n"
-usage += "Copyright 2004-2023 Gentoo Authors\n"
+usage += "Copyright 2004-2024 Gentoo Authors\n"
usage += "Distributed under the terms of the GNU General Public License
v2\n"
usage += "Please contact the Gentoo Java Project with
problems."
diff --git a/src/java-config b/src/java-config
index 5914de4..53df91b 100755
--- a/src/java-config
+++ b/src/java-config
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import OutputFormatter
@@ -190,7 +190,7 @@ if __name__ == '__main__':
usage = f"""java-config [options]
Java Configuration Utility Version {java_config_2.version}
-Copyright 2004-2023 Gentoo Authors
+Copyright 2004-2024 Gentoo Authors
Distributed under the terms of the GNU General Public License v2
Please contact the Gentoo Java Project with problems."""
diff --git a/src/java_config_2/EnvironmentManager.py
b/src/java_config_2/EnvironmentManager.py
index a862a04..45deb8e 100644
--- a/src/java_config_2/EnvironmentManager.py
+++ b/src/java_config_2/EnvironmentManager.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from .OutputFormatter import *
diff --git a/src/java_config_2/Errors.py b/src/java_config_2/Errors.py
index 940ebb0..387b4ae 100644
--- a/src/java_config_2/Errors.py
+++ b/src/java_config_2/Errors.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
diff --git a/src/java_config_2/FileParser.py b/src/java_config_2/FileParser.py
index adc6aba..707e570 100644
--- a/src/java_config_2/FileParser.py
+++ b/src/java_config_2/FileParser.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
diff --git a/src/java_config_2/OutputFormatter.py
b/src/java_config_2/OutputFormatter.py
index fffd751..6be26ae 100644
--- a/src/java_config_2/OutputFormatter.py
+++ b/src/java_config_2/OutputFormatter.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import sys
diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py
index 6328efa..df1f411 100644
[gentoo-commits] proj/java-config:master commit in: /
commit: cb04e992952a6fbf6ea91cbdf0d8e50c6a241515 Author: Florian Schmaus gentoo org> AuthorDate: Thu Jun 27 07:08:53 2024 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Jun 27 07:09:36 2024 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=cb04e992 java-config 2.3.4 Signed-off-by: Florian Schmaus gentoo.org> meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7265366..b7e6438 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'java-config', - version: '2.3.4-SNAPSHOT', + version: '2.3.4', license: 'GPL-2.0', meson_version: '>=1.1.1' )
[gentoo-commits] proj/java-config:master commit in: /
commit: b786e084c8bae73c3dea8b7e7eed4abab907f80a Author: Florian Schmaus gentoo org> AuthorDate: Thu Jun 27 07:09:22 2024 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Jun 27 07:09:37 2024 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b786e084 java-config 2.3.5-SNAPSHOT Signed-off-by: Florian Schmaus gentoo.org> NEWS| 2 ++ meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1fa9a89..144e789 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ For full ChangeLog generated from svn commit logs see ChangeLog. BGO: https://bugs.gentoo.org +2.4.5-SNAPSHOT: + 2.3.4: * Install java-config-2 as java-config from now on * Fix launcher installation in Gentoo-prefix installations (#933521) diff --git a/meson.build b/meson.build index b7e6438..108e462 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'java-config', - version: '2.3.4', + version: '2.3.5-SNAPSHOT', license: 'GPL-2.0', meson_version: '>=1.1.1' )
[gentoo-commits] proj/java-config:master commit in: src/, /
commit: fb3906c1fc78e99756dd025578d7fc96fe36b39b
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Jun 12 16:24:40 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Jun 12 19:24:43 2024 +
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 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',
[gentoo-commits] proj/java-config:master commit in: src/java_config_2/, src/
commit: 596a444b7e25d5716d2c4c5579b61b95647eb116
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Nov 17 07:55:39 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Nov 17 07:56:05 2023 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=596a444b
Update copyright header and other minor text updates
Signed-off-by: Florian Schmaus gentoo.org>
src/depend-java-query | 2 +-
src/gjl | 2 +-
src/java-config | 6 +++---
src/java_config_2/EnvironmentManager.py | 4 ++--
src/java_config_2/Errors.py | 6 +++---
src/java_config_2/FileParser.py | 4 ++--
src/java_config_2/OutputFormatter.py| 4 ++--
src/java_config_2/Package.py| 4 ++--
src/java_config_2/VM.py | 6 +++---
src/java_config_2/VersionManager.py | 4 ++--
src/java_config_2/Virtual.py| 5 ++---
11 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/depend-java-query b/src/depend-java-query
index 394b7e3..f1feefa 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import OutputFormatter
diff --git a/src/gjl b/src/gjl
index b5eafbe..cca708a 100755
--- a/src/gjl
+++ b/src/gjl
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import *
diff --git a/src/java-config b/src/java-config
index 3f140b8..5914de4 100755
--- a/src/java-config
+++ b/src/java-config
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright 2004-2018 Gentoo Authors
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import OutputFormatter
@@ -190,9 +190,9 @@ if __name__ == '__main__':
usage = f"""java-config [options]
Java Configuration Utility Version {java_config_2.version}
-Copyright 2004-2013 Gentoo Foundation
+Copyright 2004-2023 Gentoo Authors
Distributed under the terms of the GNU General Public License v2
-Please contact the Gentoo Java Herd with problems."""
+Please contact the Gentoo Java Project with problems."""
parser = OptionParser(usage)
parser.add_option("-V", "--version",
diff --git a/src/java_config_2/EnvironmentManager.py
b/src/java_config_2/EnvironmentManager.py
index 9e64e4e..a862a04 100644
--- a/src/java_config_2/EnvironmentManager.py
+++ b/src/java_config_2/EnvironmentManager.py
@@ -1,5 +1,5 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# -*- coding: utf-8 -*-
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from .OutputFormatter import *
diff --git a/src/java_config_2/Errors.py b/src/java_config_2/Errors.py
index 0d0798b..940ebb0 100644
--- a/src/java_config_2/Errors.py
+++ b/src/java_config_2/Errors.py
@@ -1,5 +1,5 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# -*- coding: utf-8 -*-
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
@@ -51,4 +51,4 @@ class UnexistingPackageError(Exception):
def __str__(self):
return "Package %s was not found!" % self.package
-# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
\ No newline at end of file
+# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
diff --git a/src/java_config_2/FileParser.py b/src/java_config_2/FileParser.py
index 1590034..adc6aba 100644
--- a/src/java_config_2/FileParser.py
+++ b/src/java_config_2/FileParser.py
@@ -1,5 +1,5 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# -*- coding: utf-8 -*-
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
diff --git a/src/java_config_2/OutputFormatter.py
b/src/java_config_2/OutputFormatter.py
index 0d3da81..fffd751 100644
--- a/src/java_config_2/OutputFormatter.py
+++ b/src/java_config_2/OutputFormatter.py
@@ -1,5 +1,5 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# -*- coding: utf-8 -*-
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import sys
diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py
index 83c8c89..6328efa 100644
--- a/src/java_config_2/Package.py
+++ b/src/java_config_2/Package.py
@@ -1,5 +1,5 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# -*- coding: utf-8 -*-
+# Copyright 2004-2023 Gentoo Authors
# Distributed under the terms of the GNU Gen
[gentoo-commits] proj/java-config:master commit in: src/, /
commit: 28b37e0e27ebb7c554dce46660c996093476571b
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Nov 17 07:49:49 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Nov 17 07:50:15 2023 +
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 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: /
commit: 3d63e66916d55eb3bea6a45c52b0cc4d44d82815 Author: Florian Schmaus gentoo org> AuthorDate: Thu Nov 16 20:18:23 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Nov 16 20:18:34 2023 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=3d63e669 java-config 2.3.3 Signed-off-by: Florian Schmaus gentoo.org> meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3dff1fd..13681b2 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'java-config', - version: '2.3.3-SNAPSHOT', + version: '2.3.3', license: 'GPL-2.0', meson_version: '>=1.1.1' )
[gentoo-commits] proj/java-config:master commit in: /
commit: 762d972e543a2b22bc09238bef9110b198b78688 Author: Florian Schmaus gentoo org> AuthorDate: Thu Nov 16 20:18:45 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Nov 16 20:19:22 2023 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=762d972e java-config 2.3.4-SNAPSHOT Signed-off-by: Florian Schmaus gentoo.org> meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 13681b2..7265366 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'java-config', - version: '2.3.3', + version: '2.3.4-SNAPSHOT', license: 'GPL-2.0', meson_version: '>=1.1.1' )
[gentoo-commits] proj/java-config:master commit in: /
commit: 40c94306c1ee502e517d7700fd6a2c6c911674c8 Author: Florian Schmaus gentoo org> AuthorDate: Thu Nov 16 16:00:48 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Nov 16 16:01:00 2023 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=40c94306 Update NEWS Signed-off-by: Florian Schmaus gentoo.org> NEWS | 4 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 200bc9e..abe7595 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ For full ChangeLog generated from svn commit logs see ChangeLog. BGO: https://bugs.gentoo.org +2.3.3 / 2.3.2: +* Correctly set java.library.path in launcher +* Allow java-config to parse inverted conditions + 2.3.1: * Fix a bug related to eprefix in setup.py.
[gentoo-commits] proj/java-config:master commit in: tests/testsuite/, src/, config/, src/java_config_2/, man/, /, tests/
commit: 54c5c9ebbf701f9dcd9f78da9f13ae967f922243 Author: Florian Schmaus gentoo org> AuthorDate: Wed Nov 15 09:34:47 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Nov 16 15:52:54 2023 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=54c5c9eb Use Meson as build system Signed-off-by: Florian Schmaus 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 000..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 sera: Ralph Sennhauser serkan: Serkan Kaba monsieurp: Patrice Clement +flow: Florian Schmaus diff --git a/COPYING b/COPYING new file mode 100644 index 000..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 distribu
[gentoo-commits] proj/java-config:master commit in: tests/testsuite/
commit: 1f31715a8a8be5718115886d88cf51843d0bf5dc
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Tue Nov 14 17:27:18 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 18:01:15 2023 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=1f31715a
update deprecated test methods for python-3.12 compatibility
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Signed-off-by: Florian Schmaus gentoo.org>
tests/testsuite/EnvironmentManager.py | 2 +-
tests/testsuite/VersionManager.py | 18 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/testsuite/EnvironmentManager.py
b/tests/testsuite/EnvironmentManager.py
index 2dd863b..16a1fd2 100644
--- a/tests/testsuite/EnvironmentManager.py
+++ b/tests/testsuite/EnvironmentManager.py
@@ -11,7 +11,7 @@ class TestEnvironmentManager(unittest.TestCase):
def test_load_packages(self):
self.em.packages = {}
self.em.load_packages()
-self.assertEquals(len(self.em.get_packages()), 11)
+self.assertEqual(len(self.em.get_packages()), 11)
def test_get_package(self):
self.em.get_package('ant-cores')
diff --git a/tests/testsuite/VersionManager.py
b/tests/testsuite/VersionManager.py
index cc8a50b..7f11023 100644
--- a/tests/testsuite/VersionManager.py
+++ b/tests/testsuite/VersionManager.py
@@ -38,28 +38,28 @@ class TestVersionManager(unittest.TestCase):
def test_filter_depend_vanilla(self):
os.environ["USE"] = ""
-self.assertEquals(self.verman.filter_depend(self.example_dep_vanilla),
self.example_dep_vanilla)
+self.assertEqual(self.verman.filter_depend(self.example_dep_vanilla),
self.example_dep_vanilla)
def test_filter_depend_or(self):
# Oh you only realise how ugly things are once you write unittests.
os.environ["USE"] = ""
rmatch = "|| =virtual/jdk-1.5 =virtual/jdk-1.4 dev-java/ant-core
java-virtuals/jaf"
-self.assertEquals(self.verman.filter_depend(self.example_dep_or),
rmatch)
+self.assertEqual(self.verman.filter_depend(self.example_dep_or),
rmatch)
def test_filter_depend_use_enabled(self):
os.environ["USE"] = "java"
rmatch = ">=virtual/jdk-1.5* dev-java/ant-core java-virtuals/jaf"
-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
+self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
def test_filter_depend_use_disabled(self):
os.environ["USE"] = ""
rmatch = "dev-java/ant-core java-virtuals/jaf"
-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
+self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
def test_filter_depend_use_unset(self):
del os.environ["USE"]
rmatch = self.example_dep_use
-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
+self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
def test_version_satisfies(self):
vm = self.em.get_vm('sun-jdk-1.6')
@@ -88,13 +88,13 @@ class TestVersionManager(unittest.TestCase):
def test_get_lowest(self):
target = self.verman.get_lowest(">=virtual/jdk-1.4")
-self.assertEquals(target, '1.4')
+self.assertEqual(target, '1.4')
target = self.verman.get_lowest(self.example_dep_vanilla)
-self.assertEquals(target, '1.5')
+self.assertEqual(target, '1.5')
target = self.verman.get_lowest(self.example_dep_or)
-self.assertEquals(target, '1.4')
+self.assertEqual(target, '1.4')
def test_get_lowest_with_package_dep(self):
pass
@@ -108,7 +108,7 @@ class TestVersionManager(unittest.TestCase):
#def test_matches(self):
def test_version_cmp(self):
-self.assertEquals(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
+self.assertEqual(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
self.assertTrue(self.verman.version_cmp('1.5', '1.5.1') < 0)
self.assertTrue(self.verman.version_cmp('1.5.1', '1.5') > 0)
[gentoo-commits] proj/java-config:master commit in: /
commit: 91de9e9cb76e3c940be43c7eb8a59c9becf4daed Author: Florian Schmaus gentoo org> AuthorDate: Tue Nov 14 13:53:56 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Nov 14 13:54:00 2023 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=91de9e9c cut release 2.3.2 Signed-off-by: Florian Schmaus gentoo.org> setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9233f9b..bfb0761 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ### -package_version = '2.3.1' +package_version = '2.3.2' ### from distutils.cmd import Command
[gentoo-commits] proj/java-config:master commit in: src/
commit: 951de94124539904d9aa498d89ae8f0daf8aa508
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Nov 14 11:36:15 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 11:38:42 2023 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=951de941
gjl: obtain library directory via LIBDIR
Newer versions of java-config-2.eclass will record LIBDIR in
package.env, which we obtain in gjl and use to set java.library.path
when invoking the Java VM.
Bug: https://bugs.gentoo.org/917326
Signed-off-by: Florian Schmaus gentoo.org>
src/gjl | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/gjl b/src/gjl
index 1639ef2..1baa899 100755
--- a/src/gjl
+++ b/src/gjl
@@ -47,7 +47,15 @@ def get_args(pkg):
envlp = os.getenv('LD_LIBRARY_PATH')
envjlp = os.getenv('JAVA_LIBRARY_PATH')
-newlibrary = manager.eprefix + '/lib:'+ manager.eprefix + '/usr/lib'
+libdir = pkg.query('LIBDIR')
+if libdir:
+newlibrary = manager.eprefix + '/' + libdir
+else:
+# Old, obsolete fallback path for packages that where
+# installed before java-utils-2.eclass recorded LIBDIR.
+# Bug #917326.
+newlibrary = manager.eprefix + '/lib:'+ manager.eprefix + '/usr/lib'
+
if library:
newlibrary = ':'.join((library, newlibrary))
if envjlp:
[gentoo-commits] proj/java-config:master commit in: src/java_config_2/
commit: d9ac25402fa9ff918e1f1da4e3e0d97281e437c4
Author: Patrice Clement gentoo org>
AuthorDate: Thu Jul 16 20:46:02 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Jul 16 20:48:34 2020 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=d9ac2540
allow java-config to parse inverted conditions.
... aka exclamation marks.
Patch courtesy of njsg on IRC.
Signed-off-by: Patrice Clement gentoo.org>
src/java_config_2/VersionManager.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/java_config_2/VersionManager.py
b/src/java_config_2/VersionManager.py
index cb30e88..a876f02 100644
--- a/src/java_config_2/VersionManager.py
+++ b/src/java_config_2/VersionManager.py
@@ -110,7 +110,11 @@ class VersionManager:
for token in tokens:
if token[-1] == "?":
-if token[:-1] not in useflags:
+if token.startswith("!"):
+skip = token[1:-1] in useflags
+else:
+skip = token[:-1] not in useflags
+if skip:
level = 0
while 1:
token = next(tokens)
[gentoo-commits] proj/java-config:master commit in: /
commit: b4875262b105c5b293d366a3cc87446be15c79e3 Author: Patrice Clement gentoo org> AuthorDate: Tue Jun 23 13:22:47 2020 + Commit: Patrice Clement gentoo org> CommitDate: Tue Jun 23 13:26:01 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b4875262 cut release 2.3.1 Signed-off-by: Patrice Clement gentoo.org> setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b796fe2..9233f9b 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ### -package_version = '2.2.0' +package_version = '2.3.1' ### from distutils.cmd import Command
[gentoo-commits] proj/java-config:master commit in: /
commit: d0b44f97d5c5307cbf165855a34bcd366d266a96
Author: Patrice Clement gentoo org>
AuthorDate: Tue Jun 23 13:19:28 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Jun 23 13:25:39 2020 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=d0b44f97
move eprefix declaration up and use it when installing files
Signed-off-by: Patrice Clement gentoo.org>
setup.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
index ff50b37..b796fe2 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@
package_version = '2.2.0'
###
-
from distutils.cmd import Command
from distutils.command.build import build
from distutils.command.install import install
@@ -19,6 +18,9 @@ import tempfile
import unittest
+eprefix = os.getenv('EPREFIX', '')
+
+
class jc_build(build):
def run(self):
build.run(self)
@@ -82,15 +84,13 @@ class jc_install(install):
with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
f.write("# Supported JDKs\n")
f.write(defaults + "\n")
- confdir = self.root + '/usr/share/java-config-2/config/'
+ 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
-eprefix = os.getenv('EPREFIX', '')
-
setup(
cmdclass = {
'build' : jc_build,
[gentoo-commits] proj/java-config:master commit in: /
commit: 76714affabc2e2ab6428a7c2d86ddcd2f22b3104 Author: Patrice Clement gentoo org> AuthorDate: Tue Jun 23 13:24:53 2020 + Commit: Patrice Clement gentoo org> CommitDate: Tue Jun 23 13:25:57 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=76714aff update NEWS Signed-off-by: Patrice Clement gentoo.org> NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 2530231..200bc9e 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.1: +* Fix a bug related to eprefix in setup.py. + 2.3: * Remove a lot of cruft. * Python 3.8 compat mostly.
[gentoo-commits] proj/java-config:master commit in: tests/testsuite/, /
commit: 715f758a8976a98d08f58aa819794134728a93cb
Author: Patrice Clement gentoo org>
AuthorDate: Wed Jun 17 20:34:19 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jun 17 20:34:19 2020 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=715f758a
update arches in setup.py
Signed-off-by: Patrice Clement gentoo.org>
setup.py | 18 ++
tests/testsuite/Virtual.py | 4 ++--
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/setup.py b/setup.py
index ea08bf1..c1dd9a0 100644
--- a/setup.py
+++ b/setup.py
@@ -71,30 +71,16 @@ class jc_install(install):
arch = os.getenv('ARCH', 'unknown')
defaults = '*= icedtea'
if arch in ['amd64', 'x86']:
- defaults = '*= icedtea6 icedtea6-bin sun-jdk
blackdown-jdk ibm-jdk-bin jrockit-jdk-bin'
+ defaults = '*= icedtea6 icedtea6-bin icedtea7
icedtea7-bin'
elif arch in ['ppc-macos', 'x64-macos', 'x86-macos']:
defaults = '*= apple-jdk-bin'
- elif arch in ['amd64-fbsd', 'x86-fbsd', 'x64-freebsd',
'x86-freebsd']:
- defaults = '*= diablo-jdk'
- elif arch in ['sparc-solaris', 'sparc64-solaris',
'x64-solaris', 'x86-solaris']:
- defaults = '*= sun-jdk'
- elif arch in ['mips', 'sparc']:
- defaults = '*= blackdown-jdk'
elif arch in ['ppc', 'ppc64', 'ppc-linux', 'ppc-aix']:
defaults = '*= ibm-jdk-bin'
- elif arch in ['alpha']:
- defaults = '*= compaq-jdk'
elif arch in ['arm']:
defaults = '*= icedtea-7 icedtea-6 icedtea-bin-7
icedtea-bin-6'
- elif arch in ['ia64']:
- defaults = '*= jrockit-jdk-bin'
- elif arch in ['hppa']:
- defaults = '*= kaffe'
- elif arch in ['hpux']:
- defaults = '*= hp-jdk-bin'
with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
- f.write("# This files contain the default support
jdk's\n")
+ f.write("# Supported JDKs\n")
f.write(defaults + "\n")
confdir = self.root + '/usr/share/java-config-2/config/'
self.mkpath(confdir)
diff --git a/tests/testsuite/Virtual.py b/tests/testsuite/Virtual.py
index 3db1561..4027e1f 100644
--- a/tests/testsuite/Virtual.py
+++ b/tests/testsuite/Virtual.py
@@ -16,7 +16,7 @@ class TestVirtual(unittest.TestCase):
def test_get_vms(self):
self.assertEqual(self.jaf.get_vms(), ['sun-jdk-1.6'])
-
+
def test_load_vms(self):
self.assertEqual( self.jmx._vms, ['ibm-jdk-bin-1.5', 'sun-jdk-1.6' , \
'sun-jdk-1.7', 'sun-jre-bin-1.6'] )
@@ -30,7 +30,7 @@ class TestMultiProviderVirtual(unittest.TestCase):
em.set_active_vm(em.get_vm('sun-jdk-1.6'))
self.jdbc = em.get_virtual('jdbc')
-
+
def test_classpath_multiple(self):
self.assertEqual( len(self.jdbc.classpath().split(':')), 2)
[gentoo-commits] proj/java-config:master commit in: /
commit: 12becd3f5778b1db18175ed3eace1db2c8f3ce42 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:39:27 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:39:27 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=12becd3f remove MANIFEST.in What is this file for? Signed-off-by: Patrice Clement gentoo.org> MANIFEST.in | 5 - 1 file changed, 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 9e680e3..000 --- a/MANIFEST.in +++ /dev/null @@ -1,5 +0,0 @@ -recursive-include man * -recursive-include config * -recursive-include src * -recursive-include tests * -include NEWS TODO
[gentoo-commits] proj/java-config:master commit in: /
commit: 0d596438ed4a60a51d13aefa72c977e3c9f1e2c3 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:44:53 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:44:53 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=0d596438 update AUTHORS Signed-off-by: Patrice Clement gentoo.org> AUTHORS | 2 -- 1 file changed, 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1c36629..fe0214c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,5 +11,3 @@ karltk: Karl Trygve Kalleberg sera: Ralph Sennhauser serkan: Serkan Kaba monsieurp: Patrice Clement - -Mail j...@gentoo.org if you are missing
[gentoo-commits] proj/java-config:master commit in: /
commit: 130f226c3c58ca6d8d6d8b9372437ad6b4107ea0 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:38:30 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:38:30 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=130f226c remove TODO TODO: throw away this codebase and start anew. Signed-off-by: Patrice Clement gentoo.org> TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO deleted file mode 100644 index c1ea266..000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -For 3.0: rewrite java-config from scratch and stop patching it. this codebase -is old and needs to go away.
[gentoo-commits] proj/java-config:master commit in: /, config/, src/java_config_2/
commit: b885581550d77c38daa3ef7780c25c7ac1ad68e9 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:47:36 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:47:36 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b8855815 remove jdk.conf and its references Signed-off-by: Patrice Clement gentoo.org> config/jdk.conf | 12 setup.py| 1 - src/java_config_2/VersionManager.py | 6 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/config/jdk.conf b/config/jdk.conf deleted file mode 100644 index 0c42763..000 --- a/config/jdk.conf +++ /dev/null @@ -1,12 +0,0 @@ -# User jdk configuration file -# You can specify which jdk you prefer to use -# see http://www.gentoo.org/doc/en/java.xml#doc_chap4_sect3 for more info -# -# example: - -#1.3=sun-jdk-1.4 ibm-jdk-bin -#1.4=blackdown-jdk -#1.5=sun-jdk - -#or if you want everything with sun-jdk -#*=sun-jdk diff --git a/setup.py b/setup.py index c1dd9a0..ff50b37 100644 --- a/setup.py +++ b/setup.py @@ -116,7 +116,6 @@ setup( (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']), - (eprefix + '/etc/java-config-2/build', ['config/jdk.conf']) ] ) diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py index d2319d8..cb30e88 100644 --- a/src/java_config_2/VersionManager.py +++ b/src/java_config_2/VersionManager.py @@ -52,7 +52,6 @@ class VersionManager: def __init__(self, env_manager): self.env_manager = env_manager -self.user_pref_file = env_manager.eprefix + '/etc/java-config-2/build/jdk.conf' self.default_pref_file = env_manager.eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf' self._prefs = None @@ -61,10 +60,7 @@ class VersionManager: return self._prefs else: self._prefs = [] -# first try the build preferences -if os.path.exists(self.user_pref_file): -self._prefs += PrefsFileParser(self.user_pref_file).get_config() -# then try system vm +# try system vm sys_vm = self.env_manager.system_vm_name() if sys_vm is not None: self._prefs.append(['*', [sys_vm]])
[gentoo-commits] proj/java-config:master commit in: /
commit: c748f548864a5d63e4527356eed3ee65e1dc73a2 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:34:51 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:34:51 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=c748f548 remove ChangeLog file do we need a 15 yo ChangeLog file? Nope. Signed-off-by: Patrice Clement gentoo.org> ChangeLog | 1943 - 1 file changed, 1943 deletions(-) diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 468b685..000 --- a/ChangeLog +++ /dev/null @@ -1,1943 +0,0 @@ -2010-04-27 11:41 Alistair Bush - - * src/java_config_2/EnvironmentManager.py, - src/java_config_2/Virtual.py, - src/testsuite/EnvironmentManager.py, src/testsuite/Virtual.py, - src/testsuite/packages/commons-logging, - src/testsuite/packages/commons-logging/package.env, - src/testsuite/packages/jdbc-mysql/package.env, - src/testsuite/packages/log4j, - src/testsuite/packages/log4j/package.env, - src/testsuite/virtual_configs/jdbc: Fixed issue with - multi_provider virtuals where deep dep resolution wasn't being - performed. Fixed issue with requiring vm for virtuals as well. - -2010-04-20 20:41 Vlastimil Babka - - * config/jdk-defaults-hpux.conf, config/jdk-defaults-ppc-aix.conf, - config/jdk-defaults-ppc-linux.conf, - config/jdk-defaults-x64-freebsd.conf, - config/jdk-defaults-x64-macos.conf, - config/jdk-defaults-x86-freebsd.conf: Add jdk-defaults for - several (prefix) arches per bug #300137. - -2010-04-20 20:30 Vlastimil Babka - - * src/java_config_2/EnvironmentManager.py, - src/java_config_2/VersionManager.py: Try system-vm as a build VM - before falling back to jdk-defaults.conf - bug #315039. - -2010-04-20 19:34 Vlastimil Babka - - * src/java_config_2/EnvironmentManager.py: Support for package name - globbing, bug #315123. - -2010-04-13 21:21 Vlastimil Babka - - * src/eselect/java-vm.eselect, src/java-config-2: Print build-only - warnings only when a build-only vm is present. Bug #302109. - -2010-03-06 04:06 Alistair Bush - - * src/java_config_2/EnvironmentManager.py: #297687. Skip env - variables. - -2009-12-28 01:01 Vlastimil Babka - - * setup.py: setup.py fixes by Arfever - fixes repeated installs, - typo and whitespace - -2009-12-28 00:53 Vlastimil Babka - - * src/java_config_2/VersionManager.py: VersionManager greater-than - comparison fix by Arfever. - -2009-12-25 23:10 Alistair Bush - - * AUTHORS: Add arfrever to authors. - -2009-12-25 23:07 Alistair Bush - - * src/testsuite/VM.py: Remove failif call as its depreciated. - -2009-12-25 23:06 Alistair Bush - - * src/java_config_2/VersionManager.py: Apply python3 patch 9 from - Arfrever. Fixes unit tests with python 3. Thank you Arfrever - -2009-12-25 22:53 Alistair Bush - - * src/test-python3.sh: Add test runner script to test build with - python3. Currently fails. - -2009-12-25 22:42 Alistair Bush - - * src/java_config_2/VM.py: Apply python3 patch 8 from Arfrever. - Fixes a unit test - -2009-12-25 22:31 Alistair Bush - - * src/depend-java-query, src/gjl, src/java-config-2: Apply python3 - patch 7 from Arfrever. Trunk now broken until a few python3 - issues are solved. - -2009-12-25 22:29 Alistair Bush - - * src/java_config_2/EnvironmentManager.py, - src/java_config_2/Package.py, src/java_config_2/VM.py, - src/java_config_2/VersionManager.py, src/testsuite/__init__.py: - Apply python3 patch 6 from Arfrever - -2009-12-25 22:28 Alistair Bush - - * src/depend-java-query, src/java-config-2, - src/java_config_2/EnvironmentManager.py, - src/java_config_2/VersionManager.py: Apply python3 patch 5 from - Arfrever - -2009-12-25 22:27 Alistair Bush - - * src/depend-java-query, src/gjl, src/java_config_2/VM.py, - src/java_config_2/VersionManager.py: Apply python3 patch 4 from - Arfrever - -2009-12-25 22:26 Alistair Bush - - * src/gjl, src/java-config-2, - src/java_config_2/EnvironmentManager.py: Apply python3 patch 3 - from Arfrever - -2009-12-25 22:26 Alistair Bush - - * src/gjl, src/java_config_2/OutputFormatter.py: Apply python3 - patch 2 from Arfrever - -2009-12-25 22:25 Alistair Bush - - * src/java_config_2/EnvironmentManager.py, - src/java_config_2/FileParser.py, - src/java_config_2/OutputFormatter.py, - src/java_config_2/Package.py, src/java_config_2/VM.py, - src/java_config_2/Virtual.py: Apply python3 patch 1 from Arfrever - -2009-12-06 00:22 Alistair Bush - - * ChangeLog, setup.py, src/java_config_2/__init
[gentoo-commits] proj/java-config:master commit in: /
commit: ee57764fdb2403a78232103fa1c37104840c87cb Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:48:40 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:49:11 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=ee57764f cut java-config 2.3 release Signed-off-by: Patrice Clement gentoo.org> NEWS | 7 +++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 57c5290..2530231 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,13 @@ For full ChangeLog generated from svn commit logs see ChangeLog. BGO: https://bugs.gentoo.org +2.3: +* Remove a lot of cruft. +* Python 3.8 compat mostly. +* Set out a plan to get rid of the current codebase that nobody understands nor +care to actually understand in order to write a new java-config that makes +sense for the current team (me). + 2.2.0: * BGO 455798: Use recorded VM dependency for launcher
[gentoo-commits] proj/java-config:master commit in: /, config/
commit: 2a203ab415f6691755536bc3d52be8584b11adb3 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:09:29 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:17:34 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=2a203ab4 remove compilers.conf No reference of that file exist in the source code. Why is it kept then? Weird. Signed-off-by: Patrice Clement gentoo.org> config/compilers.conf | 5 - setup.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/compilers.conf b/config/compilers.conf deleted file mode 100644 index 2a615cf..000 --- a/config/compilers.conf +++ /dev/null @@ -1,5 +0,0 @@ -# If the ebuild supports it -# it will check the COMPILERS var front to back and -# use the fist compiler that is installed - -#COMPILERS="ecj-3.1 jikes javac" diff --git a/setup.py b/setup.py index 346d7bb..ea08bf1 100644 --- a/setup.py +++ b/setup.py @@ -130,8 +130,8 @@ setup( (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']), - (eprefix + '/etc/java-config-2/build/', ['config/jdk.conf','config/compilers.conf']), + (eprefix + '/etc/java-config-2/build', ['config/jdk.conf']) ] ) -# vim: noet:ts=4: \ No newline at end of file +# vim: noet:ts=4:
[gentoo-commits] proj/java-config:master commit in: /
commit: 81e4dbc5ae15f5a51a0ecf1ba6be82f52241a010 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:03:10 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:12:07 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=81e4dbc5 update TODO Signed-off-by: Patrice Clement gentoo.org> TODO | 20 ++-- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/TODO b/TODO index 400bfe6..c1ea266 100644 --- a/TODO +++ b/TODO @@ -1,18 +1,2 @@ -1) EnvFileParser chokes on multiline vars -For 2.1: - - handling virtuals -http://overlays.gentoo.org/proj/java/wiki/Virtuals - -For 2.1.8 - - Bug# 259280 - -For 2.1.9 - [08:16] the idea is marking 1.4 VM's as build only so you won't be able to select them as system/user vm - [08:16] which I think should also mean that running 'GENTOO_VM=blackdown-jdk-1.4.2 java' will fail - [08:17] oh ok - [08:17] but then java-pkg-*2.eclass should set some override variable that will let this work again, in order to build with them - -For 3.0: - - Make EnvironmentManager's get_packages function return -a list packages instead of a dictionary. For lookup by name - we already have the get_package function. +For 3.0: rewrite java-config from scratch and stop patching it. this codebase +is old and needs to go away.
[gentoo-commits] proj/java-config:master commit in: config/, /
commit: bd6b12672f3a574f047ee6eee7a45bb780cb8d00 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 20:09:29 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 20:12:13 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=bd6b1267 remove compilers.conf No reference of that file exist in the source code. Why is it kept then? Weird. Signed-off-by: Patrice Clement gentoo.org> config/compilers.conf | 5 - setup.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/compilers.conf b/config/compilers.conf deleted file mode 100644 index 2a615cf..000 --- a/config/compilers.conf +++ /dev/null @@ -1,5 +0,0 @@ -# If the ebuild supports it -# it will check the COMPILERS var front to back and -# use the fist compiler that is installed - -#COMPILERS="ecj-3.1 jikes javac" diff --git a/setup.py b/setup.py index 346d7bb..dbc6b3b 100644 --- a/setup.py +++ b/setup.py @@ -130,8 +130,8 @@ setup( (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']), - (eprefix + '/etc/java-config-2/build/', ['config/jdk.conf','config/compilers.conf']), + (eprefix + '/etc/java-config-2/build/config/jdk.conf') ] ) -# vim: noet:ts=4: \ No newline at end of file +# vim: noet:ts=4:
[gentoo-commits] proj/java-config:master commit in: /
commit: 41e12d19bb14064b2979a4f6288b2a86e6ff6d99 Author: Patrice Clement gentoo org> AuthorDate: Wed Jun 17 19:58:32 2020 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jun 17 19:58:58 2020 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=41e12d19 set out new REWRITE goals Signed-off-by: Patrice Clement gentoo.org> REWRITE | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/REWRITE b/REWRITE index e382502..85d2fa7 100644 --- a/REWRITE +++ b/REWRITE @@ -1,11 +1,2 @@ Goals for the rewrite: -- reduce dependencies (c++ with few external libs) -- provide a dbus interface (for use in Eclipse/Netbeans library managers) -- solve outstanding bugs - * deep scan for class versioning issues (bug #161622) - * wrappers for all JVM tools - * virtuals handling for jdbc providers - * virtuals provided by JDKs -- remove all deprecated command line options -- don't depend on pm code (custom antlr based parsing) -- unify java-config-wrapper,javatoolkit and java-config to a single package +- throw away this codebase and start from scratch
[gentoo-commits] proj/java-config:master commit in: src/, man/, src/java_config_2/
commit: b444f958864524357c7462ff7267af429d7e23aa
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Oct 24 21:08:23 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Oct 24 21:08:23 2018 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b444f958
Drop deprecated features to set system and user VMs
This is done with eselect java-vm now.
man/java-config-2.1 | 28 ++---
src/java-config-2 | 53 +
src/java_config_2/EnvironmentManager.py | 18 ---
3 files changed, 4 insertions(+), 95 deletions(-)
diff --git a/man/java-config-2.1 b/man/java-config-2.1
index 9518e70..e5c2785 100644
--- a/man/java-config-2.1
+++ b/man/java-config-2.1
@@ -8,8 +8,7 @@ java-config - The Java configuration tool for Gentoo
.PP
.I java-config
Is used to query/set properties of your system's Java environment. It can be
-used to list available VMs, java packages, set system default JVM and set user
-default JVM.
+used to list available VMs and java packages.
.PP
In addition, it is used by Portage as a common interface to querying
properties about the various JVMs.
@@ -61,21 +60,10 @@ List available Java packages. Used for selection by
.I --classpath
.TP
\fB-L, --list-available-vms\fI
-Lists available JVMs. Used with
-.I --set-system-vm
-and
-.I -set-user-vm
-.
-.TP
-\fB-S , --set-system-vm=\fI
-Sets the system-wide default JVM.
-.TP
-\fB-s , --set-user-vm=\fI
-Sets the user-specific JVM by putting all necessary env vars into
-.I $HOME/.gentoo/java-env .
+Lists available JVMs.
.TP
\fB-f, --show-active-vm\fI
-Show the JVM that's currently active, as set via --set-system-vm or
--set-user-vm.
+Show the JVM that's currently active, as set by eselect java-vm.
.TP
\fB-n, --nocolor\fI
Turn off all colors.
@@ -98,16 +86,6 @@ Value to retieve from packages package.env file, specified
by --package.
\fB--get-virtual-providers=PACKAGE(S)\fI
Return a list of packages that provide a virtual.
-.SH "NOTES"
-You can get the that is used with
-.I --set-system-vm=
-and
-.I --set-user-vm=
-in the output of
-.I java-config --list-available-vms
-inside the brackets. Ex. [blackdown-jdk-1.4.1] and you can use this to
-set your default Java Virtual Machine.
-
.SH "MAINTAINER"
j...@gentoo.org
.SH "AUTHORS"
diff --git a/src/java-config-2 b/src/java-config-2
index bf7c48d..d542d66 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -1,7 +1,7 @@
#!/@GENTOO_PORTAGE_EPREFIX@usr/bin/python -E
# -*- coding: UTF-8 -*-
-# Copyright 2004-2013 Gentoo Foundation
+# Copyright 2004-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from java_config_2.OutputFormatter import OutputFormatter
@@ -170,40 +170,6 @@ def print_environment(option, opt, value, parser):
fatalError("Could not find a vm matching: %s" % value)
manager.create_env_entry(vm, printer, "%s=%s")
-def set_system_vm(option, opt, value, parser):
-deprecation_notice()
-vm = manager.get_vm(value)
-if not vm:
-fatalError("Could not find a vm matching: %s" % value)
-try:
-manager.set_system_vm(vm)
-printer._print("Now using %s as your generation-2 system JVM" % (vm) )
-if vm.is_build_only():
-printer._printWarning("%s is marked as a build-only JVM. Using
this vm is not recommended. " % (vm))
-except PermissionError:
-fatalError("You do not have enough permissions to set the system VM!")
-except EnvironmentUndefinedError:
-fatalError("The selected VM is missing critical environment
variables.")
-except InvalidConfigError as e:
-fatalError("Target file already exists and is not a symlink: %s" %
e.file)
-
-def set_user_vm(option, opt, value, parser):
-deprecation_notice()
-vm = manager.get_vm(value)
-if not vm:
-fatalError("Could not find a vm matching: %s" % value)
-if os.getuid() is 0:
-fatalError("The user 'root' should always use the System VM")
-try:
-manager.set_user_vm(vm)
-printer._print("Now using %s as your user JVM" % (vm))
-if vm.is_build_only():
-printer._printWarning("%s is marked as a build-only JVM. Using
this vm is not recommended. " % (vm))
-except PermissionError:
-fatalError("You do not have enough permissions to set the VM!")
-except InvalidConfigError as e:
-fatalError("Target file already exists and is not a symlink: %s" %
e.file)
-
def select_vm(option, opt, value, parser):
if not value: return
vm = manager.get_vm(value)
@@ -211,9 +177,6 @@ def select_vm(option, opt, value, parser):
fatalError("The vm could not be found")
manager.set_active_vm(manager.get_vm(value))
-def deprecation_notice():
-printer._printWarning("Setting user and system vm using java-config is
deprecated, use eselect java-vm instead.")
-
def fatalError(
[gentoo-commits] proj/java-config:master commit in: /
commit: b927ef4b77df2b6ee2a2beaadb4fd521d6e76ac3 Author: Patrice Clement gentoo org> AuthorDate: Wed Nov 1 21:33:52 2017 + Commit: Patrice Clement gentoo org> CommitDate: Wed Nov 1 21:33:52 2017 + URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b927ef4b remove whitespace README | 1 - 1 file changed, 1 deletion(-) diff --git a/README b/README index 08ea0c7..4b00797 100644 --- a/README +++ b/README @@ -1,3 +1,2 @@ Maintainer: Gentoo Java Team Java Configuration Utility for Gentoo -
[gentoo-commits] proj/java-config:master commit in: src/java_config_2/
commit: 82a5a6343e7b6172af6aaa1b3ea0a61a43afd206
Author: Patrice Clement gentoo org>
AuthorDate: Wed Jul 19 14:04:10 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jul 19 14:04:10 2017 +
URL:https://gitweb.gentoo.org/proj/java-config.git/commit/?id=82a5a634
remove useless else clauses.
src/java_config_2/Package.py | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py
index 2ecacc3..83c8c89 100644
--- a/src/java_config_2/Package.py
+++ b/src/java_config_2/Package.py
@@ -59,8 +59,7 @@ class Package:
"""
if var in self._config:
return self._config[var]
-else:
-return None
+return None
def deps(self):
"""
@@ -76,13 +75,12 @@ class Package:
def __get_deps(self, query):
"""
-Return package's (optional) dependencies;
-@param query: variable to read from package.env
+Return a package's (optional) dependencies.
+@param query: variable to read from package.env.
"""
depstr = self.query(query)
if depstr:
return [dep.split("@") for dep in depstr.split(":")]
-else:
-return []
+return []
-# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
\ No newline at end of file
+# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
