Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/scripts/prepare_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ if [ -z "$EXE_PATH" ]; then
fi

cp "$EXE_PATH" "$DEST_DIR_RELEASE/jbeam-edit.exe"
du -h "$EXE_PATH"
echo "Copied exe to /$DEST_DIR_RELEASE/jbeam-edit.exe"

LSP_EXE_PATH=$(find "$DIST_NEWSTYLE/build" -type f -name "jbeam-lsp-server.exe" | head -n 1)

if [ -z "$LSP_EXE_PATH" ]; then
echo "Error: No LSP exe found in '$DIST_NEWSTYLE/build', skipping."
else
du -h "$LSP_EXE_PATH"
cp "$LSP_EXE_PATH" "$DEST_DIR_RELEASE/jbeam-lsp-server.exe"
echo "Copied exe to /$DEST_DIR_RELEASE/jbeam-lsp-server.exe"
fi
Expand Down
4 changes: 3 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
packages: .
optimization: False
tests: False

package *
tests: False

package jbeam-edit
tests: False
Expand Down
4 changes: 1 addition & 3 deletions cabal.project.ci
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import: cabal.project
test-show-details: direct

program-options
ghc-options: -Werror

package jbeam-edit
tests: True
flags: +dump-ast +transformation +lsp-server -windows-example-paths
ghc-options: -Werror
5 changes: 5 additions & 0 deletions cabal.project.release
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import: cabal.project
executable-static: True
executable-stripping: True
index-state: hackage.haskell.org 2025-10-12T21:52:54Z

package *
ghc-options:
-threaded
-rtsopts
-with-rtsopts=-N
-split-sections
-optc-Os
-optl-static
-fignore-asserts

package jbeam-edit
tests: False
Expand Down
14 changes: 4 additions & 10 deletions jbeam-edit.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ library
-Wall -Wcompat -Widentities -Wincomplete-record-updates
-Wincomplete-uni-patterns -Wmissing-export-lists
-Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
-Wunused-packages

build-depends:
base >=4.17 && <5,
Expand Down Expand Up @@ -135,7 +136,6 @@ library jbeam-edit-transformation
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -177,7 +177,6 @@ library jbeam-language-server
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -219,7 +218,6 @@ executable jbeam-edit
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -252,7 +250,6 @@ executable jbeam-edit-dump-ast
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -286,7 +283,6 @@ executable jbeam-lsp-server
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -318,7 +314,6 @@ executable jbeam-lsp-test-server
directory,
filepath,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -363,14 +358,15 @@ test-suite jbeam-edit-test
filepath,
hspec,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
vector

if True
build-depends: hspec-megaparsec
build-depends:
hspec-megaparsec,
megaparsec

test-suite jbeam-edit-transformation-test
type: exitcode-stdio-1.0
Expand All @@ -394,7 +390,6 @@ test-suite jbeam-edit-transformation-test
filepath,
hspec,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down Expand Up @@ -433,7 +428,6 @@ test-suite jbeam-language-server-test
filepath,
hspec,
jbeam-edit,
megaparsec,
mtl,
scientific,
text >=2.0,
Expand Down
5 changes: 3 additions & 2 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies:
- vector
- text >= 2.0
- containers
- megaparsec
- scientific
- directory
- filepath
Expand Down Expand Up @@ -100,8 +99,10 @@ internal-libraries:
<<: *jbeam-extra-lib

library:
ghc-options: [-Wunused-packages]
source-dirs: src
generated-other-modules: Paths_jbeam_edit
dependencies: [megaparsec]
when:
- condition: flag(transformation)
cpp-options: -DENABLE_TRANSFORMATION
Expand Down Expand Up @@ -161,7 +162,7 @@ tests:
source-dirs: test
when:
- condition: true
dependencies: [hspec-megaparsec]
dependencies: [megaparsec, hspec-megaparsec]
jbeam-language-server-test:
<<: *jbeam-test-common
source-dirs: test-extra/language-server
Expand Down