From 9334ad532e1255bdffa74bdf1f19eabff031949e Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>

Date: Wed, 20 Dec 2023 11:37:36 +0100

Subject: [PATCH] asdf

---

 src/gwt/build.xml | 32 +-------------------------------

 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/gwt/build.xml b/src/gwt/build.xml

index 27ffe33..5517612 100644

--- a/src/gwt/build.xml

+++ b/src/gwt/build.xml

@@ -84,32 +84,7 @@

    </target>

-   

-   <property name="node.version" value="18.18.2"/>

-   <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>

-   

-   <condition property="yarn.bin" value="yarn">

-     <not>

-        <os family="windows" />

-     </not>

-   </condition>

-   

-      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>

-   

-   

-      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"/>

-   

-   

-      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"/>

@@ -139,11 +114,6 @@

       <echo message="panmirror minify: ${panmirror.minify}"/>

       <mkdir dir="${panmirror.build.dir}"/>

-      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">

-         <arg value="install"/>

-         <arg value="--network-timeout"/>

-         <arg value="240000"/>

-      </exec>

       <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">

          <arg value="build"/>

          <arg value="--minify"/>

-- 

2.43.0