Skip to content

Commit

Permalink
Merge pull request supercollider#6337 from capital-G/remove-sced
Browse files Browse the repository at this point in the history
Remove gedit plugin sced
  • Loading branch information
dyfer authored Aug 14, 2024
2 parents 95b5b32 + a7e803b commit 0a34619
Show file tree
Hide file tree
Showing 36 changed files with 7 additions and 3,945 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
if $SHARED_LIBSCSYNTH; then EXTRA_CMAKE_FLAGS="-DLIBSCSYNTH=ON $EXTRA_CMAKE_FLAGS"; fi
cmake $EXTRA_CMAKE_FLAGS -DSC_EL=ON -DSC_VIM=ON -DSC_ED=ON -DSC_QT=ON -DSC_IDE=ON -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PATH -DCMAKE_BUILD_TYPE=Release .. # --debug-output
cmake $EXTRA_CMAKE_FLAGS -DSC_EL=ON -DSC_VIM=ON -DSC_QT=ON -DSC_IDE=ON -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PATH -DCMAKE_BUILD_TYPE=Release .. # --debug-output
- name: build
run: |
Expand Down
4 changes: 0 additions & 4 deletions HelpSource/Reference/KeyboardShortcuts.schelp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ note:: For shortcuts bindings of teletype::ScIDE::, please consult the menu and/
table::
## strong::Functions::
|| strong::macOS::
|| strong::GEdit (sced):: footnote::http://artfwo.googlepages.com/sced::
|| strong::Vim (scvim):: footnote::http://www.neisis.net/%7Ealex/scvim::
|| strong::Emacs (scel):: footnote:: link::Reference/EmacsEditor:: ::

Expand Down Expand Up @@ -144,7 +143,6 @@ section:: Files
table::
## strong::Functions::
|| strong::macOS::
|| strong::GEdit (sced)::
|| strong::Vim (scvim)::
|| strong::Emacs (scel)::

Expand Down Expand Up @@ -189,7 +187,6 @@ section::Text Editing
table::
## strong::Functions::
|| strong::macOS::
|| strong::GEdit (sced)::
|| strong::Vim (scvim)::
|| strong::Emacs (scel)::

Expand Down Expand Up @@ -288,7 +285,6 @@ section::Formatting
table::
## strong::Functions::
|| strong::macOS::
|| strong::GEdit (sced)::
|| strong::Vim (scvim)::
|| strong::Emacs (scel)::

