aboutsummaryrefslogtreecommitdiffhomepage
path: root/.github/workflows
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2024-08-23 04:13:15 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2024-08-23 04:51:55 +0200
commitee9cf43587d5fef3a0f6d97ef50b8cf848945bcb (patch)
tree4e4bb285120f56c65292dfc9ae33d126bf06ad8e /.github/workflows
parente2c7c11066739cf1141f1d47dc3789a5e82eb9cd (diff)
downloadsciteco-ee9cf43587d5fef3a0f6d97ef50b8cf848945bcb.tar.gz
fully support out of tree builds
* You no longer have to copy contrib/scintilla, contrib/scinterm and contrib/lexilla manually to the build directory. * It turns out, that Scintilla/Lexilla was supporting this since 2016. Scintilla allows pointing to a source directory (srdir) and Lexilla to a binary directory (DIR_O). * For Scinterm I opened a pull request in order to add srcdir/basedir variables: https://github.com/orbitalquark/scinterm/pull/21 * `make distcheck` is therefore now also fixed. * The FreeBSD package is now allowed to build out of source. I haven't tested it yet. * See also https://github.com/ScintillaOrg/lexilla/issues/266
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/ci.yml14
-rw-r--r--.github/workflows/nightly.yml4
2 files changed, 5 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18ae819..b31bc45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,10 +48,8 @@ jobs:
run: xvfb-run -a make check TESTSUITEFLAGS="--verbose"
- name: Build Developer Documentation
run: cd doc && make devdoc
- # FIXME: Will try to perform an out-of-tree build which will not
- # work without manual intervention due to Scintilla.
-# - name: make distcheck
-# run: xvfb-run -a make distcheck
+ - name: make distcheck
+ run: xvfb-run -a make distcheck
- name: Build Source Tarball
run: make dist
@@ -86,9 +84,7 @@ jobs:
run: make check TESTSUITEFLAGS="--verbose"
- name: Build Developer Documentation
run: cd doc && make devdoc
- # FIXME: Will try to perform an out-of-tree build which will not
- # work without manual intervention due to Scintilla.
-# - run: make distcheck
+ - run: make distcheck
- name: Build Source Tarball
run: make dist
@@ -135,8 +131,6 @@ jobs:
run: make check TESTSUITEFLAGS="--verbose"
- name: Build Developer Documentation
run: cd doc && make devdoc
- # FIXME: Will try to perform an out-of-tree build which will not
- # work without manual intervention due to Scintilla.
-# - run: make distcheck
+ - run: make distcheck
- name: Build Source Tarball
run: make dist
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 9c80c87..f4d8caa 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -189,9 +189,7 @@ jobs:
LDFLAGS: -flto
run: |
autoreconf -i
- mkdir -p build-wingui/contrib build-wincon/contrib
- cp -r contrib/{scintilla,lexilla,scinterm} build-wingui/contrib
- cp -r contrib/{scintilla,lexilla,scinterm} build-wincon/contrib
+ mkdir build-wingui build-wincon
(cd build-wingui
../configure --with-interface=pdcurses-gui --enable-html-manual --program-prefix=g \
PDCURSES_LIBS="-lpdcurses_wingui -lgdi32 -lcomdlg32 -lwinmm")