Remove the dep class/library path stuff from gjl, make it use java-config functionality where

it was moved to in previous commit.

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

1 files changed, 11 insertions, 44 deletions

diff --git a/src/gjl b/src/gjl
index 13f0d76..2330926 100755
--- a/src/gjl
+++ b/src/gjl
@@ -51,52 +51,19 @@ def get_needed_target(pkg):
                 highest_target = target
         else:
             highest_target = target
-    
-    return highest_target
-
 
-def add_classpath(pkg, dep, classpath): 
-    pkg_cp = pkg.classpath()
-    if pkg_cp:
-        if not dep or len(dep) == 1:
-            for cp in pkg_cp.split(':'):
-                classpath.add(cp)
-        else:
-            for cp in pkg_cp.split(':'):
-                if basename(cp) == dep[0]:
-                    classpath.add(cp)
-
-def add_library(pkg, library): 
-    libpaths = pkg.query("LIBRARY_PATH")
-    if libpaths:
-        for libpath in libpaths.split(':'):
-            library.add(libpath)
+    return highest_target
 
 
 def get_pkg_args(package):
-    classpath = Set()
-    library = Set()
-
-    unresolved = Set()
-    resolved = Set()
-
-    add_library(package, library)
-    add_classpath(package,None, classpath)
-    
-    unresolved.add(package)
-    while len(unresolved) > 0:
-        pkg = unresolved.pop()
-        resolved.add(pkg)
-        
-        add_library(pkg, library)
+    missing_deps = Set()
 
-        for dep in pkg.deps():
-            p = manager.get_package(dep[-1]) 
+    classpath = manager.build_dep_path([package.name()], "CLASSPATH", missing_deps)
+    library = manager.build_dep_path([package.name()], "LIBRARY_PATH", missing_deps)
 
-            if p not in resolved:
-                unresolved.add(p)
-
-            add_classpath(p, dep, classpath)
+    if len(missing_deps) > 0:
+        for dep in missing_deps:
+            printer._printError("Dependency package %s was not found!" % dep)
 
     return ':'.join(classpath), ':'.join(library)
 
@@ -108,9 +75,9 @@ def abort(msg):
 # Options:
 def get_vm(pkg):
     target = get_needed_target(pkg)
-    if target:        
-	needed = ">=virtual/jre-%s" % ( target )
-	if verman.version_satisfies(needed, manager.get_active_vm()):
+    if target:
+        needed = ">=virtual/jre-%s" % ( target )
+        if verman.version_satisfies(needed, manager.get_active_vm()):
             return None
         else:
             return verman.get_vm(needed)
@@ -119,7 +86,7 @@ def get_vm(pkg):
 
 def get_args(pkg):
     args=""
-    
+
     classpath, library = get_pkg_args(pkg)
     if classpath:
         args += ' -classpath %s' % (classpath)