generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-03 04:38:39 +01:00
Code Issues Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Francis ANDRE 2019-03-11 20:24:16 +01:00
parent fcbd6772dd
commit 34a13c4213
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
build.gradle.win
View File

@ -846,6 +846,12 @@ subprojects {
} }
withType(NativeExecutableBinarySpec) { withType(NativeExecutableBinarySpec) {
if (toolChain in VisualCpp) { if (toolChain in VisualCpp) {
/*
println "TOOLCHAIN =" + toolChain
println "TOOLCHAIN URCT=" + toolChain.ucrtDir
println "TOOLCHAIN INST=" + toolChain.installDir
println "TOOLCHAIN WSDK=" + toolChain.windowsSdkDir
*/
if (buildType == buildTypes.debug) { if (buildType == buildTypes.debug) {
cCompiler.args "/MDd" cCompiler.args "/MDd"
cppCompiler.args "/MDd" cppCompiler.args "/MDd"
@ -899,22 +905,58 @@ tasks.withType(CppCompile) {
} }
task PocoDocIni { task PocoDocIni {
def String includes = "-I${postgres32Home}/include"
includes += ",-I${mysql32Home}/include"
includes += ",-ICppParser/include"
includes += ",-ICppUnit/include"
includes += ",-ICrypto/include"
includes += ",-IEncodings/include"
includes += ",-IData/include"
includes += ",-IData/include"
includes += ",-IData/MySQL/include"
includes += ",-IData/ODBC/include"
includes += ",-IData/PostgreSQL/include"
includes += ",-IData/SQLite/include"
includes += ",-IData/SQLite/src"
includes += ",-IFoundation/include"
includes += ",-IJSON/include"
includes += ",-IMongoDB/include"
includes += ",-INet/include"
includes += ",-INetSSL_OpenSSL/include"
includes += ",-INetSSL_Win/include"
includes += ",-IRedis/include"
includes += ",-IUtil/include"
includes += ",-IXML/include"
includes += ",-IZip/include"
includes += ",-ISevenZip/include"
includes += ",-IPDF/include"
def file = new File("$rootDir/PocoDoc/PocoDoc.ini") def file = new File("$rootDir/PocoDoc/PocoDoc.ini")
file.createNewFile() file.createNewFile()
file.text = """ file.text = "Includes=${includes}"
file.text += """
PocoBuild=$rootDir PocoBuild=$rootDir
PocoBase=$rootDir PocoBase=$rootDir
PocoDoc.output=releases/poco-${version}-all-doc PocoDoc.output=releases/poco-${version}-all-doc
PocoDoc.version=${version}-all PocoDoc.version=${version}-all
""" """
if (os.windows) { if (os.windows) {
def String VCHome = VCHome + "\\Tools\\MSVC\\$VCSerial"
def String CLPath = VCHome + "\\bin\\Hostx86\\x86"
def String javaVCH = VCHome.replace('\\','/') def String javaVCH = VCHome.replace('\\','/')
def String javaCLP = CLPath.replace('\\','/') def String javaCLP = CLPath.replace('\\','/')
def String javaWDK = WDKHome + "/Include/" + WDKVers def String javaWDK = WDKHome + "/Include/" + WDKVers
javaWDK = javaWDK.replace('\\','/') javaWDK = javaWDK.replace('\\','/')
file.text += """ /*
Includes=-I${postgres32Home}/include,-I${mysql32Home}/include,-ICppParser/include,-ICppUnit/include,-ICrypto/include,-IEncodings/include,-IData/include,-IData/include,-IData/MySQL/include,-IData/ODBC/include,-IData/PostgreSQL/include,-IData/SQLite/include, -IData/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 if (toolChain in VisualCpp) {
println "TOOLCHAIN =" + toolChain
println "TOOLCHAIN URCT=" + toolChain.ucrtDir
println "TOOLCHAIN INST=" + toolChain.installDir
println "TOOLCHAIN WSDK=" + toolChain.windowsSdkDir
}
*/
file.text += """
VCH=${javaVCH} VCH=${javaVCH}
WDK=${javaWDK} WDK=${javaWDK}
CLP=${javaCLP} CLP=${javaCLP}
@ -926,7 +968,7 @@ task pocoDoc(type: Exec) {
dependsOn ':PocoDoc::assemble' dependsOn ':PocoDoc::assemble'
dependsOn PocoDocIni dependsOn PocoDocIni
if (os.windows) { if (os.windows) {
environment "Path", "$rootDir\\bin;$environment.Path" environment "Path", "$rootDir\\bin;$environment.Path"
println environment.Path println environment.Path
executable "PocoDoc/bin/PocoDoc.exe" executable "PocoDoc/bin/PocoDoc.exe"