Skip to content

Commit 19a0dda

Browse files
authored
Merge pull request #235 from game1024/release/v1.7
rename Speedy to OpenSpeedy
2 parents 1c5ef01 + 90faf8b commit 19a0dda

File tree

7 files changed

+254
-32
lines changed

7 files changed

+254
-32
lines changed

.github/workflows/package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
artifact_name:
1515
description: '签名的制品名称'
1616
required: true
17-
default: 'Speedy-unsigned-artifacts'
17+
default: 'OpenSpeedy-unsigned-artifacts'
1818
type: string
1919

2020
jobs:
@@ -77,14 +77,14 @@ jobs:
7777
run: |
7878
cd installer
7979
candle.exe OpenSpeedy.wxs -dVersion="${{ github.event.inputs.version }}" -ext WixUIExtension
80-
light.exe OpenSpeedy.wixobj -out ../OpenSpeedy-installer-${{ github.event.inputs.version }}.msi -ext WixUIExtension -sice:ICE91
80+
light.exe OpenSpeedy.wixobj -out ../OpenSpeedy-installer-${{ github.event.inputs.version }}.msi -ext WixUIExtension
8181
8282
- id: upload-unsigned-installer
8383
name: Upload installer
8484
uses: actions/upload-artifact@v4
8585
with:
86-
name: OpenSpeedy-unsigned-installer-${{ github.event.inputs.version }}
87-
path: OpenSpeedy-installer-${{ github.event.inputs.version }}.msi
86+
name: Speedy-unsigned-installer-${{ github.event.inputs.version }}
87+
path: Speedy-installer-${{ github.event.inputs.version }}.msi
8888

8989
- name: SignPath signing
9090
uses: signpath/github-action-submit-signing-request@v1.1
@@ -103,6 +103,6 @@ jobs:
103103
- name: Upload signed installer
104104
uses: actions/upload-artifact@v4
105105
with:
106-
name: OpenSpeedy-installer-${{ github.event.inputs.version }}
106+
name: Speedy-installer-${{ github.event.inputs.version }}
107107
path: signed-installer/
108108
retention-days: 30

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
project(Speedy VERSION 1.7.7 LANGUAGES CXX)
3+
project(OpenSpeedy VERSION 1.7.7 LANGUAGES CXX)
44

55

66
set(CMAKE_AUTOUIC ON)
@@ -32,7 +32,7 @@ set(PROJECT_SOURCES
3232
)
3333

3434
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
35-
qt_add_executable(Speedy
35+
qt_add_executable(OpenSpeedy
3636

3737
MANUAL_FINALIZATION
3838
${PROJECT_SOURCES}
@@ -44,7 +44,7 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
4444
)
4545

4646
# Define target properties for Android with Qt 6 as:
47-
# set_property(TARGET Speedy APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
47+
# set_property(TARGET OpenSpeedy APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
4848

4949
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
5050
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
@@ -56,7 +56,7 @@ else()
5656
${TS_FILES})
5757

5858
add_definitions("-DUNICODE -DNOMINMAX")
59-
add_executable(Speedy
59+
add_executable(OpenSpeedy
6060

6161
${PROJECT_SOURCES}
6262
processmonitor.h processmonitor.cpp
@@ -96,7 +96,7 @@ endif()
9696

9797

9898

99-
target_link_libraries(Speedy PRIVATE
99+
target_link_libraries(OpenSpeedy PRIVATE
100100

101101
Qt${QT_VERSION_MAJOR}::Widgets
102102
Qt${QT_VERSION_MAJOR}::Network
@@ -108,9 +108,9 @@ target_link_libraries(Speedy PRIVATE
108108
# If you are developing for iOS or macOS you should consider setting an
109109
# explicit, fixed bundle identifier manually though.
110110
if(${QT_VERSION} VERSION_LESS 6.1.0)
111-
set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.Speedy)
111+
set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.OpenSpeedy)
112112
endif()
113-
set_target_properties(Speedy PROPERTIES
113+
set_target_properties(OpenSpeedy PROPERTIES
114114

115115
${BUNDLE_ID_OPTION}
116116
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
@@ -121,15 +121,15 @@ set_target_properties(Speedy PROPERTIES
121121
)
122122

123123
include(GNUInstallDirs)
124-
install(TARGETS Speedy
124+
install(TARGETS OpenSpeedy
125125

126126
BUNDLE DESTINATION .
127127
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
128128
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
129129
)
130130

131131
if(QT_VERSION_MAJOR EQUAL 6)
132-
qt_finalize_executable(Speedy)
132+
qt_finalize_executable(OpenSpeedy)
133133

134134
endif()
135135

0 commit comments

Comments
 (0)