[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/, src/py/
commit: 916b92e8a987b403fa73f27dd0d2d7e3a44c44ad
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Jun 19 19:10:39 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Jun 19 19:10:39 2021 +
URL:https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=916b92e8
correctly handling java versions in class-version-verify.py
Signed-off-by: Miroslav Šulc gentoo.org>
src/py/class-version-verify.py | 2 --
src/py/javatoolkit/cvv.py | 18 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/py/class-version-verify.py b/src/py/class-version-verify.py
index 968618c..dc44d90 100755
--- a/src/py/class-version-verify.py
+++ b/src/py/class-version-verify.py
@@ -56,8 +56,6 @@ def main():
print("-t is mandatory")
sys.exit(2)
-options.version = int(options.version.split(".")[-1])
-
cvv_magic = CVVMagic(options.version)
for arg in args:
diff --git a/src/py/javatoolkit/cvv.py b/src/py/javatoolkit/cvv.py
index 1f15415..b0fdc84 100644
--- a/src/py/javatoolkit/cvv.py
+++ b/src/py/javatoolkit/cvv.py
@@ -10,18 +10,28 @@ from zipfile import ZipFile
class CVVMagic:
def __init__(self, target):
-self.target = target
+# this is a number 8 9 10 11 etc, not including 1.
+if '.' in target:
+self.target = int(target.split(".")[-1])
+else:
+self.target = int(target)
self.good = []
self.bad = []
self.skipped = []
def add(self, version, jar, file):
if file == "module-info.class" and self.target < 9:
-self.skipped.append(("1.%s" % (version), jar, file))
+self.skipped.append((version, jar, file))
elif version <= self.target:
-self.good.append(("1.%s" % (version), jar, file))
+if version < 9:
+self.good.append(("1.%s" % (version), jar, file))
+else:
+self.good.append((version, jar, file))
else:
-self.bad.append(("1.%s" % (version), jar, file))
+if version < 9:
+self.bad.append(("1.%s" % (version), jar, file))
+else:
+self.bad.append((version, jar, file))
def do_class(self,filename):
classFile = file(filename,"rb")
[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/, src/py/
commit: 09739b1ae090fc1944a1267ed4c40cf58ce7d049
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Jun 19 17:34:56 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Jun 19 17:35:25 2021 +
URL:https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=09739b1a
fixed handling of module-info.class
Closes: https://bugs.gentoo.org/742935
Signed-off-by: Miroslav Šulc gentoo.org>
src/py/class-version-verify.py | 8 +---
src/py/javatoolkit/cvv.py | 5 -
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/py/class-version-verify.py b/src/py/class-version-verify.py
index e4ee7c8..968618c 100755
--- a/src/py/class-version-verify.py
+++ b/src/py/class-version-verify.py
@@ -81,10 +81,12 @@ def main():
if not options.silent:
for set in cvv_magic.bad:
print("Bad: %s %s %s" % set)
+for set in cvv_magic.skipped:
+print("Skipped: %s %s %s" % set)
-print("CVV: %s\nChecked: %i Good: %i Bad: %i" %
- (options.version, len(cvv_magic.good) +
- len(cvv_magic.bad), len(cvv_magic.good), len(cvv_magic.bad)))
+print("CVV: %s\nChecked: %i Good: %i Bad: %i Skipped: %i" %
+ (options.version, len(cvv_magic.good) + len(cvv_magic.bad) +
len(cvv_magic.skipped),
+ len(cvv_magic.good), len(cvv_magic.bad), len(cvv_magic.skipped)))
if len(cvv_magic.bad) > 0:
sys.exit(1)
diff --git a/src/py/javatoolkit/cvv.py b/src/py/javatoolkit/cvv.py
index 6ae2501..1f15415 100644
--- a/src/py/javatoolkit/cvv.py
+++ b/src/py/javatoolkit/cvv.py
@@ -13,9 +13,12 @@ class CVVMagic:
self.target = target
self.good = []
self.bad = []
+self.skipped = []
def add(self, version, jar, file):
-if version <= self.target:
+if file == "module-info.class" and self.target < 9:
+self.skipped.append(("1.%s" % (version), jar, file))
+elif version <= self.target:
self.good.append(("1.%s" % (version), jar, file))
else:
self.bad.append(("1.%s" % (version), jar, file))
[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/, src/py/
commit: 7d1d602b655317b1f7996d2e88943b1924eca511
Author: Patrice Clement gentoo org>
AuthorDate: Tue Aug 8 20:13:48 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Aug 8 20:38:57 2017 +
URL:https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=7d1d602b
change variable name
because cvv is indeed a magic class (except for James)
src/py/class-version-verify.py | 22 ++
src/py/javatoolkit/cvv.py | 3 +--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/py/class-version-verify.py b/src/py/class-version-verify.py
index b46d99c..a53b10d 100755
--- a/src/py/class-version-verify.py
+++ b/src/py/class-version-verify.py
@@ -4,13 +4,11 @@
# Copyright(c) 2005, Gentoo Foundation
#
# Licensed under the GNU General Public License, v2
-#
-# $Id$
import os
import sys
from optparse import OptionParser, make_option
-from javatoolkit.cvv import *
+from javatoolkit.cvv import CVVMagic
def main():
@@ -62,35 +60,35 @@ def main():
options.version = int(options.version.split(".")[-1])
-cvv = cvv(options.version)
+cvv_magic = CVVMagic(options.version)
for arg in args:
if os.path.isfile(arg):
-cvv.do_file(arg)
+cvv_magic.do_file(arg)
if options.deep and os.path.isdir(arg):
for root, dirs, files in os.walk(arg):
for filename in files:
-cvv.do_file("%s/%s" % (root, filename))
+cvv_magic.do_file("%s/%s" % (root, filename))
if options.file_only:
-lst = set([set[1] for set in cvv.bad])
+lst = set([set[1] for set in cvv_magic.bad])
for i in lst:
print(i)
else:
if options.verbose:
-for set in cvv.good:
+for set in cvv_magic.good:
print("Good: %s %s %s" % set)
if not options.silent:
-for set in cvv.bad:
+for set in cvv_magic.bad:
print("Bad: %s %s %s" % set)
print("CVV: %s\nChecked: %i Good: %i Bad: %i" %
- (options.version, len(cvv.good) +
- len(cvv.bad), len(cvv.good), len(cvv.bad)))
+ (options.version, len(cvv_magic.good) +
+ len(cvv_magic.bad), len(cvv_magic.good), len(cvv_magic.bad)))
-if len(cvv.bad) > 0:
+if len(cvv_magic.bad) > 0:
sys.exit(1)
else:
sys.exit(0)
diff --git a/src/py/javatoolkit/cvv.py b/src/py/javatoolkit/cvv.py
index c72cfcc..b5f817e 100644
--- a/src/py/javatoolkit/cvv.py
+++ b/src/py/javatoolkit/cvv.py
@@ -1,7 +1,6 @@
# Copyright 2005, Thomas Matthijs
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
import os
import sys
@@ -9,7 +8,7 @@ from struct import unpack
from zipfile import ZipFile
-class cvv:
+class CVVMagic:
def __init__(self, target):
self.target = target
self.good = []
