Making each module a NuGet package does not work properly

when unloading modules with NuGet
This commit is contained in:
Francis ANDRE
2018-03-20 09:56:52 +01:00
parent c1e1b5889f
commit d3dbac877e
25 changed files with 77 additions and 605 deletions

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -104,7 +104,6 @@ model {
}
withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) {
// addCompilerDefine "Foundation_EXPORTS" ""
cCompiler.define "Foundation_EXPORTS"
cppCompiler.define "Foundation_EXPORTS"
}
@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -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" }

View File

@@ -101,29 +101,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}.SQL.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" }

View File

@@ -43,28 +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" }

View File

@@ -230,29 +230,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}.SQL.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" }

View File

@@ -66,29 +66,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}.SQL.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" }

View File

@@ -33,27 +33,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" }

View File

@@ -59,29 +59,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}") },
{ dependency(id: "${commonNuspecPrefix}.XML.vs150", version: "${vers}") },
{ dependency(id: "${commonNuspecPrefix}.JSON.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" }

View File

@@ -55,27 +55,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" }

View File

@@ -35,28 +35,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" }

View File

@@ -7,6 +7,10 @@ plugins {
// id 'com.jfrog.artifactory' version '4.1'
}
apply plugin: 'base'
apply plugin: 'nuget'
nuget {
version = '4.4.1'
}
def os = org.gradle.internal.os.OperatingSystem.current()
def String version = file("VERSION").text.replaceAll("[\n\r]", "")
@@ -190,6 +194,7 @@ class SliceTasksPlugin extends RuleSource {
}
}
allprojects {
buildDir = new File('guild') // DO NOT REMOVE OR CHANGE to 'build' since 'build' is a Poco directory
file('bin').mkdirs()
@@ -212,7 +217,6 @@ subprojects {
apply plugin: 'windows-resources'
apply plugin: 'windows-messages'
apply plugin: SliceTasksPlugin
apply plugin: 'nuget'
buildDir = new File("guild")
@@ -801,27 +805,6 @@ subprojects {
}
ext.commonNuspecMetadata = [
version: '2.0.0',
owners: 'Günter Obiltschnig & Aleksandar Fabijanic',
authors: 'Applied Informatics & Contributors',
projectUrl: 'https://pocoproject.org/',
licenseUrl: 'https://pocoproject.org/license.html',
iconUrl: 'https://avatars1.githubusercontent.com/u/201918?v=4&s=200',
copyright: 'Applied Informatics copyright 2018',
requireLicenseAcceptance: false,
description: 'Modern, powerful open source C++ class libraries for building network- and internet-based applications that run on desktop, server, mobile and embedded systems.'
]
ext.commonNuspecFiles = [
files: [
{ file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.targets", target: "build\\native") }
]
]
ext.commonNuspecPrefix = 'Pocoproject.Poco'
nugetPack {
destinationDir "$rootDir/packaging/Windows/Nuget"
}
}
@@ -845,7 +828,7 @@ PocoDoc.version=${version}-all
javaWDK = javaWDK.replace('\\','/')
file.text += """
Includes=-I${postgres32Home}/include,-I${mysql32Home}/include,-ICppParser/include,-ICppUnit/include,-ICrypto/include,-IData/include,-ISQL/include,-ISQL/MySQL/include,-ISQL/ODBC/include,-ISQL/PostgreSQL/include,-ISQL/SQLite/include, -ISQL/SQLite/src,-IFoundation/include,-IJSON/include,-IMongoDB/include,-INet/include,-INetSSL_OpenSSL/include,-INetSSL_Win/include,-IRedis/include,-IUtil/include,-IXML/include,-IZip/include,-ISevenZip/include,-IPDF/include
Includes=-I${postgres32Home}/include,-I${mysql32Home}/include,-ICppParser/include,-ICppUnit/include,-ICrypto/include,-ISQL/include,-ISQL/include,-ISQL/MySQL/include,-ISQL/ODBC/include,-ISQL/PostgreSQL/include,-ISQL/SQLite/include, -ISQL/SQLite/src,-IFoundation/include,-IJSON/include,-IMongoDB/include,-INet/include,-INetSSL_OpenSSL/include,-INetSSL_Win/include,-IRedis/include,-IUtil/include,-IXML/include,-IZip/include,-ISevenZip/include,-IPDF/include
VCH=${javaVCH}
WDK=${javaWDK}
CLP=${javaCLP}
@@ -960,6 +943,68 @@ task wix() {
});
}
/*
ext.commonNuspecMetadata = [
version: '2.0.0',
owners: 'Günter Obiltschnig & Aleksandar Fabijanic',
authors: 'Applied Informatics & Contributors',
projectUrl: 'https://pocoproject.org/',
licenseUrl: 'https://pocoproject.org/license.html',
iconUrl: 'https://avatars1.githubusercontent.com/u/201918?v=4&s=200',
copyright: 'Applied Informatics copyright 2018',
requireLicenseAcceptance: false,
description: 'Modern, powerful open source C++ class libraries for building network- and internet-based applications that run on desktop, server, mobile and embedded systems.',
tags: 'string filesystem thread date log event regex uri uuid cache native nativepackage sockets mime http ftp mail pop3 smtp html sax sax2 dom xml'
]
def pocoNugetSpec(os) {
return tasks.create("nugetSpec-$os", nugetSpec) {
def String vers = commonNuspecMetadata.find { it.key == "version" }.value;
nuspec = [
metadata: commonNuspecMetadata + [
id: "Pocoproject.Poco.vs150",
title: "Poco $vers",
dependencies: [
]
],
files: [
{ file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.vs150.targets", target: "build\\native") },
{ file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin") },
{ file(src: "$rootDir\\lib\\Poco*d.*", target: "build\\native\\lib") },
{ file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64") },
{ file(src: "$rootDir\\lib64\\Poco*d.*", target: "build\\native\\lib64") },
{ file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\SQL\\MySQL\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\SQL\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\SQL\\ODBC\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\SQL\\SQLite\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") },
{ file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") }
]
]
}
}
nugetPack {
destinationDir "$rootDir/packaging/Windows/Nuget"
def Set<Task> pocos = project.getTasksByName('poco', true)
// setDependsOn(pocos)
dependsOn pocoNugetSpec('x86')
}
*/
task nuget(type: Exec) {
String nugetVersion = version.replace('p', '-')
def Set<Task> pocos = project.getTasksByName('poco', true)
@@ -985,10 +1030,10 @@ task nuget(type: Exec) {
}
});
}
*/
task packaging() {
if (os.windows) {
// dependsOn nuget
dependsOn nuget
dependsOn wix
}
}
@@ -1093,7 +1138,6 @@ task coverage() {
tasksSet.each { task -> dependsOn report(os, task.project.parent.path.replace(':','/').substring(1), task.project.parent.name) }
}
}
/*
task all() {
FileCollection incs = task.includes;

View File

@@ -1,13 +0,0 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link Condition="'$(Platform)'=='Win32'">
<AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Link Condition="'$(Platform)'=='x64'">
<AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>

View File

@@ -26,11 +26,12 @@
</dependencies>
</metadata>
<files>
<file src='packaging\Windows\NuGet\Pocoproject.Poco.vs150.targets' target='build\native'/>
<file src='bin\*' target='build\native\bin' exclude='bin\PocoCppParser*'/>
<file src='lib\*' target='build\native\lib' exclude='lib\PocoCppParser*'/>
<file src='bin64\*' target='build\native\bin64' exclude='bin64\PocoCppParser*'/>
<file src='lib64\*' target='build\native\lib64' exclude='lib64\PocoCppParser*'/>
<file src='packaging\Windows\NuGet\Pocoproject.Poco.vs150.targets' target='build\native'/>
<file src='bin\*' target='build\native\bin' exclude='bin\Poco*d.*, bin\PocoCppParser*'/>
<file src='lib\*' target='build\native\lib' exclude='bin\Poco*d.*, bin\PocoCppParser*'/>
<file src='bin64\*' target='build\native\bin64' exclude='bin\Poco*d.*, bin\PocoCppParser*'/>
<file src='lib64\*' target='build\native\lib64' exclude='bin\Poco*d.*, bin\PocoCppParser*'/>
<!--
<file src='openssl\build\win32\bin\debug\*' target='build\native\bin' exclude='bin\PocoCppParser*'/>
<file src='openssl\build\win32\bin\release\*' target='build\native\bin' exclude='bin\PocoCppParser*'/>
<file src='openssl\build\win32\lib\debug\*' target='build\native\lib' exclude='lib\PocoCppParser*'/>
@@ -39,6 +40,7 @@
<file src='openssl\build\win64\bin\release\*' target='build\native\bin64' exclude='bin\PocoCppParser*'/>
<file src='openssl\build\win64\lib\debug\*' target='build\native\lib64' exclude='lib\PocoCppParser*'/>
<file src='openssl\build\win64\lib\release\*' target='build\native\lib64' exclude='lib\PocoCppParser*'/>
-->
<file src='CppUnit\include\**' target='build\native\inc' />
<file src='Crypto\include\**' target='build\native\inc' />
<file src='Data\MySQL\include\**' target='build\native\inc' />

View File

@@ -1,31 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE package [
<!ENTITY CHANGELOG SYSTEM "file:///%CD%/CHANGELOG">
]>
<package xmlns='http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd'>
<metadata>
<id>Pocoproject.Poco.vs140</id>
<version>$version$</version>
<title>Poco $version$</title>
<authors> Applied Informatics &amp; Contributors</authors>
<owners>Günter Obiltschnig &amp; Aleksandar Fabijanic</owners>
<licenseUrl>https://pocoproject.org/license.html</licenseUrl>
<projectUrl>https://pocoproject.org/</projectUrl>
<iconUrl>https://avatars1.githubusercontent.com/u/201918?v=4&amp;s=200</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Modern, powerful open source C++ class libraries for building network- and internet-based applications that run on desktop, server, mobile and embedded systems.</description>
<releaseNotes>
<![CDATA[
&CHANGELOG;
]]>
</releaseNotes>
<copyright>Copyright 2017</copyright>
<tags>string filesystem thread date log event regex uri uuid cache native nativepackage sockets mime http ftp mail pop3 smtp html sax sax2 dom xml</tags>
</metadata>
<files>
<file src='bin\*.pdb' target='build\native\bin' exclude='..\bin\PocoCppParser*'/>
<file src='bin\*.dll' target='build\native\bin' exclude='..\bin\PocoCppParser*'/>
<file src='bin64\*.pdb' target='build\native\bin64' exclude='..\bin64\PocoCppParser*'/>
<file src='bin64\*.dll' target='build\native\bin64' exclude='..\bin64\PocoCppParser*'/>
</files>
</package>