Skip to content

Commit

Permalink
Changes to work with pragtical luajit
Browse files Browse the repository at this point in the history
  • Loading branch information
jgmdev committed Jan 30, 2024
1 parent e4f69f7 commit 615b248
Show file tree
Hide file tree
Showing 6 changed files with 175 additions and 137 deletions.
120 changes: 43 additions & 77 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,100 +1,66 @@
name: CI
on: { push: { branches: [master] } }
jobs:
version:
runs-on: ubuntu-latest
outputs:
version: ${{ steps.setup_release.outputs.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
with: { fetch-depth: 0 }
- name: Setup Release
id: setup_release
env: { GITHUB_TOKEN: "${{ github.token }}" }
run: |
export VERSION=`git describe --tags --match "v*" | tail -c +2`
echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "Building terminal version $VERSION."
if [[ `git tag --points-at HEAD | head -c 1` == "v" ]]; then
gh release delete -y v$VERSION || true; gh release create -t v$VERSION v$VERSION
gh release delete -y latest || true; gh release create -t latest latest
fi
gh release delete -y continuous || true; gh release create -p -t 'Continuous Release' continuous
build_linux:
needs: [version]
build_linux_windows:
permissions: write-all
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
defaults: { run: { shell: bash } }
container: ghcr.io/lite-xl/lite-xl-build-box:latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
with: { fetch-depth: 0, submodules: true }
with: { fetch-depth: 0 }
- name: Set Environment Variables
run: |
git config --global user.name "Github Actions" && git config --global user.email "[email protected]"
echo VERSION=`git describe --tags --abbrev=0 --match "v*" | tail -c +2` >> $GITHUB_ENV
- name: Clone Submodules
run: git submodule update --init --depth=1
- name: Build Linux
run: BIN=libterminal.x86_64-linux.so ./build.sh -O3 -DLIBTERMINAL_VERSION='"'${{ needs.version.outputs.version }}-x86_64-linux'"'
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with: { name: "Linux", path: "*.so" }

build_windows:
needs: [version]
permissions: write-all
runs-on: ubuntu-latest
defaults: { run: { shell: bash } }
steps:
- name: Checkout Code
uses: actions/checkout@v3
with: { fetch-depth: 0, submodules: true }
run: |
BIN=libterminal.x86_64-linux.so ./build.sh -O3 -DLIBTERMINAL_VERSION='"'$VERSION-x86_64-linux'"'
- name: Build Windows
run: |
sudo apt-get install mingw-w64
BIN=libterminal.x86_64-windows.dll CC=x86_64-w64-mingw32-gcc ./build.sh -O3 -DLIBTERMINAL_VERSION='"'$VERSION-x86_64-windows'"'
- name: Create Release(s)
env: { GITHUB_TOKEN: "${{ github.token }}" }
run: sudo apt-get install mingw-w64 && BIN=libterminal.x86_64-windows.dll CC=x86_64-w64-mingw32-gcc ./build.sh -O3 -DLIBTERMINAL_VERSION='"'${{ needs.version.outputs.version }}-x86_64-windows'"'
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with: { name: "Windows", path: "*.dll" }
run: |
if git tag --points-at HEAD | tail -n1 | grep "^v"; then
gh release delete -y v$VERSION || true;
gh release create -t v$VERSION v$VERSION *.so *.dll
gh release delete -y latest || true;
gh release create -t latest latest *.so *.dll
fi
gh release delete -y continuous || true; gh release create -p -t 'Continuous Release' continuous *.so *.dll
build_macos:
needs: [version]
permissions: write-all
needs: build_linux_windows
runs-on: macos-11
env:
CC: clang
steps:
- name: Checkout Code
uses: actions/checkout@v3
with: { fetch-depth: 0, submodules: true }
with: { fetch-depth: 0 }
- name: Set Environment Variables
run: echo VERSION=`git describe --tags --abbrev=0 --match "v*" | tail -c +2` >> $GITHUB_ENV
- name: Clone Submodules
run: git submodule update --init --depth=1
- name: Build MacOS
env: { GITHUB_TOKEN: "${{ github.token }}" }
run: |
./build.sh clean
BIN=libterminal.x86_64-darwin.so ./build.sh -O3 -DLIBTERMINAL_VERSION='"'${{ needs.version.outputs.version }}-x86_64-darwin'"'
BIN=libterminal.aarch64-darwin.so CC=clang CFLAGS="-arch arm64" ./build.sh -O3 -DLIBTERMINAL_VERSION='"'${{ needs.version.outputs.version }}-x86_64-darwin'"'
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with: { name: "MacOS", path: "*.so" }


finalize:
needs: [version, build_macos, build_linux, build_windows]
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
with: { fetch-depth: 0 }
- name: Download Artifacts
uses: actions/download-artifact@v3
with: { path: "." }
- name: Finalize Tags
env: { GITHUB_TOKEN: "${{ github.token }}" }
run: |
if [[ `git tag --points-at HEAD | head -c 1` == "v" ]]; then
gh release upload v${{ needs.version.outputs.version }} Linux/*.so MacOS/*.so Windows/*.dll
gh release upload latest Linux/*.so MacOS/*.so Windows/*.dll
git branch -f latest HEAD
git tag -f latest
git push -f origin refs/heads/latest
git push -f origin refs/tags/latest
fi
gh release upload continuous Linux/*.so MacOS/*.so Windows/*.dll
git tag -f continuous
git push -f origin refs/tags/continuous
BIN=libterminal.x86_64-darwin.so ./build.sh -O3 -DLIBTERMINAL_VERSION='"'$VERSION-x86_64-darwin'"'
BIN=libterminal.aarch64-darwin.so CC=clang CFLAGS="-arch arm64" ./build.sh -O3 -DLIBTERMINAL_VERSION='"'$VERSION-x86_64-darwin'"'
gh release upload continuous *.so
if git tag --points-at HEAD | tail -n1 | grep "^v"; then
gh release upload v$VERSION *.so
gh release upload latest *.so
git branch -f latest HEAD
git tag -f latest
git push -f origin refs/heads/latest
git push -f origin refs/tags/latest
fi
git tag -f continuous
git push -f origin refs/tags/continuous
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2023 lite-xl Team
Copyright (c) 2023 Pragtical Team

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand All @@ -17,4 +18,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# lite-xl-terminal
# pragtical-terminal

`lite-xl-terminal` is a (mostly) fully-featured terminal emulator designed to
slot into lite-xl as a plugin for windows (Windows 10+ only), mac and linux.
`pragtical-terminal` is a (mostly) fully-featured terminal emulator designed to
slot into pragtical as a plugin for windows (Windows 10+ only), mac and linux.

![image](https://github.com/adamharrison/lite-xl-terminal/assets/1034518/eb8a72a0-ff61-4b95-b009-364ac2725f70)
![image](https://github.com/adamharrison/lite-xl-terminal/assets/1034518/6b8003da-d4c1-4227-8fc9-3d2b1ae89bf2)

## Description

Expand Down Expand Up @@ -52,43 +52,43 @@ More shells should work, but are not tested outright.

## Installation

The easiest way to install `lite-xl-terminal` is to use
[`lpm`](https://github.com/lite-xl/lite-xl-plugin-manager), and then run the
The easiest way to install `pragtical-terminal` is to use
[`ppm`](https://github.com/pragtical/plugin-manager), and then run the
following command:

```
lpm install terminal
ppm install terminal
```

If you want to simply try it out, you can use `lpm`'s `run` command:
If you want to simply try it out, you can use `ppm`'s `run` command:

```
lpm run terminal
ppm run terminal
```

If you want to grab it directly, and build it from the repo, on Linux, Mac
or MSYS on Windows you can do:

```
git clone --depth=1 https://github.com/adamharrison/lite-xl-terminal.git \
--recurse-submodules --shallow-submodules && cd lite-xl-terminal && \
./build.sh && cp -R plugins/terminal ~/.config/lite-xl/plugins && \
cp libterminal.so ~/.config/lite-xl/plugins/terminal
git clone --depth=1 https://github.com/pragtical/terminal.git \
--recurse-submodules --shallow-submodules && cd terminal && \
./build.sh && cp -R plugins/terminal ~/.config/pragtical/plugins && \
cp libterminal.so ~/.config/pragtical/plugins/terminal
```

If you want to install on Windows, but don't have MSYS, you can download
the files directly from our [release](https://github.com/adamharrison/lite-xl-terminal/releases/tag/latest)
the files directly from our [release](https://github.com/pragtical/terminal/releases/tag/latest)
page, download `libterminal.x86_64-windows.dll`, as well as the Source Code,
and place both the dll, and the `plugins/terminal/init.lua` from the source
code archive into your lite-xl plugins directory as `plugins/terminal/init.lua`
code archive into your pragtical plugins directory as `plugins/terminal/init.lua`
and `plugins/terminal/libterminal.x86_64-windows.dll`.

### Stanalone

If you want to use terminal as a standalone terminal, here's a handy script you can use:

```
LITE_SCALE=1 lpm run terminal --config 'config.plugins.treeview=false config.plugins.workspace=false config.always_show_tabs=false local _,_,x,y = system.get_window_size() system.set_window_size(800, 500, x, y) local TerminalView = require "plugins.terminal".class local old_close = TerminalView.close function TerminalView:close() old_close(self) os.exit(0) end core.add_thread(function() command.perform("terminal:open-tab") local node = core.root_view.root_node:get_node_for_view(core.status_view) node:close_view(core.root_view.root_node, core.status_view) end)'
PRAGTICAL_SCALE=1 ppm run terminal --config 'config.plugins.treeview=false config.plugins.workspace=false config.always_show_tabs=false local _,_,x,y = system.get_window_size() system.set_window_size(800, 500, x, y) local TerminalView = require "plugins.terminal".class local old_close = TerminalView.close function TerminalView:close() old_close(self) os.exit(0) end core.add_thread(function() command.perform("terminal:open-tab") local node = core.root_view.root_node:get_node_for_view(core.status_view) node:close_view(core.root_view.root_node, core.status_view) end)'
```

## Status
Expand All @@ -112,4 +112,3 @@ dependencies other than the native OS libraries for each OS.
```
CC=x86_64-w64-mingw32-gcc BIN=libterminal.dll ./build.sh -g
```

53 changes: 23 additions & 30 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
{
"addons" : [
{
"description" : "An integrated terminal for lite-xl.",
"files" : [
{
"arch" : "x86_64-linux",
"checksum" : "eafe4ea692d4dc8276e59d1028b94faf1a811298120941ba3dd5ba8b7eabfb68",
"url" : "https://github.com/adamharrison/lite-xl-terminal/releases/download/v1.01/libterminal.x86_64-linux.so"
},
{
"arch" : "x86_64-darwin",
"checksum" : "ef07c3c5de7516a20ea1f578f4cf8d52a5c30dd7f65e00ea4515d73ea645fe5e",
"url" : "https://github.com/adamharrison/lite-xl-terminal/releases/download/v1.01/libterminal.x86_64-darwin.so"
},
{
"arch" : "aarch64-darwin",
"checksum" : "237aaa401238dd02c9b5a161237934de739018b45effe08c8a040577932d50e3",
"url" : "https://github.com/adamharrison/lite-xl-terminal/releases/download/v1.01/libterminal.aarch64-darwin.so"
},
{
"arch" : "x86_64-windows",
"checksum" : "6a4c486e87a0f339ef93d890075b9666f6f61d634e8d7a620bfae8c290e6ae31",
"url" : "https://github.com/adamharrison/lite-xl-terminal/releases/download/v1.01/libterminal.x86_64-windows.dll"
}
],
"id" : "terminal",
"path" : "plugins/terminal",
"version" : "1.01"
}
]
"addons": [{
"id": "terminal",
"description": "An integrated terminal for pragtical.",
"version": "1.01",
"path": "plugins/terminal",
"files": [{
"url": "https://github.com/pragtical/terminal/releases/download/latest/libterminal.x86_64-linux.so",
"arch": "x86_64-linux",
"checksum": "SKIP"
}, {
"url": "https://github.com/pragtical/terminal/releases/download/latest/libterminal.x86_64-darwin.so",
"arch": "x86_64-darwin",
"checksum": "SKIP"
}, {
"url": "https://github.com/pragtical/terminal/releases/download/latest/libterminal.aarch64-darwin.so",
"arch": "aarch64-darwin",
"checksum": "SKIP"
}, {
"url": "https://github.com/pragtical/terminal/releases/download/latest/libterminal.x86_64-windows.dll",
"arch": "x86_64-windows",
"checksum": "SKIP"
}]
}]
}
Loading

0 comments on commit 615b248

Please sign in to comment.