                  for class_file in fnmatch.filter(filelist, '*.class'):
                      class_name = class_path + os.path.splitext(class_file)[0]
                      bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1546,6 +1608,8 @@
+@@ -1546,6 +1616,8 @@
          if not os.path.exists(outpathlk[side]):
              os.makedirs(outpathlk[side])
  

 
         if not os.path.exists(pathbinlk[side]):
             os.makedirs(pathbinlk[side])
@@ -1049,6 +1085,29 @@
             all_files = True
             append_pattern = False
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)

         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         natives = os.path.join('..', self.dirnatives)
@@ -1205,20 +1272,20 @@
         with open(self.csvmethods, 'rb') as fh:
             methodsreader = csv.DictReader(fh)
             for row in methodsreader:
