From d0b44c9f963d982903867d00f5d221b15e9505bf Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 30 Nov 2020 20:09:33 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6e81bfa..83d85b9 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,15 @@ # SchildiChat-Desktop -SchildiChat-Desktop is a fork of [Element-Web](https://github.com/vector-im/element-web)/[-Desktop](https://github.com/vector-im/element-desktop). +SchildiChat-Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). The most important changes of SchildiChat-Desktop compared to Element are: - - A unifed chat list for both direct and group chats - Message bubbles - Bigger items in the room list - -While SchildiChat-Desktop should be already usable as is, it's still better seen as a -proof-of-concept rather than a finished product, as there are still a few UX bugs -remaining, and no ways to configure Schildi's features. -Furthermore, I don't know how much more work I'm going to put into this, but -if anybody wants to help improving it, contributions are welcome! +- … and more! Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases
-Hosted web variant: https://schildiweb.spiritcroc.de/ +Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/) Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org). From d3c91d680b0c1c13f00aab5cd8af487b82e4155a Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 12 Dec 2020 10:46:38 +0100 Subject: [PATCH 2/5] web-release: explicit versioning, name from element-web/package.json --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index fd69624..211b0e1 100644 --- a/Makefile +++ b/Makefile @@ -9,18 +9,18 @@ all: release YARN ?= yarnpkg VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') -APP_NAME := $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') +WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') +DESKTOP_APP_NAME := $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') PRODUCT_NAME := $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') WEB_OUT := element-web/dist -WEB_OUT_DIST_VERSION := web -OUT_WEB := $(WEB_OUT)/riot-$(WEB_OUT_DIST_VERSION).tar.gz -OUT_WEB_BETTER_NAME := schildichat-web-$(VERSION).tar.gz +WEB_OUT_DIST_VERSION := $(VERSION) +OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz DESKTOP_OUT := element-desktop/dist -OUT_DEB64 := $(DESKTOP_OUT)/$(APP_NAME)_$(VERSION)_amd64.deb -OUT_PAC64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).pacman -OUT_TARXZ64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).tar.xz +OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb +OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman +OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe @@ -65,7 +65,7 @@ windows-portable: desktop-common web-release: web mkdir -p $(CURRENT_RELEASE_DIR) - cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)/$(OUT_WEB_BETTER_NAME) + cp $(OUT_WEB) $(CURRENT_RELEASE_DIR) debian-release: debian mkdir -p $(CURRENT_RELEASE_DIR) From 3b93d5e2c649e742568817e9e17dd2e477379fa2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 12 Dec 2020 18:45:51 +0100 Subject: [PATCH 3/5] Update readme Close #24 --- README.md | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 83d85b9..646ba44 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# SchildiChat-Desktop +# SchildiChat Web/Desktop -SchildiChat-Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). +SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). -The most important changes of SchildiChat-Desktop compared to Element are: +The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are: - A unifed chat list for both direct and group chats - Message bubbles - Bigger items in the room list - … and more! -Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases
+Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop) Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/) Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org). @@ -16,16 +16,16 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we -# Building SchildiChat-Desktop +## Building SchildiChat Web/Desktop -This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop. +This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk in order to build SchildiChat Web **and** Desktop. -## Debian compilation dependencies +### Debian build dependencies -Since Debian is usually slow to update packages on its stable releases, some dependencies -might not be recent enough to building Schildi. -Here are the dependencies which I had to install for compilation on Debian 10: +Since Debian is usually slow to update packages on its stable releases, +some dependencies might not be recent enough to build SchildiChat. +The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10: ``` # apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar @@ -43,7 +43,7 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc $ source .bashrc ``` -## Initial setup +### Initial setup ``` git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git @@ -51,10 +51,35 @@ cd schildichat-desktop make setup # optional step if using the other make targets ``` -## Build +### Create release builds -`make [{web|debian|pacman|windows}-release]` +Those are the builds distributed via GitHub releases. -## Install +``` +# The single make targets are explained below +make [{web|debian|windows-setup|windows-portable}-release] +``` -Installable packages should appear in release/. +After that these packages which belong to to their respective make target should appear in release/\/: +- `web`: _schildichat-web-\.tar.gz_: archive that can be unpacked and served by a **web** server (copy `config.sample.json` to `config.json` and adjust the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) to your likings) +- `debian`: file ready for installation on a **Debian Linux** (based) system via `dpkg -i schildichat-desktop__amd64.deb` +- `windows-setup`: _SchildiChat_Setup_v\.exe_: file ready for **installation** on a **Windows** system +- `windows-portable`: _SchildiChat_win-portable_v\.zip_: **portable** version for a **Windows** system – take SchildiChat together with your login data around with you (the archive contains a readme with **instructions** and **notes**) + +#### Additional make targets not used for GitHub releases +- `pacman`: file ready for installation on an **Arch Linux** (based) system via `pacman -U schildichat-desktop-.pacman` +- `windows-unpacked`: _SchildiChat_win-unpacked_v\.zip_: **unpacked** archive for a **Windows** system + +### Build SchildiChat Web and deploy it directly to your web server + +Put the `config.json` with the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) you want for your hosted instance in a subfolder of the `configs` folder. +Then create a file named `release.mk` and and fill it similar to that: +``` +.PHONY: your-deploy-web + +YOUR_CFGDIR := configs/your_subfolder +your-deploy-%: CFGDIR := $(YOUR_CFGDIR) + +your-deploy-web: web + rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/ +``` From 9896d3718d591c88c21b8ce387b955b43d2673f2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Dec 2020 14:47:08 +0100 Subject: [PATCH 4/5] Add target to build AppImage --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 211b0e1..a3ddbc1 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz DESKTOP_OUT := element-desktop/dist OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman +OUT_APPIMAGE64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).AppImage OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe @@ -57,6 +58,9 @@ debian: desktop-common pacman: desktop-common $(YARN) --cwd element-desktop run build64pacman +appimage: desktop-common + $(YARN) --cwd element-desktop run build64appimage + windows: desktop-common $(YARN) --cwd element-desktop run build64windows @@ -75,6 +79,10 @@ pacman-release: pacman mkdir -p $(CURRENT_RELEASE_DIR) cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR) +appimage-release: appimage + mkdir -p $(CURRENT_RELEASE_DIR) + cp $(OUT_APPIMAGE64) $(CURRENT_RELEASE_DIR) + windows-setup-release: windows mkdir -p $(CURRENT_RELEASE_DIR) cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME) From f0b142e996e9e18bf618c701f2c848b15778b2b4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Dec 2020 23:09:30 +0100 Subject: [PATCH 5/5] New release v1.7.15 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 937f8a8..9771a09 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 937f8a8c8682d47dc834619be4dd29956dca447a +Subproject commit 9771a095665629c52c076bc8b38171eeabdbf3b0 diff --git a/element-web b/element-web index 9eeb0af..a73a02f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9eeb0af50abbb52345103f429b2e16c96a5ffb18 +Subproject commit a73a02fad1c04157e5e6c679e6947e65dc36fa69 diff --git a/matrix-js-sdk b/matrix-js-sdk index 79a5b44..02859bc 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 79a5b44eb508074511c661eb3d92b3d6a26b0f33 +Subproject commit 02859bc8f06acc06d95a5e68a275e47e85361784 diff --git a/matrix-react-sdk b/matrix-react-sdk index 2a308ab..925dd11 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2a308ab739bfe4b7b272db403bb500fd93db84ea +Subproject commit 925dd11e874142da1894bfcf75ced55052c6f0b9