Update vulkanSDK (downloading latest version, rewrote .json file and registry entries creation) by Zemogiter · Pull Request #742 · PhoenicisOrg/scripts

Zemogiter · 2018-12-19T00:21:36Z

Ready for review.

Merged current master

Update the fork with changes from master fork.

Fix JSDoc (PhoenicisOrg#538)

Fork update

merge changes

Merging changes to the fork

Merging updates from master fork

Merging changes from master

Rewrote the script to download the latest version of vulkan SDK and reworked how the json file is handled.

plata

This breaks the ability to install the Verb from JavaFX. Please change only the content of

Wine.prototype.vulkanSDK = function () {

Restored verb implementation.

Engines/Wine/Verbs/vulkanSDK/script.js

plata · 2018-12-19T17:21:11Z

Engines/Wine/Verbs/vulkanSDK/script.js

+    var contentVulkanJSON = this.prefixDirectory() + "drive_c/windows/winevulkan.json";
+    touch(contentVulkanJSON);
+    writeToFile(contentVulkanJSON, "{\n	""file_format_version"": "1.0.0",\n	""ICD"": {\n		""library_path"": ""c:\windows\system32\winevulkan.dll"",\n		""api_version"": ""1.1.92.1""\n	}\n}");
+    this.run("reg", ["add", "HKLM\Software\Khronos\Vulkan\Drivers", "/v", "C:\Windows\winevulkan.json", "/t", "REG_DWORD", "/d", "00000000", "/f"], null, false, true);


Should be possible to use the regedit plugin. If you explicitly want to use add instead of regedit.patch, you should add an according method to the plugin.

I think we can create a ticket to fix this later

Changed variable name.

plata · 2019-01-10T17:20:00Z

@Zemogiter anything you want to do or shall we merge?

Zemogiter · 2019-01-10T18:11:15Z

I've retested this verb just now and got this error:

org.phoenicis.scripts.interpreter.ScriptException: javax.script.ScriptException: <eval>:27:40 Expected , but found file_format_version
    writeToFile(patchVulkanJSON, "{\n	""file_format_version"": "1.0.0",\n	""ICD"": {\n		""library_path"": ""c:\windows\system32\winevulkan.dll"",\n		""api_version"": ""1.1.92.1""\n	}\n}");
                                     	  ^ in <eval> at line number 27 at column number 40
	at org.phoenicis.scripts.nashorn.builtins.EngineInjector.throwException(EngineInjector.java:22)
	at org.phoenicis.scripts.nashorn.NashornEngine.handleError(NashornEngine.java:74)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:53)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:44)
	at org.phoenicis.scripts.nashorn.builtins.IncludeInjector.lambda$injectInto$0(IncludeInjector.java:36)
	at jdk.scripting.nashorn.scripts/jdk.nashorn.internal.scripts.Script$Recompilation$166$\^eval\_/0x0000000800932840.:program(<eval>:1)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptFunctionData.invoke(ScriptFunctionData.java:655)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptFunction.invoke(ScriptFunction.java:513)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptRuntime.apply(ScriptRuntime.java:527)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:456)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:413)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:409)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.eval(NashornScriptEngine.java:162)
	at java.scripting/javax.script.AbstractScriptEngine.eval(AbstractScriptEngine.java:264)
	at org.phoenicis.scripts.nashorn.NashornEngine.evalAndReturn(NashornEngine.java:59)
	at org.phoenicis.scripts.nashorn.NashornInteractiveSession.eval(NashornInteractiveSession.java:34)
	at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1(BackgroundScriptInterpreter.java:43)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
	at java.base/java.lang.Thread.run(Thread.java:834)
Caused by: javax.script.ScriptException: <eval>:27:40 Expected , but found file_format_version
    writeToFile(patchVulkanJSON, "{\n	""file_format_version"": "1.0.0",\n	""ICD"": {\n		""library_path"": ""c:\windows\system32\winevulkan.dll"",\n		""api_version"": ""1.1.92.1""\n	}\n}");
                                     	  ^ in <eval> at line number 27 at column number 40
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.throwAsScriptException(NashornScriptEngine.java:477)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:544)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:531)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:409)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.eval(NashornScriptEngine.java:162)
	at java.scripting/javax.script.AbstractScriptEngine.eval(AbstractScriptEngine.java:264)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:50)
	... 17 more
