Skip to content

Commit

Permalink
packaging;
Browse files Browse the repository at this point in the history
  • Loading branch information
RealChuan committed Aug 16, 2023
1 parent a8d4d45 commit 4930490
Show file tree
Hide file tree
Showing 25 changed files with 703 additions and 429 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ name: CMake Build
on:
push:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'picture'
- '**/picture/**'
- 'packaging/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
- 'Scripts'
pull_request:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'picture'
- '**/picture/**'
- 'packaging/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
- 'Scripts'

jobs:
build:
Expand All @@ -32,7 +32,7 @@ jobs:
qt_ver:
- 6.5.2
build_type:
- "Release"
- "RelWithDebInfo"
generators:
- "Ninja"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/qmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ name: QMake Build
on:
push:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'picture'
- '**/picture/**'
- 'packaging/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
- 'Scripts'
pull_request:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'picture'
- '**/picture/**'
- 'packaging/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
- 'Scripts'

jobs:
build:
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.21.1)

project(
Qt-Examples
VERSION 0.1
VERSION 0.0.1
LANGUAGES CXX)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

if(CMAKE_HOST_WIN32)
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.5.2\\msvc2019_64")
elseif(CMAKE_HOST_APPLE)

elseif(CMAKE_HOST_UNIX)
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.5.2/gcc_64")
endif()

set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
6 changes: 1 addition & 5 deletions Qt-Examples.pro
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,5 @@ SUBDIRS += ShowInMyComputer
}

DISTFILES += \
$$files(Scripts/windows/*.py)\
$$files(Scripts/windows/*.iss)\
$$files(Scripts/macos/*.py)\
$$files(Scripts/macos/*.json)\
LICENSE \
README.md
README*
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,12 @@

## [Validator](Validator/)——加强版IntValidator(QIntValidator)和DoubleValidator(QDoubleValidator)

## [Scripts](Scripts/)——打包脚本

1. [macos](Scripts/macos/)——macos 通用编译打dmg包脚本(`python`/`dmgbuild`);
2. [widnows](Scripts/windows)——windows 通用编译打包安装脚本(Innosetup);

## [packaging](packaging/)——打包脚本;
1. [macos](packaging/macos/)——macos qmake编译、打包dmg包脚本(`python`/`appdmg`);
2. [ubuntu](packaging/ubuntu/)——ubuntu qmake编译、打包AppImage/deb包脚本(`linuxdeployqt-continuous-x86_64.AppImage`/`dpkg-deb`);
3. [windows](packaging/windows/)——windows qmake编译、打包安装脚本(`Innosetup`);
1. `Innosetup` `signtool`

```
sha256="C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x86\\signtool.exe" sign /f C:\\work\\certificate\\xxxxx.pfx /p password /fd SHA256 /tr http://timestamp.digicert.com/scripts/timestamp.dll /td SHA256 $f
sha256="C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x86\\signtool.exe" sign /f C:\\certificate\\certificate.pfx /p password /fd SHA256 /tr http://timestamp.digicert.com/scripts/timestamp.dll /td SHA256 $f
```
97 changes: 0 additions & 97 deletions Scripts/macos/build.py

This file was deleted.

80 changes: 0 additions & 80 deletions Scripts/macos/package.py

This file was deleted.

Loading

0 comments on commit 4930490

Please sign in to comment.