haem/rstudio
SHA256
1
0
Fork 0
forked from pool/rstudio
Code Pull Requests Activity
Files
factory
rstudio/0007-Remove-panmirror.patch

185 lines
7.7 KiB
Diff
Raw Permalink Blame History

From 584c4e721db80dc59c44fb2c5521ae1784100b90 Mon Sep 17 00:00:00 2001
From: haem <mixosaurus+obs@pm.me>
Date: Fri, 12 Sep 2025 17:17:31 +0200
Subject: [PATCH 07/12] Remove panmirror
It's difficult to build and requires quarto.
---
src/cpp/session/CMakeLists.txt | 14 -----
src/gwt/build.xml | 95 ----------------------------------
2 files changed, 109 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index fa93a1e2..9d0c6b34 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -442,17 +442,6 @@ endforeach()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../../NOTICE
${CMAKE_CURRENT_SOURCE_DIR}/resources COPYONLY)
-# configure custom panmirror script into the resources directory
-#
-# On Linux and Windows builders, found in the tools directory, on Mac and dev
-# environments found in the source tree.
-set(RSTUDIO_PANMIRROR_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../../gwt/lib/quarto/packages/editor-server/src/resources/md-writer.lua)
-if(NOT EXISTS "${RSTUDIO_PANMIRROR_SCRIPT}")
- set(RSTUDIO_PANMIRROR_SCRIPT ${RSTUDIO_TOOLS_ROOT}/../src/gwt/lib/quarto/packages/editor-server/src/resources/md-writer.lua)
-endif()
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/panmirror-scripts)
-configure_file(${RSTUDIO_PANMIRROR_SCRIPT}
- ${CMAKE_CURRENT_SOURCE_DIR}/resources/panmirror-scripts/ COPYONLY)
# set include directories
include_directories(
@@ -655,9 +644,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
# notice
install(FILES "resources/NOTICE"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- # panmirror scripts
- install(DIRECTORY "resources/panmirror-scripts"
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
# citation
configure_file("resources/CITATION.in"
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 53e296dc..925ea3c5 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -83,80 +83,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 -->
- <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="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
- <property name="panmirror.build.dir" value="./www/js/panmirror"/>
-
- <!-- use panmirror from /opt/rstudio-tools if available (typical for Docker) -->
- <available
- property="panmirror.dir"
- value="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"
- file="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
- <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">
-
- <!-- 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}"/>
<!-- Compile com.google stuff separately from org.rstudio stuff since
@@ -186,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}"/>
@@ -237,8 +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"/>
- <param name="panmirror.minify" value="false"/>
</antcall>
</target>
@@ -246,23 +167,10 @@
<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>
-
- <target name="devmode-panmirror" description="Run server development mode">
- <antcall target="codeserver">
- <param name="gwt.main.module" value="org.rstudio.studio.RStudioSuperDevMode"/>
- <param name="panmirror.target" value="ide-dev-watch"/>
- <param name="panmirror.minify" value="false"/>
</antcall>
</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}"/>
@@ -382,9 +290,6 @@
<delete dir="gwt-unitCache" failonerror="false" />
<delete dir="${www.dir}/rstudio" failonerror="false" />
<delete file="${ace.bin}/acesupport.js" failonerror="false" />
- <delete dir="${panmirror.build.dir}" failonerror="false"/>
- <delete dir="${panmirror.dir}/dist-rstudio" failonerror="false"/>
- <delete dir="${panmirror.dir}/node_modules" failonerror="false"/>
<delete dir="gen" failonerror="false" />
<delete dir="${extras.dir}" failonerror="false" />
</target>
--
2.51.0
View Git Blame Copy Permalink