Remove unused code

svn path=/projects/java-config-2/trunk/; revision=9184

1 files changed, 2 insertions, 153 deletions

diff --git a/src/gjl b/src/gjl
index b030074..2feb30e 100755
--- a/src/gjl
+++ b/src/gjl
@@ -1,9 +1,8 @@
 #!/usr/bin/python -E
 # -*- coding: UTF-8 -*-
 
-# Copyright 2004-2005 Gentoo Foundation
+# Copyright 2004-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 from java_config_2 import __version__
 from java_config_2.OutputFormatter import *
@@ -13,47 +12,7 @@ from java_config_2.VersionManager import *
 from optparse import OptionParser, make_option, OptionValueError
 import os
 from os.path import basename
-import sys, re
-
-# Needs some cleanup!
-# Someone please?
-
-#atom_parser = re.compile(r".*([<>=]+)virtual/(jre|jdk)-([0-9\.*]+).*")
-atom_parser = re.compile(r"([<>=]+)virtual/(jre|jdk)-([0-9\.*]+)")
-
-#Depreciated.
-def get_needed_target(pkg):
-    highest_target = ""
-    needs_jdk = False
-    for pkg in verman.get_needed_packages(pkg):
-        pkg_needs_jdk = False
-        x = pkg.query("TARGET")
-        try:
-            target, pkg_needs_jdk = x
-        except (ValueError, TypeError):
-            target = x
-
-        needs_jdk |= pkg_needs_jdk
-        if highest_target:
-            if target > highest_target:
-                highest_target = target
-        else:
-            highest_target = target
-
-    return highest_target, needs_jdk
-
-def get_needed_target2(pkg):
-    highest_target = ""
-    needs_jdk = set()
-    for pkg in verman.get_needed_packages(pkg):
-        target = pkg.target()
-        if highest_target < target:
-            highest_target = target
-        if isinstance( pkg, Virtual ):
-            for vm in pkg.get_vms():
-                needs_jdk.add(vm)
-    
-    return highest_target, needs_jdk
+import sys
 
 def get_pkg_args(package):
     missing_deps = set()
@@ -71,116 +30,6 @@ def abort(msg):
     printer._printError(msg)
     sys.exit(1)
 
-# Support function for get_vm2
-# Unused at present
-def get_needed_vms(pkg):
-    virtuals = set()
-    vms = set()
-    for pkg in verman.get_needed_packages(pkg):
-        try:
-            x = pkg.query("VM")
-            if atom_parser.match( x ):
-                matches = atom_parser.findall( x )
-                pkg_virtuals = set()
-                if len(matches) > 1:
-                    add_virtual_str_to_set( pkg_virtuals, matches )
-                    virtuals.add( pkg_virtuals )
-                else:
-                    add_virtual_str_to_set(virtuals, matches)
-            else:
-                #split first.
-                matches = x.split(' ')
-                for match in matches:
-                    vms.add( match )
-        except EnvironmentUndefinedError:
-            #Something bad has happened here
-            break
-    return virtuals, vms
-
-# Support function for get_vm2
-def add_virtual_str_to_set( s, arr ):
-    for a in arr:
-        s.add(a[0] + 'virtual/' + a[1] + '-' + a[2])
-
-
-## ----------------------------------
-## This is a new style get_vm function.  Instead of using a packages
-## TARGET env var it uses there VM var.
-## Unused at present
-def get_vm2(pkg):
-    targets, vms = get_needed_vms(pkg)
-    if len(vms) == 0:
-        search_vms = manager.get_virtual_machines()
-    else:
-        search_vms = vms
-    
-    if len( targets ) == 0:
-        if manager.get_active_vm().name() in vms:
-            return None
-        else:
-            for x in vms:
-                if manager.get_vm(x) and not manager.get_vm(x).is_build_only():
-                    return manager.get_vm(x)
-
-    for target in targets:
-        if not target_matches( target, manager.get_active_vm()):
-            break
-        return None
-
-    for vm in search_vms:
-        try:
-            for target in targets:
-                if not target_matches( target, vm ):
-                    raise Exception("Not valid vm")
-            avm = manager.get_vm(vm)
-            if avm and not avm.is_build_only():
-                return avm
-        except:
-            #Handle this better
-            continue
-    return None
-
-def target_matches( target, vm ):
-    if isinstance( target, str ):
-        return verman.version_satisfies( target, vm )
-    else:
-        return target_matches_any( target, vm)
-        
-def target_matches_any( targets, vm ):
-    accept = False
-    for target in targets:
-        accept |= verman.version_statisfies( target, vm )
-    return accept
-
-# Options:
-def get_vm_orig(pkg):
-    target, needs_jdk = get_needed_target2(pkg)
-    active_vm = manager.get_active_vm()
-    if len( needs_jdk ):
-        if active_vm.name() in needs_jdk:
-            return None
-        for x in needs_jdk:
-            vm = manager.get_vm(x)
-            if vm and not vm.is_build_only():
-                return vm
-    else:
-        needed = ">=virtual/jre-%s" % ( target )
-        if verman.version_satisfies( needed, active_vm) \
-                and not active_vm.is_build_only():
-            return None
-        return verman.get_vm(needed)
-    #if target:
-    #    if needs_jdk:
-    #        needed = ">=virtual/jdk-%s" % ( target ) # Need to dehardcode that for Virtuals...
-    #    else:
-    #        needed = ">=virtual/jre-%s" % ( target ) # Need to dehardcode that for Virtuals...
-    #    if verman.version_satisfies(needed, manager.get_active_vm()):
-    #        return None
-    #    else:
-    #        return verman.get_vm(needed)
-    #else:
-    #    return verman.get_vm(pkg.query("VM"))
-
 def get_vm(pkg):
     return verman.get_vm(pkg.query('VM'))