Expand Down
2 changes: 1 addition & 1 deletion README_BEAGLEBONE_BLACK.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ssh from your laptop by opening a terminal and typing:
cd supercollider
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DSUPERNOVA=OFF -DNATIVE=ON -DSC_IDE=OFF -DNO_X11=ON \
-DSC_QT=OFF -DSC_ED=OFF -DSC_EL=OFF -DSC_VIM=ON ..
-DSC_QT=OFF -DSC_EL=OFF -DSC_VIM=ON ..
cmake --build . --config Release --target all
sudo cmake --build . --config Release --target install
sudo ldconfig
Expand Down
4 changes: 2 additions & 2 deletions README_BELA.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,15 @@ Note that if you set `CC=clang` and `CXX=clang++` on Bela image v0.3.x (which ha
as explained in `README_LINUX.md`.

```
cmake .. -DNOVA_SIMD=ON -DSSE=OFF -DSSE2=OFF -DINSTALL_HELP=OFF -DNO_X11=ON -DSC_QT=OFF -DSC_IDE=OFF -DSC_EL=OFF -DSC_ED=OFF \
cmake .. -DNOVA_SIMD=ON -DSSE=OFF -DSSE2=OFF -DINSTALL_HELP=OFF -DNO_X11=ON -DSC_QT=OFF -DSC_IDE=OFF -DSC_EL=OFF \
-DSC_VIM=OFF -DSC_HIDAPI=OFF -DSUPERNOVA=OFF -DNO_AVAHI=ON -DENABLE_TESTSUITE=OFF -DAUDIOAPI=bela \
-DSC_ABLETON_LINK=ON -DCMAKE_INSTALL_PREFIX=/usr/
```

#### Cross-compiling

```
cmake .. -DNOVA_SIMD=ON -DSSE=OFF -DSSE2=OFF -DINSTALL_HELP=OFF -DNO_X11=ON -DSC_QT=OFF -DSC_IDE=OFF -DSC_EL=OFF -DSC_ED=OFF \
cmake .. -DNOVA_SIMD=ON -DSSE=OFF -DSSE2=OFF -DINSTALL_HELP=OFF -DNO_X11=ON -DSC_QT=OFF -DSC_IDE=OFF -DSC_EL=OFF \
-DSC_VIM=OFF -DSC_HIDAPI=OFF -DSUPERNOVA=OFF -DNO_AVAHI=ON -DENABLE_TESTSUITE=OFF -DAUDIOAPI=bela \
-DSC_ABLETON_LINK=ON -DCMAKE_INSTALL_PREFIX=/usr/ -DCMAKE_TOOLCHAIN_FILE=~/Toolchain-arm-linux-gnueabihf.cmake
```
Expand Down
4 changes: 2 additions & 2 deletions README_RASPBERRY_PI.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ Install required libraries:
mkdir build && cd build

# For a GUI-less build:
cmake -DCMAKE_BUILD_TYPE=Release -DSUPERNOVA=OFF -DSC_ED=OFF -DSC_EL=OFF -DSC_VIM=ON -DNATIVE=ON \
cmake -DCMAKE_BUILD_TYPE=Release -DSUPERNOVA=OFF -DSC_EL=OFF -DSC_VIM=ON -DNATIVE=ON \
-DSC_IDE=OFF -DNO_X11=ON -DSC_QT=OFF ..

# For a GUI build:
cmake -DCMAKE_BUILD_TYPE=Release -DSUPERNOVA=OFF -DSC_ED=OFF -DSC_EL=OFF -DSC_VIM=ON -DNATIVE=ON \
cmake -DCMAKE_BUILD_TYPE=Release -DSUPERNOVA=OFF -DSC_EL=OFF -DSC_VIM=ON -DNATIVE=ON \
-DSC_USE_QTWEBENGINE:BOOL=OFF ..

cmake --build . --config Release --target all -- -j3 # use -j3 flag only on RPi3 or newer
Expand Down
3 changes: 1 addition & 2 deletions SCClassLibrary/DefaultLibrary/Main.sc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Main : Process {
+ (Platform.ideName.switch(
"scvim", {"For help type :SChelp."},
"scel", {"For help type C-c C-y."},
"sced", {"For help type ctrl-U."},
"scapp", {"For help type cmd-d."},
"scqt", {
if (Platform.hasQtWebEngine) {
Expand All @@ -64,7 +63,7 @@ Main : Process {
}) ?? {
(
osx: "For help type cmd-d.",
linux: "For help type ctrl-c ctrl-h (Emacs) or :SChelp (vim) or ctrl-U (sced/gedit).",
linux: "For help type ctrl-c ctrl-h (Emacs) or :SChelp (vim).",
windows: "For help press F1.",
iphone: ""
).at(platform.name);
Expand Down
10 changes: 0 additions & 10 deletions editors/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

if(CMAKE_SYSTEM_NAME MATCHES "Linux")
option(SC_EL "Build emacs-based IDE." ON)
option(SC_ED "Build gedit-based IDE." ON)
option(SC_VIM "Build vim-based IDE." ON)
else()
option(SC_EL "Build emacs-based IDE." OFF)
option(SC_ED "Build gedit-based IDE." OFF)
option(SC_VIM "Build vim-based IDE." OFF)
endif()

Expand All @@ -18,14 +16,6 @@ if(SC_EL)
add_subdirectory(sc-el)
endif()

if(SC_ED)
if(NO_GPL3)
message(WARNING "SC_ED requested, but NO_GPL3 flag is on, so not activated.")
else()
add_subdirectory(sced)
endif()
endif()

if(SC_VIM)
if(NO_GPL3)
message(WARNING "SC_VIM requested, but NO_GPL3 flag is on, so not activated.")
Expand Down
3 changes: 0 additions & 3 deletions editors/sced/AUTHORS

This file was deleted.

39 changes: 0 additions & 39 deletions editors/sced/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 0a34619

Please sign in to comment.