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/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index 4053745..23225eb 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -700,12 +700,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install node
- install(
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}-installed/"
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
- USE_SOURCE_PERMISSIONS)
-
# install Copilot Language Server
if(RSTUDIO_ENABLE_COPILOT)
if(APPLE)
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 233438a..6383ae4 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -150,57 +150,6 @@
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
</target>
- <!-- panmirror typescript library -->
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
- <property name="node.version" value="22.13.1"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
-
-
- <!-- use yarn from system but will prefer yarn from dependencies if available -->
- <set-if-exists property="yarn.bin" value="${node.dir}/bin/yarn"/>
- <set-if-exists property="yarn.bin" value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/>
- <set-if-exists property="yarn.bin" value="c:/rstudio-tools/dependencies/common/node/${node.version}/node_modules/yarn/bin/yarn.cmd"/>
- <set-if-exists property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd"/>
- <set-if-unset property="yarn.bin" value="yarn"/>
-
- <!-- similar lookup for panmirror -->
- <set-if-exists property="panmirror.dir" value="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
- <set-if-exists property="panmirror.dir" value="c:/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
- <set-if-exists property="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
- <property name="panmirror.build.dir" value="./www/js/panmirror"/>
-
- <target name="panmirror" description="Compile panmirror library">
-
- <!-- Make sure a default value for panmirror.minify is set -->
- <condition property="panmirror.minify" value="true">
- <not>
- <isset property="panmirror.minify" />
- </not>
- </condition>
-
- <echo message="yarn location: ${yarn.bin}"/>
- <echo message="panmirror location: ${panmirror.dir}"/>
- <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"/>
- <arg value="${panmirror.minify}"/>
- <arg value="--sourcemap"/>
- <arg value="true"/>
- <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}"/>
<java-compile srcdir="${src.dir}" includes="com/google/**" deprecation="false">
@@ -271,8 +220,6 @@
<antcall target="generate-i18n"/>
<antcall target="codeserver">
<param name="gwt.main.module" value="org.rstudio.studio.RStudioSuperDevMode"/>
- <param name="panmirror.target" value="ide-dev"/>
- <param name="panmirror.minify" value="false"/>
</antcall>
</target>
@@ -285,9 +232,6 @@
</target>
<target name="codeserver" depends="acesupport,javac" description="Run GWT devmode code server">
- <antcall target="panmirror">
- <param name="panmirror.target" value="${panmirror.target}"/>
- </antcall>
<java failonerror="true" fork="true" classname="com.google.gwt.dev.DevMode">
<classpath>
<pathelement location="${src.dir}"/>