[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: /, 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: 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:
