From a56e13bef80f81e4b3c151c74a551e57358dcb1e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 09:44:34 +0800 Subject: [PATCH] update 2023-06-03 09:44:34 --- gn/Makefile | 61 ------------------------------- gn/patches/010-gcc.patch | 11 ------ gn/src/out/last_commit_position.h | 9 ----- luci-app-serverchan/README.md | 16 ++++---- luci-app-serverchan/README_en.md | 12 +++--- 5 files changed, 16 insertions(+), 93 deletions(-) delete mode 100644 gn/Makefile delete mode 100644 gn/patches/010-gcc.patch delete mode 100644 gn/src/out/last_commit_position.h diff --git a/gn/Makefile b/gn/Makefile deleted file mode 100644 index fccd226fd..000000000 --- a/gn/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2022 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gn -PKG_RELEASE:=4 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2023-04-05 -PKG_SOURCE_VERSION:=28b7b6c507eb808567e3aea446cd259f7691fddc -PKG_MIRROR_HASH:=skip - -PKG_LICENSE:=BSD 3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen - -ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),) -PKG_BUILD_DEPENDS+= ninja/host -endif -PKG_HOST_ONLY:=1 -HOST_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk - -define Package/gn - SECTION:=devel - CATEGORY:=Development - TITLE:=A meta-build system that generates build files for Ninja - URL:=https://gn.googlesource.com/gn/ - BUILDONLY:=1 -endef - -define Package/gn/description - GN can generate Ninja build files for C, C++, Rust, Objective C, - and Swift source on most popular platforms. -endef - -define Host/Configure - $(PYTHON) $(HOST_BUILD_DIR)/build/gen.py \ - --no-last-commit-position -endef - -define Host/Compile - ninja -C $(HOST_BUILD_DIR)/out -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/out/gn $(STAGING_DIR_HOSTPKG)/bin/ -endef - -define Host/Clean - $(RM) $(STAGING_DIR_HOSTPKG)/bin/gn -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,gn)) diff --git a/gn/patches/010-gcc.patch b/gn/patches/010-gcc.patch deleted file mode 100644 index d6078b8c0..000000000 --- a/gn/patches/010-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/gen.py -+++ b/build/gen.py -@@ -368,7 +368,7 @@ def WriteGNNinja(path, platform, host, o - cxx = os.environ.get('CXX', 'g++') - ld = os.environ.get('LD', 'g++') - ar = os.environ.get('AR', 'ar -X64') -- elif platform.is_msys() or platform.is_mingw(): -+ elif platform.is_msys() or platform.is_mingw() or platform.is_linux(): - cxx = os.environ.get('CXX', 'g++') - ld = os.environ.get('LD', 'g++') - ar = os.environ.get('AR', 'ar') diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h deleted file mode 100644 index 28b7516ee..000000000 --- a/gn/src/out/last_commit_position.h +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by build/gen.py. - -#ifndef OUT_LAST_COMMIT_POSITION_H_ -#define OUT_LAST_COMMIT_POSITION_H_ - -#define LAST_COMMIT_POSITION_NUM 2085 -#define LAST_COMMIT_POSITION "2085 (28b7b6c507eb)" - -#endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/luci-app-serverchan/README.md b/luci-app-serverchan/README.md index ef5ce6cbc..2df1a2d57 100644 --- a/luci-app-serverchan/README.md +++ b/luci-app-serverchan/README.md @@ -9,11 +9,13 @@ 推送服务支持列表： -- [x] 微信：Server酱 https://sct.ftqq.com/ -- [x] 微信：推送加 http://www.pushplus.plus/ -- [x] 微信： WxPusher https://wxpusher.zjiecode.com/docs -- [x] 企业微信：应用推送 https://work.weixin.qq.com/api/doc/90000/90135/90248 -- [x] Telegram：bot https://t.me/BotFather +| 推送应用 | 方式 | 接口说明 | +| :-------- | :----- | :----- | +| 微信 | Server酱 | https://sct.ftqq.com/ +| 微信 | 推送加 | http://www.pushplus.plus/ +| 微信 | WxPusher | https://wxpusher.zjiecode.com/docs +| 企业微信 | 应用推送 | https://work.weixin.qq.com/api/doc/90000/90135/90248 +| Telegram | bot | https://t.me/BotFather 精力有限，如需要钉钉推送、飞书推送、Bark 推送等请尝试另一个分支 https://github.com/zzsj0928/luci-app-pushbot ，或使用自定义 API 设置 @@ -71,8 +73,8 @@ ## 下载 -| 支持的 OpenWrt 版本 | 下载地址 | -| :-------- | :----- | +| 支持的 OpenWrt 版本 | 下载地址 | +| :-------- | :----- | | openwrt-19.07.0 ... latest | [![Lastest Release](https://img.shields.io/github/release/tty228/luci-app-wechatpush.svg?style=flat)](https://github.com/tty228/luci-app-wechatpush/releases) | openwrt-18.06 | [![Release v2.06.2](https://img.shields.io/badge/release-v2.06.2-lightgrey.svg)](https://github.com/tty228/luci-app-wechatpush/releases/tag/v2.06.2) diff --git a/luci-app-serverchan/README_en.md b/luci-app-serverchan/README_en.md index d5c92707e..a67afb590 100644 --- a/luci-app-serverchan/README_en.md +++ b/luci-app-serverchan/README_en.md @@ -7,11 +7,13 @@ A plugin for OpenWRT routers to push various information to a mobile phone via WeChat or Telegram. Supported services: -- [x] WeChat: Server Chan https://sct.ftqq.com/ -- [x] WeChat for Enterprise: Application Push https://work.weixin.qq.com/api/doc/90000/90135/90248 -- [x] WeChat: WxPusher https://wxpusher.zjiecode.com/docs -- [x] WeChat: PushPlus http://www.pushplus.plus/ -- [x] Telegram bot https://t.me/BotFather +| Push application | Method | description | +| :-------- | :----- | :----- | +| WeChat | Server Chan | https://sct.ftqq.com/ +| WeChat | PushPlus | http://www.pushplus.plus/ +| WeChat | WxPusher | https://wxpusher.zjiecode.com/docs +| WeChat for Enterprise | Application Push | https://work.weixin.qq.com/api/doc/90000/90135/90248 +| Telegram | bot | https://t.me/BotFather Limited resources are available. If you need services such as DingTalk push, Feishu push, Bark push, etc., please try another branch at https://github.com/zzsj0928/luci-app-pushbot, or use custom API settings.