File remove-panmirror.patch of Package rstudio

Overview Repositories Revisions Requests Users Attributes Meta

File remove-panmirror.patch of Package rstudio

Not easy to build. If someone can figure out how to make this work,
this patch can be removed again.

diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 83e9433..9b675c7 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -83,64 +83,6 @@
       <echo>Concatenated acesupport files to 'acesupport.js'</echo>
    </target>
 
-   
-   
-   <property name="node.version" value="16.14.0"/>
-   <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
-   
-   <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>
-   
-   <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"/>
-   
-   <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="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
-   <property name="panmirror.build.dir" value="./www/js/panmirror"/>
-
-   
-   <available
-      property="panmirror.dir"
-      value="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"
-      file="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
-   
-   <available
-      property="panmirror.dir"
-      value="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"
-      file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/>
-
-   <target name="panmirror" description="Compile panmirror library">
-      <echo message="yarn location: ${yarn.bin}"/>
-      <echo message="panmirror location: ${panmirror.dir}"/>
-      <mkdir dir="${panmirror.build.dir}"/>
-      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
-         <arg value="install"/>
-      </exec>
-      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
-         <arg value="build"/>
-         <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/>
-      </exec>
-      <copy todir="${panmirror.build.dir}">
-         <fileset dir="${panmirror.dir}/dist-rstudio"/>
-      </copy>
-   </target>
-
    <target name="javac" description="Compile java source">
       <mkdir dir="${build.dir}"/>
       <!-- Compile com.google stuff separately from org.rstudio stuff since
@@ -170,9 +112,6 @@
    </target>
 
    <target name="gwtc" depends="ext,javac" description="GWT compile to JavaScript">
-      <antcall target="panmirror">
-         <param name="panmirror.target" value="ide-dist"/>
-      </antcall>
       <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler">
          <classpath>
             <pathelement location="${src.dir}"/>
@@ -221,7 +160,6 @@
       <antcall target="generate-i18n"/>
       <antcall target="codeserver">
          <param name="gwt.main.module" value="org.rstudio.studio.RStudioDesktopSuperDevMode"/>
-         <param name="panmirror.target" value="ide-dev"/>
       </antcall>
    </target>

Places

File remove-panmirror.patch of Package rstudio

Places