diff options
| -rwxr-xr-x | .fmsbw/10-freebsd14-sciteco | 34 | ||||
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | AppImage/sciteco-curses.appdata.xml | 4 | ||||
| -rw-r--r-- | AppImage/sciteco-gtk.appdata.xml | 4 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | README | 22 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | doc/cheat-sheet.mm | 2 | ||||
| -rw-r--r-- | doc/grosciteco.tes.1.in | 2 | ||||
| -rw-r--r-- | doc/sciteco.1.in | 2 | ||||
| -rw-r--r-- | doc/sciteco.7.template | 2 | ||||
| -rw-r--r-- | doc/tedoc.tes.1.in | 2 | ||||
| -rw-r--r-- | doc/tutorial.ms.in | 2 | ||||
| -rw-r--r-- | freebsd/Makefile | 4 | ||||
| -rw-r--r-- | m4/ax_with_ncurses.m4 | 2 | ||||
| -rwxr-xr-x | www/build.tes | 10 | ||||
| -rw-r--r-- | www/screenshots.md | 18 |
21 files changed, 87 insertions, 50 deletions
diff --git a/.fmsbw/10-freebsd14-sciteco b/.fmsbw/10-freebsd14-sciteco new file mode 100755 index 0000000..7ee77c5 --- /dev/null +++ b/.fmsbw/10-freebsd14-sciteco @@ -0,0 +1,34 @@ +#!/bin/sh +set -ex +export ASSUME_ALWAYS_YES=yes + +# Already in freebsd14-sciteco +# TODO: Build this with buildah. +#pkg update +#pkg install FreeBSD-clang FreeBSD-clibs-dev \ +# gmake pkgconf autoconf automake libtool \ +# glib gtk3 groff lowdown valgrind + +autoreconf -i +./configure --with-interface=ncurses --enable-debug --enable-html-docs +gmake + +# NOTE: The test suite must be run in verbose mode because if it fails +# we won't be able to analyze testsuite.log. +gmake check TESTSUITEFLAGS="--verbose --color=never --valgrind" +# Includes a second test suite run, but without Valgrind. +# This is good since we had to exclude several test cases when running +# under CI with --valgrind. +gmake distcheck + +gmake install + +# Build and deploy website +cd www +sciteco -m build.tes +cp *.html /opt/htdocs/ +cd .. +cp ico/sciteco.ico /opt/htdocs/graphics +cp ico/sciteco-48.png /opt/htdocs/graphics + +# TODO: Should we also distribute FreeBSD binaries? diff --git a/.gitmodules b/.gitmodules index ed91108..841ce77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "scintilla"] path = contrib/scintilla - url = https://github.com/rhaberkorn/scintilla-mirror.git + url = git://git.fmsbw.de/scintilla-mirror ignore = untracked [submodule "scinterm"] path = contrib/scinterm @@ -1 +1 @@ -Robin Haberkorn <robin.haberkorn@googlemail.com> +Robin Haberkorn <rhaberkorn@fmsbw.de> diff --git a/AppImage/sciteco-curses.appdata.xml b/AppImage/sciteco-curses.appdata.xml index fb114fe..07e956d 100644 --- a/AppImage/sciteco-curses.appdata.xml +++ b/AppImage/sciteco-curses.appdata.xml @@ -15,10 +15,10 @@ This app contains the curses (terminal) version of SciTECO. </p></description> <launchable type="desktop-id">sciteco-curses.desktop</launchable> - <url type="homepage">https://rhaberkorn.github.io/sciteco/</url> + <url type="homepage">https://sciteco.fmsbw.de/</url> <screenshots> <screenshot type="default"> - <image>https://sciteco.sf.net/screenshots/v2.1.0-freebsd-ncurses.png</image> + <image>https://sciteco.fmsbw.de/screenshots/v2.1.0-freebsd-ncurses.png</image> </screenshot> </screenshots> <provides> diff --git a/AppImage/sciteco-gtk.appdata.xml b/AppImage/sciteco-gtk.appdata.xml index 59e17d7..d65cccf 100644 --- a/AppImage/sciteco-gtk.appdata.xml +++ b/AppImage/sciteco-gtk.appdata.xml @@ -15,10 +15,10 @@ This app contains the GTK+ 3 (graphical) version of SciTECO. </p></description> <launchable type="desktop-id">sciteco-gtk.desktop</launchable> - <url type="homepage">https://rhaberkorn.github.io/sciteco/</url> + <url type="homepage">https://sciteco.fmsbw.de/</url> <screenshots> <screenshot type="default"> - <image>https://sciteco.sf.net/screenshots/v2.3.0-freebsd-gtk.png</image> + <image>https://sciteco.fmsbw.de/screenshots/v2.3.0-freebsd-gtk.png</image> </screenshot> </screenshots> <provides> @@ -96,7 +96,7 @@ the submodules, so that SciTECO can build a verified and prepared version of Scintilla/Scinterm autmatically. Just make sure you have cloned your repository as follows: - $ git clone https://github.com/rhaberkorn/sciteco.git + $ git clone git://git.fmsbw.de/sciteco $ cd sciteco/ $ git submodule update --init @@ -2,6 +2,9 @@ News ==== <span class="nf nf-md-new_box"></span> +The new official website is at [sciteco.fmsbw.de](https://sciteco.fmsbw.de/). + +<span class="nf nf-md-new_box"></span> Releases, nightly builds, both as repositories and binary downloads for RPM-based distributions (Fedora, openSUSE etc.) and Debian-based distributions (Debian, Raspbian, Ubuntu) are now provided via [Open Build Service repositories](https://build.opensuse.org/package/show/home:rhaberkorn:sciteco): @@ -16,7 +16,7 @@ as far as possible. For instance, moving the cursor to the right can be done imm When you delete a character from the end of the command line macro (called rubout), the side-effects of that character which may be a command or part of a command, are undone. - + SciTECO uses the [Scintilla](https://www.scintilla.org/) editor component and supports GTK+ 3 as well as Curses frontends (using [Scinterm](https://foicica.com/scinterm/)). @@ -117,7 +117,7 @@ Download There are prebuilt binary packages and source bundles for your convenience: -* [Github Releases](https://github.com/rhaberkorn/sciteco/releases) +* [Main download archive](https://sciteco.fmsbw.de/downloads) * [Download Archive at Sourceforge](https://sourceforge.net/projects/sciteco/files/) * [FreeBSD port](https://www.freshports.org/editors/sciteco/) [](https://repology.org/project/sciteco-curses/versions) @@ -157,7 +157,7 @@ For [Mac OS X](https://github.com/rhaberkorn/sciteco/wiki/Mac-OS-Support), we currently only provide *experimental* ncurses builds. If everything fails, you can try building from source. -See [`INSTALL`](https://github.com/rhaberkorn/sciteco/blob/master/INSTALL) for more details. +See [`INSTALL`](https://git.fmsbw.de/sciteco/tree/INSTALL) for more details. Community ========= @@ -174,16 +174,16 @@ Additional Documentation ======================== * Online manpages: - [__sciteco__(1)](https://rhaberkorn.github.io/sciteco/sciteco.1.html), - [__sciteco__(7)](https://rhaberkorn.github.io/sciteco/sciteco.7.html), - [__grosciteco.tes__(1)](https://rhaberkorn.github.io/sciteco/grosciteco.tes.1.html), - [__tedoc.tes__(1)](https://rhaberkorn.github.io/sciteco/tedoc.tes.1.html) -* [Tutorial](https://rhaberkorn.github.io/sciteco/tutorial.html): + [__sciteco__(1)](https://sciteco.fmsbw.de/sciteco.1.html), + [__sciteco__(7)](https://sciteco.fmsbw.de/sciteco.7.html), + [__grosciteco.tes__(1)](https://sciteco.fmsbw.de/grosciteco.tes.1.html), + [__tedoc.tes__(1)](https://sciteco.fmsbw.de/tedoc.tes.1.html) +* [Tutorial](https://sciteco.fmsbw.de/tutorial.html): This is what you see when you launch SciTECO for the first time. -* [Cheat Sheet and Language Overview](https://sciteco.sf.net/manuals/cheat-sheet.pdf). +* [Cheat Sheet and Language Overview](https://sciteco.fmsbw.de/manuals/cheat-sheet.pdf). This can be printed on an A4 sheet of paper. * [Wiki at Github](https://github.com/rhaberkorn/sciteco/wiki) -* A [short presentation](https://sciteco.sf.net/manuals/presentation.pdf) +* A [short presentation](https://sciteco.fmsbw.de/manuals/presentation.pdf) (in German!) hold at [Netz39](https://www.netz39.de/). -<p align="center"><img alt="SciTECO icon" src="https://github.com/rhaberkorn/sciteco/raw/master/ico/sciteco-48.png"/></p> +<p align="center"><img alt="SciTECO icon" src="https://sciteco.fmsbw.de/graphics/sciteco-48.png"/></p> diff --git a/configure.ac b/configure.ac index 8ad4685..e4b8ce0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,9 @@ AC_PREREQ([2.65]) AC_INIT([SciTECO], [2.4.0], - [robin.haberkorn@googlemail.com], + [rhaberkorn@fmsbw.de], [sciteco], - [https://github.com/rhaberkorn/sciteco]) + [https://sciteco.fmsbw.de/]) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE diff --git a/debian/control b/debian/control index c7035e4..8acd8b3 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: sciteco Section: editors Priority: optional -Maintainer: Robin Haberkorn <robin.haberkorn@googlemail.com> +Maintainer: Robin Haberkorn <rhaberkorn@fmsbw.de> Build-Depends: debhelper (>= 10), dh-exec, gcc (>= 4:8.1), g++ (>= 4:8.1), libglib2.0-dev (>= 2.44), ncurses-term, libncurses-dev, libgtk-3-dev (>= 3.24), xvfb, groff (>= 1.19.2) Standards-Version: 4.5.0 -Homepage: https://rhaberkorn.github.io/sciteco/ -Vcs-Browser: https://github.com/rhaberkorn/sciteco -Vcs-Git: git://github.com/rhaberkorn/sciteco.git +Homepage: https://sciteco.fmsbw.de/ +Vcs-Browser: https://git.fmsbw.de/sciteco +Vcs-Git: git://git.fmsbw.de/sciteco Package: sciteco-curses Architecture: any diff --git a/debian/copyright b/debian/copyright index 89f538d..f6c8ab2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SciTECO -Upstream-Contact: robin.haberkorn@googlemail.com -Source: https://github.com/rhaberkorn/sciteco +Upstream-Contact: rhaberkorn@fmsbw.de +Source: https://git.fmsbw.de/sciteco Files: * -Copyright: Copyright 2012-2025 Robin Haberkorn <robin.haberkorn@googlemail.com> +Copyright: Copyright 2012-2025 Robin Haberkorn <rhaberkorn@fmsbw.de> License: GPL-3 /usr/share/common-licenses/GPL-3 diff --git a/doc/cheat-sheet.mm b/doc/cheat-sheet.mm index 60104ff..9526783 100644 --- a/doc/cheat-sheet.mm +++ b/doc/cheat-sheet.mm @@ -14,7 +14,7 @@ \#.SP Overview of \fBSciTECO\fP as an editor. A full language description can be found in -.pdfhref W -D https://rhaberkorn.github.io/sciteco/sciteco.7.html -A . \fBsciteco\fP(7) +.pdfhref W -D https://sciteco.fmsbw.de/sciteco.7.html -A . \fBsciteco\fP(7) .br . .\" subscripts diff --git a/doc/grosciteco.tes.1.in b/doc/grosciteco.tes.1.in index e720f3e..4d3fd0b 100644 --- a/doc/grosciteco.tes.1.in +++ b/doc/grosciteco.tes.1.in @@ -211,7 +211,7 @@ The \fBGNU roff\fP \(lqman\(rq macros for writing man pages: .SH AUTHOR . This manpage and the \*(ST program was written by -.MT robin.haberkorn@googlemail.com +.MT rhaberkorn@fmsbw.de Robin Haberkorn .ME . \# EOF
\ No newline at end of file diff --git a/doc/sciteco.1.in b/doc/sciteco.1.in index c62723c..0ed9f85 100644 --- a/doc/sciteco.1.in +++ b/doc/sciteco.1.in @@ -602,7 +602,7 @@ DEC Standard TECO-11 .SH AUTHOR . This manpage and the \*(ST program was written by -.MT robin.haberkorn@googlemail.com +.MT rhaberkorn@fmsbw.de Robin Haberkorn .ME . \# EOF
\ No newline at end of file diff --git a/doc/sciteco.7.template b/doc/sciteco.7.template index 066deb7..c097b70 100644 --- a/doc/sciteco.7.template +++ b/doc/sciteco.7.template @@ -2560,7 +2560,7 @@ Overview of CSS in GTK .SH AUTHOR . This manpage and the \*(ST program was written by -.MT robin.haberkorn@googlemail.com +.MT rhaberkorn@fmsbw.de Robin Haberkorn .ME . \# EOF
\ No newline at end of file diff --git a/doc/tedoc.tes.1.in b/doc/tedoc.tes.1.in index 9f87b37..f942552 100644 --- a/doc/tedoc.tes.1.in +++ b/doc/tedoc.tes.1.in @@ -124,7 +124,7 @@ The \fBGNU roff\fP \(lqman\(rq macros for writing man pages: .SH AUTHOR . This manpage and the \*(ST program was written by -.MT robin.haberkorn@googlemail.com +.MT rhaberkorn@fmsbw.de Robin Haberkorn .ME . \# EOF
\ No newline at end of file diff --git a/doc/tutorial.ms.in b/doc/tutorial.ms.in index f246044..1010e9c 100644 --- a/doc/tutorial.ms.in +++ b/doc/tutorial.ms.in @@ -291,7 +291,7 @@ Consult or even print the official Cheat Sheet to extend your \(lqvocabulary\(rq of \*(ST commands: . .ID 0 -https://sciteco.sf.net/manuals/cheat-sheet.pdf +https://sciteco.fmsbw.de/manuals/cheat-sheet.pdf .DE . .LP diff --git a/freebsd/Makefile b/freebsd/Makefile index 5b127dc..6ad606c 100644 --- a/freebsd/Makefile +++ b/freebsd/Makefile @@ -4,9 +4,9 @@ CATEGORIES= editors textproc devel MASTER_SITES= https://github.com/rhaberkorn/${PORTNAME}/releases/download/v${DISTVERSION}/ \ SOURCEFORGE/${PORTNAME}/v${DISTVERSION}/ -MAINTAINER= robin.haberkorn@googlemail.com +MAINTAINER= rhaberkorn@fmsbw.de COMMENT= Scintilla-based Text Editor and Corrector -WWW= https://rhaberkorn.github.io/sciteco/ +WWW= https://sciteco.fmsbw.de/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/m4/ax_with_ncurses.m4 b/m4/ax_with_ncurses.m4 index d4b9462..056aba5 100644 --- a/m4/ax_with_ncurses.m4 +++ b/m4/ax_with_ncurses.m4 @@ -75,7 +75,7 @@ # Copyright (c) 2009 Damian Pietras <daper@daper.net> # Copyright (c) 2012 Reuben Thomas <rrt@sc3d.org> # Copyright (c) 2011 John Zaitseff <J.Zaitseff@zap.org.au> -# Copyright (c) 2025 Robin Haberkorn <robin.haberkorn@googlemail.com> +# Copyright (c) 2025 Robin Haberkorn <rhaberkorn@fmsbw.de> # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/www/build.tes b/www/build.tes index 84f5521..bf78692 100755 --- a/www/build.tes +++ b/www/build.tes @@ -1,6 +1,6 @@ #!/usr/local/bin/sciteco -m !* - * Generate the website at https://rhaberkorn.github.io/sciteco + * Generate the website at https://sciteco.fmsbw.de * This reuses content from Markdown and grohtml-generated documents. * Everything else is cross-linked to Sourceforge. * It must currently be run from the www/ subdirectory of an in-tree-build. @@ -17,7 +17,7 @@ <html> <head> <title>SciTECO - <Website> Q[title]</title> - <link rel="icon" type="image/x-icon" href="https://raw.githubusercontent.com/rhaberkorn/sciteco/master/ico/sciteco.ico"> + <link rel="icon" type="image/x-icon" href="https://sciteco.fmsbw.de/graphics/sciteco.ico"> <meta name="description" content="Advanced TECO dialect and interactive screen editor based on Scintilla"> <style> @import "https://www.nerdfonts.com/assets/css/webfont.css"; @@ -39,11 +39,11 @@ SciTECO - <Website> <span class="nf nf-md-home"></span> <a href="index.html">Home</a> / <span class="nf nf-md-image"></span> <a href="screenshots.html">Screenshots</a> / - <span class="nf nf-md-floppy_variant"></span> <a href="https://github.com/rhaberkorn/sciteco/releases" target=_blank>Downloads</a> / + <span class="nf nf-md-floppy_variant"></span> <a href="https://sciteco.fmsbw.de/downloads" target=_blank>Downloads</a> / <span class="nf nf-fa-book_atlas"></span> <a href="sciteco.1.html"><b>sciteco</b>(1)</a> / <span class="nf nf-fa-book_bible"></span> <a href="sciteco.7.html"><b>sciteco</b>(7)</a> / <span class="nf nf-md-alpha_w_box"></span> <a href="https://github.com/rhaberkorn/sciteco/wiki" target=_blank>Wiki</a> / - <span class="nf nf-fa-github_square"></span> <a href="https://github.com/rhaberkorn/sciteco" target=_blank>Github</a> + <span class="nf nf-dev-git"></span> <a href="https://git.fmsbw.de/sciteco" target=_blank>git.fmsbw.de</a> </tt> <hr> } @@ -56,7 +56,7 @@ <td width="1ch" valign=top><b>*</b></td> <td valign=top><marquee>IThis page was made with SciTECO.<span class=reverse>$</span>-EX<span class=reverse>$$</span></marquee></td> <td width=56><a href="https://github.com/rhaberkorn/sciteco/issues" target=_blank> - <img src="https://sciteco.sf.net/graphics/notbug.gif" title="There are no bugs. Go away."> + <img src="https://sciteco.fmsbw.de/graphics/notbug.gif" title="There are no bugs. Go away."> </a></td> </tr></table> </tt> diff --git a/www/screenshots.md b/www/screenshots.md index d0a3651..df8925a 100644 --- a/www/screenshots.md +++ b/www/screenshots.md @@ -2,30 +2,30 @@ ## v2.4.0 - + ## v2.3.0 - + ## v2.1.0 - + -<img src="https://sciteco.sf.net/screenshots/v2.1.0-freebsd-ncurses.png" width="921" alt="FreeBSD/ncurses, Unicode icons" title="FreeBSD/ncurses, Unicode icons"/> +<img src="https://sciteco.fmsbw.de/screenshots/v2.1.0-freebsd-ncurses.png" width="921" alt="FreeBSD/ncurses, Unicode icons" title="FreeBSD/ncurses, Unicode icons"/> ## v2.1 (dev) - + ## v0.7 (dev) - + - + - + ## v0.5 - + |