From f3044136cda02870c475ea9cbac5fd5949f63827 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Thu, 25 Aug 2022 22:12:13 -0700 Subject: [PATCH] Clean up after 9be1ad96. --- org.lflang.ide/build.gradle | 2 +- org.lflang.lfc/build.gradle | 2 +- org.lflang/build.gradle | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.lflang.ide/build.gradle b/org.lflang.ide/build.gradle index c4415a5134..3731bc0bbe 100644 --- a/org.lflang.ide/build.gradle +++ b/org.lflang.ide/build.gradle @@ -8,7 +8,7 @@ dependencies { apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -task generateLanguageServer { +task generateLanguageServer(dependsOn: [':org.lflang.lfc:setupTypescriptRuntime']) { description 'Creates a jar file that implements a language server.' apply plugin: 'java' diff --git a/org.lflang.lfc/build.gradle b/org.lflang.lfc/build.gradle index 534623ab88..625109c65f 100644 --- a/org.lflang.lfc/build.gradle +++ b/org.lflang.lfc/build.gradle @@ -49,7 +49,7 @@ task buildLfc(dependsOn: ['setupTypescriptRuntime']) { task setupTypescriptRuntime(type: Exec) { workingDir '../org.lflang/src/lib/ts/reactor-ts' - commandLine 'pnpm', 'install' + commandLine 'npm', 'install' outputs.file('../org.lflang/src/lib/ts/reactor-ts/*') } diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle index 22eb02e554..97b879e3e2 100644 --- a/org.lflang/build.gradle +++ b/org.lflang/build.gradle @@ -70,6 +70,7 @@ jar { } processResources.dependsOn(generateXtextLanguage) +processResources.dependsOn(':org.lflang.lfc:setupTypescriptRuntime') generateXtext.dependsOn(generateXtextLanguage) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2]