libcouchbase fix package name for vc17

avsej · avsej · commit e6f22e510cd3 · 2025-03-13T13:00:48.000-07:00
diff --git a/libcouchbase/Jenkinsfile.erb b/libcouchbase/Jenkinsfile.erb
@@ -542,6 +542,7 @@ del "%CMAKE_ZIP_FILE%"
                                 bat('cmake --build . --target package')
                                 script {
                                     if (TLS.toBoolean()) {
+                                        bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")
                                         bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")
                                     }
                                 }
diff --git a/libcouchbase/lcb-scripted-build-pipeline.groovy b/libcouchbase/lcb-scripted-build-pipeline.groovy
@@ -441,6 +441,7 @@ del "%CMAKE_ZIP_FILE%"
                                 bat('cmake --build . --target package')
                                 script {
                                     if (TLS.toBoolean()) {
+                                        bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")
                                         bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")
                                     }
                                 }
diff --git a/libcouchbase/lcb-win-scripted-build-pipeline.groovy b/libcouchbase/lcb-win-scripted-build-pipeline.groovy
@@ -311,6 +311,7 @@ del "%CMAKE_ZIP_FILE%"
                                 bat('cmake --build . --target package')
                                 script {
                                     if (TLS.toBoolean()) {
+                                        bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")
                                         bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,7 @@ del "%CMAKE_ZIP_FILE%"`
`542`	`542`	`bat('cmake --build . --target package')`
`543`	`543`	`script {`
`544`	`544`	`if (TLS.toBoolean()) {`
	`545`	`+ bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")`
`545`	`546`	`bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")`
`546`	`547`	`}`
`547`	`548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,7 @@ del "%CMAKE_ZIP_FILE%"`
`441`	`441`	`bat('cmake --build . --target package')`
`442`	`442`	`script {`
`443`	`443`	`if (TLS.toBoolean()) {`
	`444`	`+ bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")`
`444`	`445`	`bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")`
`445`	`446`	`}`
`446`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ del "%CMAKE_ZIP_FILE%"`
`311`	`311`	`bat('cmake --build . --target package')`
`312`	`312`	`script {`
`313`	`313`	`if (TLS.toBoolean()) {`
	`314`	`+ bat("if exist ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip move ${VERSION.tarName()}__${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc17_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ")`
`314`	`315`	`bat("move ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}.zip ${VERSION.tarName()}_vc${MSVS.split(' ')[0]}_${ARCH == 'x64' ? 'amd64' : 'x86'}_openssl3.zip")`
`315`	`316`	`}`
`316`	`317`	`}`