Skip to content

Commit 0081bd9

Browse files
committed
Merge branch 'master' into 4.11.0
2 parents d0ad8b4 + 412618d commit 0081bd9

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

Scripts/bump_version_number.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,13 @@ async function synchronizeRepositoryWithNewVersionNumber() {
4444
await bumpVersionNumber(version);
4545
}
4646
//# * Update standard library doo files instead of rebuilding to avoid Z3 timeout issues
47-
const standardLibraryDooFiles = [
48-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries.doo",
49-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-js.doo",
50-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-cs.doo",
51-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-py.doo",
52-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-notarget.doo",
53-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-java.doo",
54-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-go.doo",
55-
"Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-arithmetic.doo"
56-
];
47+
const standardLibraryDir = "Source/DafnyStandardLibraries/binaries";
48+
const standardLibraryDooFiles = fs.readdirSync(standardLibraryDir)
49+
.filter(file => file.endsWith('.doo'))
50+
.map(file => `${standardLibraryDir}/${file}`);
5751

5852
for (const dooFile of standardLibraryDooFiles) {
59-
if (fs.existsSync(dooFile)) {
60-
await updateDooVersion(dooFile, version);
61-
}
53+
await updateDooVersion(dooFile, version);
6254
}
6355

6456
// Verify that binaries have been updated.

docs/dev/VERSIONBUMP.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ verifies that this file is in sync with that script.
2323

2424
Assuming `<TestDirectory>` to be `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
2525
perform the following:
26-
* Compile Dafny to ensure you have the right version number.
27-
* Compile the standard libraries and update their binaries which are checked in
28-
* Recompile Dafny so that standard libraries are in the executable.
26+
* Update standard library doo files instead of rebuilding to avoid Z3 timeout issues
2927
* In the test directory `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
30-
* Rebuild `pythonmodule/multimodule/PythonModule1.doo` from `pythonmodule/multimodule/dafnysource/helloworld.dfy`
31-
* Rebuild `pythonmodule/nestedmodule/SomeNestedModule.doo` from `pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy`
32-
* Rebuild `gomodule/multimodule/test.doo` from `gomodule/multimodule/dafnysource/helloworld.dfy`
28+
* Update test doo files instead of rebuilding
29+
* Update `pythonmodule/multimodule/PythonModule1.doo` version
30+
* Update `pythonmodule/nestedmodule/SomeNestedModule.doo` version
31+
* Update `gomodule/multimodule/test.doo` version
3332
* Search for `dafny_version = ` in checked-in `.dtr` files of the `<TestDirectory>`
3433
and update the version number.
3534
Except for the file NoGood.dtr which is not valid.

0 commit comments

Comments
 (0)