38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
|
diff --git a/src/gwt/build.xml.orig b/src/gwt/build.xml
|
||
|
|
index 83e9433..cbe46cf 100644
|
||
|
|
--- a/src/gwt/build.xml.orig
|
||
|
|
+++ b/src/gwt/build.xml
|
||
|
|
@@ -85,31 +85,7 @@
|
||
|
|
|
||
|
|
<!-- panmirror typescript library -->
|
||
|
|
<!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
||
|
|
- <property name="node.version" value="16.14.0"/>
|
||
|
|
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
|
||
|
|
- <!-- use yarn from system but will prefer yarn from dependencies if available -->
|
||
|
|
- <condition property="yarn.bin" value="yarn">
|
||
|
|
- <not>
|
||
|
|
- <os family="windows" />
|
||
|
|
- </not>
|
||
|
|
- </condition>
|
||
|
|
- <available
|
||
|
|
- property="yarn.bin"
|
||
|
|
- value="${node.dir}/bin/yarn"
|
||
|
|
- file="${node.dir}/bin/yarn"/>
|
||
|
|
- <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd">
|
||
|
|
- <os family="windows" />
|
||
|
|
- </condition>
|
||
|
|
- <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) -->
|
||
|
|
- <available
|
||
|
|
- property="yarn.bin"
|
||
|
|
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"
|
||
|
|
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/>
|
||
|
|
- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
|
||
|
|
- <available
|
||
|
|
- property="yarn.bin"
|
||
|
|
- value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"
|
||
|
|
- file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/>
|
||
|
|
+ <property name="yarn.bin" value="/usr/bin/yarn"/>
|
||
|
|
|
||
|
|
<property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
|
||
|
|
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|