Hack around extra quotes in Windows build-version file

dreiss · dreiss · commit 7b3fa67d6817 · 2021-07-19T11:39:39.000-07:00
I accidentally added quotes in the build-version file in Windows builds.
Add a hack to remove them so we can use the 1.9.0 binaries.
diff --git a/build.gradle b/build.gradle
@@ -29,9 +29,9 @@ if (!BUILD_VERSION_FILE.isFile()) {
     "Cannot find ${BUILD_VERSION_FILE}.  " +
     "Make sure LIBTORCH_HOME refers to the root of the libtorch distribution.");
 }
-def installedVersion = BUILD_VERSION_FILE.readLines();
+def installedVersion = BUILD_VERSION_FILE.readLines()[0].replace("\"", "");
 def versionPattern = "^" + java.util.regex.Pattern.quote(LIBTORCH_VERSION) + "\\b.*";
-if (!USE_NIGHTLY && !(installedVersion[0] ==~ versionPattern)) {
+if (!USE_NIGHTLY && !(installedVersion ==~ versionPattern)) {
   throw new RuntimeException(
     "Found libtorch version ${installedVersion}, but build.gradle expects ${LIBTORCH_VERSION}.");
 }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ if (!BUILD_VERSION_FILE.isFile()) {`
`29`	`29`	`"Cannot find ${BUILD_VERSION_FILE}. " +`
`30`	`30`	`"Make sure LIBTORCH_HOME refers to the root of the libtorch distribution.");`
`31`	`31`	`}`
`32`		`-def installedVersion = BUILD_VERSION_FILE.readLines();`
	`32`	`+def installedVersion = BUILD_VERSION_FILE.readLines()[0].replace("\"", "");`
`33`	`33`	`def versionPattern = "^" + java.util.regex.Pattern.quote(LIBTORCH_VERSION) + "\\b.*";`
`34`		`-if (!USE_NIGHTLY && !(installedVersion[0] ==~ versionPattern)) {`
	`34`	`+if (!USE_NIGHTLY && !(installedVersion ==~ versionPattern)) {`
`35`	`35`	`throw new RuntimeException(`
`36`	`36`	`"Found libtorch version ${installedVersion}, but build.gradle expects ${LIBTORCH_VERSION}.");`
`37`	`37`	`}`