wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-22 22:42:48 +03:00
Code Issues Projects Releases Wiki Activity

wezterm: fixup packaging for wezterm-gui split

Browse Source 
refs: #301
This commit is contained in:
Wez Furlong 2020-10-24 16:54:36 -07:00
parent 442c9a26d1
commit 2ec12b5426
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/macos/WezTerm.app/Contents/Info.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>wezterm</string>
<string>wezterm-gui</string>
<key>CFBundleIdentifier</key>
<string>com.github.wez.wezterm</string>
<key>CFBundleInfoDictionaryVersion</key>

5
ci/deploy.sh
View File

@ -22,6 +22,7 @@ case $OSTYPE in
cp -r assets/macos/WezTerm.app $zipdir/
cp $TARGET_DIR/release/wezterm $zipdir/WezTerm.app
cp $TARGET_DIR/release/wezterm-mux-server $zipdir/WezTerm.app
cp $TARGET_DIR/release/wezterm-gui $zipdir/WezTerm.app
cp $TARGET_DIR/release/strip-ansi-escapes $zipdir/WezTerm.app
zip -r $zipname $zipdir
@ -43,6 +44,7 @@ case $OSTYPE in
mkdir $zipdir
cp $TARGET_DIR/release/wezterm.exe \
$TARGET_DIR/release/wezterm-mux-server.exe \
$TARGET_DIR/release/wezterm-gui.exe \
$TARGET_DIR/release/strip-ansi-escapes.exe \
$TARGET_DIR/release/wezterm.pdb \
assets/windows/conhost/conpty.dll \
@ -84,6 +86,7 @@ cd ${HERE}
mkdir -p %{buildroot}/usr/bin
install -Dsm755 target/release/wezterm -t %{buildroot}/usr/bin
install -Dsm755 target/release/wezterm-mux-server -t %{buildroot}/usr/bin
install -Dsm755 target/release/gui -t %{buildroot}/usr/bin
install -Dsm755 target/release/strip-ansi-escapes -t %{buildroot}/usr/bin
install -Dm644 assets/icon/terminal.png %{buildroot}/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
install -Dm644 assets/wezterm.desktop %{buildroot}/usr/share/applications/org.wezfurlong.wezterm.desktop
@ -91,6 +94,7 @@ install -Dm644 assets/wezterm.appdata.xml %{buildroot}/usr/share/metainfo/org.we
%files
/usr/bin/wezterm
/usr/bin/wezterm-gui
/usr/bin/wezterm-mux-server
/usr/bin/strip-ansi-escapes
/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
@ -119,6 +123,7 @@ Description: Wez's Terminal Emulator.
Depends: libc6, libegl-mesa0, libxcb-icccm4, libxcb-ewmh2, libxcb-keysyms1, libxcb-xkb1, libxkbcommon0, libxkbcommon-x11-0, libfontconfig1, xdg-utils, libxcb-render0, libxcb-shape0, libx11-6, libegl1
EOF
install -Dsm755 -t pkg/debian/usr/bin target/release/wezterm-mux-server
install -Dsm755 -t pkg/debian/usr/bin target/release/wezterm-gui
install -Dsm755 -t pkg/debian/usr/bin target/release/wezterm
install -Dsm755 -t pkg/debian/usr/bin target/release/strip-ansi-escapes
install -Dm644 assets/icon/terminal.png pkg/debian/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png

1
ci/wezterm-homebrew-macos.rb.template
View File

@ -13,6 +13,7 @@ class Wezterm < Formula
def install
prefix.install "WezTerm.app"
bin.write_exec_script "#{prefix}/WezTerm.app/wezterm"
bin.write_exec_script "#{prefix}/WezTerm.app/wezterm-gui"
bin.write_exec_script "#{prefix}/WezTerm.app/strip-ansi-escapes"
end
end

9
wezterm/src/main.rs
View File

@ -295,15 +295,6 @@ fn run() -> anyhow::Result<()> {
}
let config = config::configuration();
#[cfg(target_os = "macos")]
{
window::os::macos::use_ime(config.use_ime);
}
#[cfg(windows)]
{
window::os::windows::use_dead_keys(config.use_dead_keys);
}
match opts
.cmd
.as_ref()