libcouchbase fix package name for vc17

avsej · avsej · commit 44b9890a40e7 · 2025-03-13T13:58:19.000-07:00
diff --git a/libcouchbase/Jenkinsfile.erb b/libcouchbase/Jenkinsfile.erb
@@ -541,6 +541,7 @@ del "%CMAKE_ZIP_FILE%"
                             dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {
                                 bat('cmake --build . --target package')
                                 script {
+                                    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 ")
                                     if (TLS.toBoolean()) {
                                         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
@@ -440,6 +440,7 @@ del "%CMAKE_ZIP_FILE%"
                             dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {
                                 bat('cmake --build . --target package')
                                 script {
+                                    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 ")
                                     if (TLS.toBoolean()) {
                                         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
@@ -310,6 +310,7 @@ del "%CMAKE_ZIP_FILE%"
                             dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {
                                 bat('cmake --build . --target package')
                                 script {
+                                    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 ")
                                     if (TLS.toBoolean()) {
                                         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
`@@ -541,6 +541,7 @@ del "%CMAKE_ZIP_FILE%"`
`541`	`541`	`dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {`
`542`	`542`	`bat('cmake --build . --target package')`
`543`	`543`	`script {`
	`544`	`+ 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 ")`
`544`	`545`	`if (TLS.toBoolean()) {`
`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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,7 @@ del "%CMAKE_ZIP_FILE%"`
`440`	`440`	`dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {`
`441`	`441`	`bat('cmake --build . --target package')`
`442`	`442`	`script {`
	`443`	`+ 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 ")`
`443`	`444`	`if (TLS.toBoolean()) {`
`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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ del "%CMAKE_ZIP_FILE%"`
`310`	`310`	`dir("ws_win_${MSVS.replaceAll(' ', '_')}_${ARCH}/build") {`
`311`	`311`	`bat('cmake --build . --target package')`
`312`	`312`	`script {`
	`313`	`+ 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 ")`
`313`	`314`	`if (TLS.toBoolean()) {`
`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`	`}`