Author: rhuijben
Date: Tue May 18 12:56:27 2021
New Revision: 1890000
URL: http://svn.apache.org/viewvc?rev=1890000&view=rev
Log:
Create a vcpkg variant of the SharpSvn buildbot
Added:
subversion/trunk/tools/buildbot/slaves/win32-vcpkg/ (props changed)
- copied from r1889995,
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/
Modified:
subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd
subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-cleanup.cmd
Propchange: subversion/trunk/tools/buildbot/slaves/win32-vcpkg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue May 18 12:56:27 2021
@@ -0,0 +1,3 @@
+build
+deps
+svn-config.cmd
Propchange: subversion/trunk/tools/buildbot/slaves/win32-vcpkg/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 18 12:56:27 2021
@@ -0,0 +1,108 @@
+/subversion/branches/1.10-cache-improvements/tools/buildbot/slaves/win32-SharpSvn:1669168-1694487
+/subversion/branches/1.11.x/tools/buildbot/slaves/win32-SharpSvn:1841316,1841548
+/subversion/branches/1.5.x-r30215/tools/buildbot/slaves/win32-SharpSvn:870312
+/subversion/branches/1.7.x-fs-verify/tools/buildbot/slaves/win32-SharpSvn:1146708,1161180
+/subversion/branches/1.9-cache-improvements/tools/buildbot/slaves/win32-SharpSvn:1678948-1679863
+/subversion/branches/1.9.x/tools/buildbot/slaves/win32-SharpSvn:1735680
+/subversion/branches/10Gb/tools/buildbot/slaves/win32-SharpSvn:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/tools/buildbot/slaves/win32-SharpSvn:965046-1000689
+/subversion/branches/authzperf/tools/buildbot/slaves/win32-SharpSvn:1613053-1776831
+/subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-SharpSvn:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/tools/buildbot/slaves/win32-SharpSvn:872050-872529
+/subversion/branches/cache-server/tools/buildbot/slaves/win32-SharpSvn:1458643-1476567
+/subversion/branches/decouple-shelving-cli/tools/buildbot/slaves/win32-SharpSvn:1874630-1875035
+/subversion/branches/diff-callbacks3/tools/buildbot/slaves/win32-SharpSvn:870059-870761
+/subversion/branches/diff-optimizations/tools/buildbot/slaves/win32-SharpSvn:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/tools/buildbot/slaves/win32-SharpSvn:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/tools/buildbot/slaves/win32-SharpSvn:870728-871118
+/subversion/branches/double-delete/tools/buildbot/slaves/win32-SharpSvn:870511-872970
+/subversion/branches/dump-load-cross-check/tools/buildbot/slaves/win32-SharpSvn:1654853-1657295
+/subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn:1325914,1332738,1413107
+/subversion/branches/explore-wc/tools/buildbot/slaves/win32-SharpSvn:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/tools/buildbot/slaves/win32-SharpSvn:871779-873302
+/subversion/branches/fs-rep-sharing/tools/buildbot/slaves/win32-SharpSvn:869036-873803
+/subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn:1499981-1547039
+/subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn:1571740-1577217
+/subversion/branches/fsfs-pack/tools/buildbot/slaves/win32-SharpSvn:873717-874575
+/subversion/branches/fsx/tools/buildbot/slaves/win32-SharpSvn:1507845-1509914
+/subversion/branches/fsx-1.10/tools/buildbot/slaves/win32-SharpSvn:1658219-1694500
+/subversion/branches/fsx-id/tools/buildbot/slaves/win32-SharpSvn:1645603-1649011
+/subversion/branches/gnome-keyring/tools/buildbot/slaves/win32-SharpSvn:870558-871410
+/subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/win32-SharpSvn:1005036-1150766
+/subversion/branches/gtest_addition/tools/buildbot/slaves/win32-SharpSvn:1452117-1502138
+/subversion/branches/http-protocol-v2/tools/buildbot/slaves/win32-SharpSvn:874395-876041
+/subversion/branches/in-memory-cache/tools/buildbot/slaves/win32-SharpSvn:869829-871452
+/subversion/branches/in-repo-authz/tools/buildbot/slaves/win32-SharpSvn:1414342-1424779
+/subversion/branches/inheritable-props/tools/buildbot/slaves/win32-SharpSvn:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/tools/buildbot/slaves/win32-SharpSvn:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/tools/buildbot/slaves/win32-SharpSvn:998649-998852
+/subversion/branches/integrate-compression-level/tools/buildbot/slaves/win32-SharpSvn:1068651-1072287
+/subversion/branches/integrate-io-improvements/tools/buildbot/slaves/win32-SharpSvn:1068684-1072297
+/subversion/branches/integrate-is-cachable/tools/buildbot/slaves/win32-SharpSvn:1072568-1074082
+/subversion/branches/integrate-partial-getter/tools/buildbot/slaves/win32-SharpSvn:1072558-1076552
+/subversion/branches/integrate-readline-speedup/tools/buildbot/slaves/win32-SharpSvn:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/tools/buildbot/slaves/win32-SharpSvn:1068695-1072516
+/subversion/branches/integrate-string-improvements/tools/buildbot/slaves/win32-SharpSvn:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/tools/buildbot/slaves/win32-SharpSvn:1072541-1078213
+/subversion/branches/issue-2779-dev/tools/buildbot/slaves/win32-SharpSvn:965496-984198
+/subversion/branches/issue-2843-dev/tools/buildbot/slaves/win32-SharpSvn:871432-874179
+/subversion/branches/issue-3000/tools/buildbot/slaves/win32-SharpSvn:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/tools/buildbot/slaves/win32-SharpSvn:873375-874084
+/subversion/branches/issue-3148-dev/tools/buildbot/slaves/win32-SharpSvn:875193-875204
+/subversion/branches/issue-3220-dev/tools/buildbot/slaves/win32-SharpSvn:872210-872226
+/subversion/branches/issue-3242-dev/tools/buildbot/slaves/win32-SharpSvn:879653-896436
+/subversion/branches/issue-3334-dirs/tools/buildbot/slaves/win32-SharpSvn:875156-875867
+/subversion/branches/issue-3975/tools/buildbot/slaves/win32-SharpSvn:1152931-1160746
+/subversion/branches/issue-4116-dev/tools/buildbot/slaves/win32-SharpSvn:1424719-1425040
+/subversion/branches/issue-4194-dev/tools/buildbot/slaves/win32-SharpSvn:1410507-1414880
+/subversion/branches/issue-4869/tools/buildbot/slaves/win32-SharpSvn:1885862-1885981
+/subversion/branches/java10-compat/tools/buildbot/slaves/win32-SharpSvn:1840620-1841179
+/subversion/branches/javahl-1.14-fixes/tools/buildbot/slaves/win32-SharpSvn:1882126-1886028
+/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn:991978-1494640
+/subversion/branches/kwallet/tools/buildbot/slaves/win32-SharpSvn:870785-871314
+/subversion/branches/log-addressing/tools/buildbot/slaves/win32-SharpSvn:1509279-1546844
+/subversion/branches/log-g-performance/tools/buildbot/slaves/win32-SharpSvn:870941-871032
+/subversion/branches/merge-skips-obstructions/tools/buildbot/slaves/win32-SharpSvn:874525-874615
+/subversion/branches/move-tracking-2/tools/buildbot/slaves/win32-SharpSvn:1606692-1714632
+/subversion/branches/multi-layer-moves/tools/buildbot/slaves/win32-SharpSvn:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/tools/buildbot/slaves/win32-SharpSvn:870276,870376
+/subversion/branches/node_pool/tools/buildbot/slaves/win32-SharpSvn:1304828-1305388
+/subversion/branches/patch-exec/tools/buildbot/slaves/win32-SharpSvn:1692717-1705390
+/subversion/branches/performance/tools/buildbot/slaves/win32-SharpSvn:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,10293
35-1029336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/tools/buildbot/slaves/win32-SharpSvn:1643757-1659392
+/subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-SharpSvn:956579-1033052
+/subversion/branches/ra-svn-tuning/tools/buildbot/slaves/win32-SharpSvn:1658201-1694489
+/subversion/branches/ra_serf-digest-authn/tools/buildbot/slaves/win32-SharpSvn:875693-876404
+/subversion/branches/reintegrate-improvements/tools/buildbot/slaves/win32-SharpSvn:873853-874164
+/subversion/branches/remote-only-status/tools/buildbot/slaves/win32-SharpSvn:1581845-1586090
+/subversion/branches/resolve-incoming-add/tools/buildbot/slaves/win32-SharpSvn:1762797-1764284
+/subversion/branches/revprop-cache/tools/buildbot/slaves/win32-SharpSvn:1298521-1326293
+/subversion/branches/revprop-caching-ng/tools/buildbot/slaves/win32-SharpSvn:1620597,1620599
+/subversion/branches/revprop-packing/tools/buildbot/slaves/win32-SharpSvn:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/shelve/tools/buildbot/slaves/win32-SharpSvn:1802592-1815226
+/subversion/branches/shelve-checkpoint/tools/buildbot/slaves/win32-SharpSvn:1801593-1801923,1801970,1817320,1828508,1828521
+/subversion/branches/shelving-v3/tools/buildbot/slaves/win32-SharpSvn:1853394-1853901
+/subversion/branches/subtree-mergeinfo/tools/buildbot/slaves/win32-SharpSvn:876734-878766
+/subversion/branches/svn-auth-x509/tools/buildbot/slaves/win32-SharpSvn:1603509-1655900
+/subversion/branches/svn-info-detail/tools/buildbot/slaves/win32-SharpSvn:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/tools/buildbot/slaves/win32-SharpSvn:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/tools/buildbot/slaves/win32-SharpSvn:1642232-1695991
+/subversion/branches/svn-patch-improvements/tools/buildbot/slaves/win32-SharpSvn:918519-934609
+/subversion/branches/svn_mutex/tools/buildbot/slaves/win32-SharpSvn:1141683-1182099
+/subversion/branches/svnpatch-diff/tools/buildbot/slaves/win32-SharpSvn:865738-876477
+/subversion/branches/svnraisetc/tools/buildbot/slaves/win32-SharpSvn:874709-875149
+/subversion/branches/svnserve-logging/tools/buildbot/slaves/win32-SharpSvn:869828-870893
+/subversion/branches/swig-py3/tools/buildbot/slaves/win32-SharpSvn:1813660-1869353
+/subversion/branches/tc-issue-3334/tools/buildbot/slaves/win32-SharpSvn:874697-874773
+/subversion/branches/tc-merge-notify/tools/buildbot/slaves/win32-SharpSvn:874017-874062
+/subversion/branches/tc-resolve/tools/buildbot/slaves/win32-SharpSvn:874191-874239
+/subversion/branches/tc_url_rev/tools/buildbot/slaves/win32-SharpSvn:874351-874483
+/subversion/branches/tree-conflicts/tools/buildbot/slaves/win32-SharpSvn:868291-873154
+/subversion/branches/tree-conflicts-notify/tools/buildbot/slaves/win32-SharpSvn:873926-874008
+/subversion/branches/tristate-chunked-request/tools/buildbot/slaves/win32-SharpSvn:1502394-1502681
+/subversion/branches/tweak-build-take-two/tools/buildbot/slaves/win32-SharpSvn:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/tools/buildbot/slaves/win32-SharpSvn:1060426-1064427
+/subversion/branches/verify-at-commit/tools/buildbot/slaves/win32-SharpSvn:1462039-1462408
+/subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn:1439280-1546110
+/subversion/branches/wc-collate-path/tools/buildbot/slaves/win32-SharpSvn:1402685-1480384
Modified: subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd?rev=1890000&r1=1889995&r2=1890000&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd Tue
May 18 12:56:27 2021
@@ -23,14 +23,19 @@ SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDE
CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
-PUSHD ..\deps
-nant gen-dev -D:wc=..\build -D:impBase=../deps/build/win32 -D:botBuild=true
%SVN_NANT_ARGS%
-IF ERRORLEVEL 1 EXIT /B 1
+SET GM_ARGS=-t vcproj --vsnet-version=2019
+SET GM_ARGS=%GM_ARGS% --with-apr=%VCPKG_INSTALLED%
+SET GM_ARGS=%GM_ARGS% --with-apr-util=%VCPKG_INSTALLED%
+SET GM_ARGS=%GM_ARGS% --with-openssl=%VCPKG_INSTALLED%
+SET GM_ARGS=%GM_ARGS% --with-serf=%VCPKG_INSTALLED% --with-shared-serf
+SET GM_ARGS=%GM_ARGS% --with-sqlite=%VCPKG_INSTALLED%
+SET GM_ARGS=%GM_ARGS% --with-zlib=%VCPKG_INSTALLED%
-POPD
+SET GM_ARGS=%GM_ARGS% -D SVN_HI_RES_SLEEP_MS=1
+echo python gen-make.py %GM_ARGS%
+python gen-make.py %GM_ARGS% || exit /B 1
-msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32
/t:__ALL_TESTS__ %SVN_MSBUILD_ARGS%
-IF ERRORLEVEL 1 EXIT /B 1
+msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32
/t:__ALL_TESTS__ %SVN_MSBUILD_ARGS% || EXIT /B 1
-EXIT /B 0
+exit /B 0
\ No newline at end of file
Modified: subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-cleanup.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-cleanup.cmd?rev=1890000&r1=1889995&r2=1890000&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-cleanup.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-vcpkg/svntest-cleanup.cmd Tue
May 18 12:56:27 2021
@@ -27,20 +27,27 @@ IF NOT EXIST "..\deps\" MKDIR "..\deps"
PUSHD ..\deps
ECHO Checking dependencies in %CD%
-IF NOT EXIST "imports\" (
- svn co https://ctf.open.collab.net/svn/repos/sharpsvn/trunk/imports
imports --username guest --password ""
+IF NOT EXIST "vcpkg\." (
+ git clone https://github.com/microsoft/vcpkg.git vcpkg || exit /B 1
+) ELSE (
+ pushd vcpkg
+ git pull || exit /B 1
+ popd
)
-IF NOT EXIST build\imports.done (
- svn up imports --username guest --password ""
- copy /y imports\dev-default.build default.build
- nant prep-dev %NANTARGS%
- IF ERRORLEVEL 1 (
- EXIT /B 1
- )
- del release\bin\*svn* release\bin\_*.* 2>nul:
- ECHO. > build\imports.done
+
+REM Patches are not accepted in VCPKG repository yet. We use the ampscm
repository (SharpSvn) as overlays for now
+IF NOT EXIST "vcpkg_additions\." (
+ git clone https://github.com/ampscm/vcpkg_additions.git vcpkg_additions ||
exit /B 1
+) ELSE (
+ pushd vcpkg_additions
+ git pull || exit /B 1
+ popd
)
+pushd vcpkg
+call bootstrap-vcpkg.bat || exit /B 1
+vcpkg install --overlay-ports=../vcpkg_additions/ports serf:x86-windows
sqlite3:x86-windows
+
POPD
PUSHD "%TEMP%"
