Skip to content

Commit

Permalink
fixup Project files to new Project format
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Jul 27, 2018
1 parent 5b8c873 commit d538b8d
Show file tree
Hide file tree
Showing 32 changed files with 202 additions and 3 deletions.
7 changes: 7 additions & 0 deletions stdlib/Base64/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "Base64"
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
7 changes: 7 additions & 0 deletions stdlib/CRC32c/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "CRC32c"
uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
7 changes: 7 additions & 0 deletions stdlib/Dates/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[deps]
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[targets]
test = ["Test", "InteractiveUtils"]
7 changes: 7 additions & 0 deletions stdlib/DelimitedFiles/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"

[deps]
Mmap = "a63ad114-7e13-5084-954f-fe012c677804"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
6 changes: 6 additions & 0 deletions stdlib/Distributed/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
6 changes: 6 additions & 0 deletions stdlib/FileWatching/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
name = "FileWatching"
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Future/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"

[deps]
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[targets]
test = ["Test", "SparseArrays"]
7 changes: 7 additions & 0 deletions stdlib/InteractiveUtils/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
[deps]
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
9 changes: 9 additions & 0 deletions stdlib/LibGit2/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
name = "LibGit2"
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"

[targets]
test = ["Test", "Random", "Serialization", "Sockets"]
6 changes: 6 additions & 0 deletions stdlib/Libdl/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
name = "Libdl"
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
8 changes: 8 additions & 0 deletions stdlib/LinearAlgebra/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[deps]
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[targets]
test = ["Test", "Random", "SparseArrays"]
6 changes: 6 additions & 0 deletions stdlib/Logging/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
name = "Logging"
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
6 changes: 6 additions & 0 deletions stdlib/Markdown/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Mmap/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "Mmap"
uuid = "a63ad114-7e13-5084-954f-fe012c677804"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
7 changes: 7 additions & 0 deletions stdlib/OldPkg/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ uuid = "fe1c5a76-5840-53d2-82f9-288dd83ce2ce"

[deps]
LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
2 changes: 1 addition & 1 deletion stdlib/Pkg/src/Operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ function collect_target_deps!(ctx::Context, pkgs::Vector{PackageSpec}, pkg::Pack
targets = project["targets"]
haskey(targets, target) || return
for pkg in targets[target]
uuid = UUID(ctx.env.project["extras"][pkg])
uuid = UUID(project["extras"][pkg])
push!(pkgs, PackageSpec(pkg, uuid))
end
end
Expand Down
4 changes: 3 additions & 1 deletion stdlib/Pkg/src/Pkg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,12 @@ function __init__()
end

module PrecompileArea
import ..Pkg
using ..Types
using UUIDs
import LibGit2
import Dates
import REPL
import SHA
include("precompile.jl")
end

Expand Down
1 change: 0 additions & 1 deletion stdlib/Pkg/src/Types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ mutable struct PackageSpec
special_action::PackageSpecialAction # If the package is currently being pinned, freed etc
repo::Union{Nothing,GitRepo}
end
PackageSpec() = PackageSpec("", UUID(zero(UInt128)), VersionSpec(), PKGMODE_PROJECT, nothing, PKGSPEC_NOTHING, nothing)
PackageSpec(name::AbstractString, uuid::UUID, version::VersionTypes,
mode::PackageMode=PKGMODE_PROJECT, path=nothing, special_action=PKGSPEC_NOTHING,
repo=nothing) = PackageSpec(String(name), uuid, version, mode, path, special_action, repo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ version = "0.1.0"

[deps]
Example = "7876af07-990d-54b4-ab0e-23690620f79a"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
6 changes: 6 additions & 0 deletions stdlib/Printf/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[deps]
Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Profile/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"

[deps]
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[targets]
test = ["Test", "Serialization"]
8 changes: 8 additions & 0 deletions stdlib/REPL/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
OldPkg = "fe1c5a76-5840-53d2-82f9-288dd83ce2ce"

[targets]
test = ["Test", "Random", "OldPkg"]
9 changes: 9 additions & 0 deletions stdlib/Random/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[deps]
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Future = "9fa8497b-333b-5362-9e8d-4d0656e87820"

[targets]
test = ["Test", "SparseArrays", "LinearAlgebra", "Future"]
5 changes: 5 additions & 0 deletions stdlib/SHA/Project.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
name = "SHA"
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Serialization/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "Serialization"
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
6 changes: 6 additions & 0 deletions stdlib/SharedArrays/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Sockets/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "Sockets"
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[targets]
test = ["Test", "Random"]
6 changes: 6 additions & 0 deletions stdlib/SparseArrays/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
6 changes: 6 additions & 0 deletions stdlib/Statistics/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
9 changes: 9 additions & 0 deletions stdlib/SuiteSparse/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[targets]
test = ["Test", "Random", "DelimitedFiles", "Serialization"]
6 changes: 6 additions & 0 deletions stdlib/UUIDs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[deps]
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
7 changes: 7 additions & 0 deletions stdlib/Unicode/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
name = "Unicode"
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"


[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]

0 comments on commit d538b8d

Please sign in to comment.