Caused by: jdk.nashorn.internal.runtime.ParserException: <eval>:27:40 Expected , but found file_format_version
    writeToFile(patchVulkanJSON, "{\n	""file_format_version"": "1.0.0",\n	""ICD"": {\n		""library_path"": ""c:\windows\system32\winevulkan.dll"",\n		""api_version"": ""1.1.92.1""\n	}\n}");
                                     	  ^
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.error(AbstractParser.java:297)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.error(AbstractParser.java:282)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.expectDontAdvance(AbstractParser.java:353)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.expect(AbstractParser.java:340)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.argumentList(Parser.java:3716)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.leftHandSideExpression(Parser.java:3410)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.unaryExpression(Parser.java:4440)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4620)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.conditionalExpression(Parser.java:4772)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4711)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4589)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4585)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expressionStatement(Parser.java:1854)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.statement(Parser.java:1155)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.sourceElements(Parser.java:909)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.functionBody(Parser.java:4206)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.functionExpression(Parser.java:3831)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.memberExpression(Parser.java:3578)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.leftHandSideExpression(Parser.java:3407)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.unaryExpression(Parser.java:4440)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4620)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.conditionalExpression(Parser.java:4772)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4711)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4734)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4589)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4585)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expressionStatement(Parser.java:1854)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.statement(Parser.java:1155)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.sourceElements(Parser.java:909)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.program(Parser.java:844)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.parse(Parser.java:325)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.parse(Parser.java:285)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compile(Context.java:1500)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compileScript(Context.java:1467)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compileScript(Context.java:750)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:542)
	... 22 more

What's strange is that the writeToFile line works in other scripts.

plata · 2019-01-10T18:44:02Z

You have " inside the string. Probably must be escaped with \.

Zemogiter · 2019-01-10T18:48:26Z

But these " inside the string must be inside the file or else vulkanSDK wont work propetly.

plata · 2019-01-10T18:50:49Z

That's why I said: they must be escaped with \. So instead of

writeToFile(patchVulkanJSON, "{\n	""file_format_version"": "1.0.0"...

do

writeToFile(patchVulkanJSON, "{\n	\"file_format_version\": \"1.0.0\"...

Zemogiter · 2019-01-10T18:56:08Z

Oh okey I didn't understand you before. The script is now operational and ready to be merged.

Fixed the extra `"` inside the 2nd parm of `writeToFile` crashing the installer.

plata · 2019-01-10T18:57:16Z

Don't you need to push something?

plata · 2019-01-10T18:57:26Z

Ah ok.

Zemogiter · 2019-01-14T13:13:30Z

Codacy complains about those escape characters. But they are needed or else installation of vulkanSDK will fail.

plata · 2019-01-14T17:47:32Z

Yes, I've seen this before. I don't think you can fix it.

Zemogiter added 10 commits March 27, 2018 22:15

Merge pull request #1 from PhoenicisOrg/master

254649c

Merged current master

Merge pull request #3 from PhoenicisOrg/master

63f898c

Update the fork with changes from master fork.

Merge pull request #4 from PhoenicisOrg/master

71cd3d8

Fix JSDoc (PhoenicisOrg#538)

Merge pull request #5 from PhoenicisOrg/master

60c3cb5

Fork update

Merge pull request #6 from PhoenicisOrg/master

69e7bf2

merge changes

Merge pull request #7 from PhoenicisOrg/master

5bf56fe

Merging changes to the fork

Merge pull request #8 from PhoenicisOrg/master

1c4fe31

Merging updates from master fork

Merge pull request #9 from PhoenicisOrg/master

66bd276

Merging changes from master

Update script.js

60481ec

Rewrote the script to download the latest version of vulkan SDK and reworked how the json file is handled.

Merge branch 'master' into vulkansdk-fix

a3f3218

plata requested changes Dec 19, 2018

View reviewed changes

Update script.js

cf7e695

Restored verb implementation.

plata requested changes Dec 19, 2018

View reviewed changes

Update script.js

f840543

Changed variable name.

plata approved these changes Jan 10, 2019

View reviewed changes

Update script.js

fb6f4e7

Fixed the extra `"` inside the 2nd parm of `writeToFile` crashing the installer.

plata merged commit 58ce925 into PhoenicisOrg:master Jan 14, 2019

Zemogiter deleted the vulkansdk-fix branch January 15, 2019 09:36

Kreyren mentioned this pull request Mar 8, 2019

Update League Of Legends #797

Closed

Conversation

Zemogiter commented Dec 19, 2018

Uh oh!

plata left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

plata Dec 19, 2018

Choose a reason for hiding this comment

Uh oh!

qparis Jan 9, 2019

Choose a reason for hiding this comment

Uh oh!

plata Jan 10, 2019

Choose a reason for hiding this comment

Uh oh!

plata commented Jan 10, 2019

Uh oh!

Zemogiter commented Jan 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

plata commented Jan 10, 2019

Uh oh!

Zemogiter commented Jan 10, 2019

Uh oh!

plata commented Jan 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zemogiter commented Jan 10, 2019

Uh oh!

plata commented Jan 10, 2019

Uh oh!

plata commented Jan 10, 2019

Uh oh!

Zemogiter commented Jan 14, 2019

Uh oh!

plata commented Jan 14, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

plata left a comment •

edited

Loading

Zemogiter commented Jan 10, 2019 •

edited

Loading

plata commented Jan 10, 2019 •

edited

Loading