Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 766294 | Differences between
and this patch

Collapse All | Expand All

(-)rstudio-2022.07.2-576-orig/src/gwt/build.xml (-19 / +1 lines)
Lines 84-113 Link Here
84
   </target>
84
   </target>
85
85
86
   <!-- panmirror typescript library -->
86
   <!-- panmirror typescript library -->
87
   <!-- ensure version matches RSTUDIO_NODE_VERSION -->
88
   <property name="node.version" value="16.14.0"/>
89
   <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
90
   <condition property="node.bin" value="../../../${node.dir}/bin/node">
91
     <not>
92
        <os family="windows" />
93
     </not>
94
   </condition>
95
   <condition property="node.bin" value="${node.dir}/node.exe">
96
     <os family="windows" />
97
   </condition>
98
99
   <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
100
   <available
101
      property="node.bin"
102
      value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
103
      file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
104
105
   <property name="panmirror.dir" value="./panmirror/src/editor"/>
87
   <property name="panmirror.dir" value="./panmirror/src/editor"/>
106
   <property name="panmirror.build.dir" value="./www/js/panmirror"/>
88
   <property name="panmirror.build.dir" value="./www/js/panmirror"/>
107
89
108
   <target name="panmirror" description="Compile panmirror library">
90
   <target name="panmirror" description="Compile panmirror library">
109
      <mkdir dir="${panmirror.build.dir}"/>
91
      <mkdir dir="${panmirror.build.dir}"/>
110
      <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}">
92
      <exec executable="node" dir="${panmirror.dir}" spawn="${panmirror.spawn}">
111
         <arg value="fuse"/>
93
         <arg value="fuse"/>
112
         <arg value="${panmirror.target}"/>
94
         <arg value="${panmirror.target}"/>
113
         <env key="NODE_PATH" path="${env.NODE_PATH}:/opt/rstudio-tools/panmirror/node_modules"/>
95
         <env key="NODE_PATH" path="${env.NODE_PATH}:/opt/rstudio-tools/panmirror/node_modules"/>

Return to bug 766294