Pkg: now included in the system image.

JuliaLang · Jan 13, 2013 · 0971b3b · 0971b3b · StefanKarpinski · Jan 13, 2013
1 parent 7e7f4f6
commit 0971b3b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/base/export.jl b/base/export.jl
@@ -10,6 +10,7 @@ export
     RNG,
     Math,
     Sort,
+    Pkg,
 
 # Types
     AbstractMatrix,

diff --git a/base/pkg.jl b/base/pkg.jl
@@ -1,14 +1,13 @@
-require("git")
-require("pkgmetadata")
-require("pkgresolve")
-
 module Pkg
 #
 # Julia's git-based declarative package manager
 #
 
+include("pkg/metadata.jl")
+include("pkg/resolve.jl")
+
 using Metadata
-using PkgResolve
+using Resolve
 
 import Git
 
@@ -209,7 +208,7 @@ function _resolve()
         end
     end
     sort!(reqs)
-    want = PkgResolve.resolve(reqs)
+    want = Resolve.resolve(reqs)
     pkgs = sort!(keys(merge(want,have)))
     for pkg in pkgs
         if has(have,pkg)

diff --git a/base/pkgmetadata.jl → base/pkg/metadata.jl b/base/pkgmetadata.jl → base/pkg/metadata.jl
@@ -1,11 +1,6 @@
-require("linprog")
-
 module Metadata
 
-using LinProgGLPK
-
 import Git
-import GLPK
 import Base.isequal, Base.isless, Base.contains, Base.hash
 
 export parse_requires, Version, VersionSet

diff --git a/base/pkgresolve.jl → base/pkg/resolve.jl b/base/pkgresolve.jl → base/pkg/resolve.jl
@@ -1,6 +1,4 @@
-require("pkgmetadata")
-
-module PkgResolve
+module Resolve
 #
 # Use max-sum algorithm to resolve packages dependencies
 #
@@ -1018,4 +1016,4 @@ function resolve(reqs)
     return compute_output_dict(reqsstruct, pkgstruct, sol)
 end
 
-end # module PkgResolve
+end # module
diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -160,6 +160,10 @@ using DSP
 # deprecated functions
 include("deprecated.jl")
 
+# git utils & package manager
+include("git.jl")
+include("pkg.jl")
+
 include = include_from_node1
 print("\e[0G\e[2K")