37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 05f77b171f06b8a66619f4c00b12f521e87e5d1c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
|
Date: Sat, 16 Jan 2021 19:11:23 +0100
|
|
Subject: [PATCH 7/8] use system node
|
|
|
|
---
|
|
src/gwt/build.xml | 14 +-------------
|
|
1 file changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
|
|
index 899ae7fecd..ac90566667 100644
|
|
--- a/src/gwt/build.xml
|
|
+++ b/src/gwt/build.xml
|
|
@@ -82,19 +82,7 @@
|
|
</target>
|
|
|
|
<!-- panmirror typescript library -->
|
|
- <property name="node.version" value="10.19.0"/>
|
|
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
|
|
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
|
|
- <not>
|
|
- <os family="windows" />
|
|
- </not>
|
|
- </condition>
|
|
- <condition property="node.bin" value="${node.dir}/node.exe">
|
|
- <os family="windows" />
|
|
- </condition>
|
|
-
|
|
- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
|
|
- <available property="node.bin" value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
|
|
+ <property name="node.bin" value="/usr/bin/node"/>
|
|
|
|
<property name="panmirror.dir" value="./panmirror/src/editor"/>
|
|
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
|
--
|
|
2.30.2
|