Skip to content

Commit

Permalink
Making each module a NuGet package does not work properly
Browse files Browse the repository at this point in the history 
when unloading modules with NuGet
  • Loading branch information
@zosrothko
zosrothko committed Mar 20, 2018
1 parent c1e1b58 commit d3dbac8
Show file tree
Hide file tree
Showing 25 changed files with 77 additions and 605 deletions.
24 changes: 0 additions & 24 deletions CppParser/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
25 changes: 0 additions & 25 deletions CppUnit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

24 changes: 0 additions & 24 deletions Crypto/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
24 changes: 0 additions & 24 deletions Encodings/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
25 changes: 0 additions & 25 deletions Foundation/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ model {
}
withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) {
// addCompilerDefine "Foundation_EXPORTS" ""
cCompiler.define "Foundation_EXPORTS"
cppCompiler.define "Foundation_EXPORTS"
}
Expand All @@ -113,27 +112,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
]
],
files: [
{ file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.targets", target: "build\\native") },
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
24 changes: 0 additions & 24 deletions JSON/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
25 changes: 0 additions & 25 deletions MongoDB/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Net.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

25 changes: 0 additions & 25 deletions Net/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

28 changes: 0 additions & 28 deletions NetSSL_OpenSSL/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Net.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Crypto.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Util.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

24 changes: 0 additions & 24 deletions NetSSL_Win/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
27 changes: 0 additions & 27 deletions PDF/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,3 @@ project(":PDF") {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.XML.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.JSON.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Util.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }
28 changes: 0 additions & 28 deletions PageCompiler/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Net.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Util.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.XML.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.JSON.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.Foundation.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

25 changes: 0 additions & 25 deletions Redis/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,3 @@ model {
}
task poco { dependsOn "assemble" }

nugetSpec {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "${commonNuspecPrefix}.${project.name}.vs150",
title: "Poco ${project.name}",
dependencies: [
{ dependency(id: "${commonNuspecPrefix}.Net.vs150", version: "${vers}") }
]
],
files: [
{ file(src: "$rootDir\\bin\\Poco${project.name}.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco${project.name}d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco${project.name}d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco${project.name}d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco${project.name}d.*", target: "build\\native\\lib64") },
{ file(src: "$projectDir\\include\\**", target: "build\\native\\inc") }
]
]
}
task pack { dependsOn "poco"; dependsOn "nugetPack" }

Loading

0 comments on commit d3dbac8

Please sign in to comment.