Skip to content

Commit

Permalink
chroe: fix .iss build setup.exe
Browse files Browse the repository at this point in the history
  • Loading branch information
XMuli committed Aug 13, 2023
1 parent 120f048 commit 0c2a88f
Show file tree
Hide file tree
Showing 16 changed files with 311 additions and 46 deletions.
92 changes: 92 additions & 0 deletions setup-user-x86.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#pragma parseroption -p
#define MyAppName "FLIPPED"
#define MyAppVersion "MSVC-1.3.0-Beta"
#define MyAppPublisher "XMuli"
#define MyAppURL "https://github.com/XMuli/FILPPED"
#define MyAppExeName "FLIPPED.exe"
#define MyArchitecture "x86"
#define MySrc "."
#define MyBinDir "./bin"
#define MyOutputDir "../Archived/FLIPPED"



[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{C0377FB3-45CC-4FFF-A912-91C1B2BAD52F}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DefaultGroupName={#MyAppName}
;DisableProgramGroupPage=yes
LicenseFile={#MyBinDir}\resources\licenses\License.md
;InfoBeforeFile={#MyBinDir}\resources\licenses\PrivacyAndDataProtection.md
;InfoAfterFile={#MyBinDir}\resources\licenses\other.md

; Uncomment the following line to run in non-administrative install mode (install for current user only.)
; PrivilegesRequiredOverridesAllowed 的两个参数,dialog 可选安装路径; commandline 不可选路径
PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=commandline
OutputDir={#MyOutputDir}
OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyArchitecture}
SetupIconFile={#MyBinDir}\resources\logo\logo.ico
Password=
Compression=lzma
SolidCompression=yes
WizardStyle=modern

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl"
Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
Name: "chinesetraditional"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Files]
Source: "{#MyBinDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyBinDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent


43 changes: 13 additions & 30 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ set(SRC_PLUGIN_INTERFACE
pluginsinterface/iplugininterface.cpp)

set(SRC_RESOURCES
Resources.qrc
logo.rc)
resources.qrc
resources/logo/resources.rc)

set(src_root_path ${CMAKE_CURRENT_SOURCE_DIR}) # default root path curr path (CMakeList.txt)
file(GLOB_RECURSE source_lists LIST_DIRECTORIES false
Expand Down Expand Up @@ -217,21 +217,20 @@ message("CMAKE_BINARY_DIR:" ${CMAKE_BINARY_DIR})

#***************************************************拷贝资源文件到 bin 下**********************************************
# 拷贝配置文件
file(GLOB all_config_files "resources/config/*")
file(GLOB all_config_files "src/resources/config/*")
file(COPY ${all_config_files} DESTINATION "${CMAKE_BINARY_DIR}/config")
#configure_file(xconfig.ini ${exe_dir}/xconfig.ini COPYONLY)

## copy "resources" 文件夹下的指定文件夹
#set(folders_to_copy "changelog" "licenses" "logo" "prompt")
#set(source_root "${CMAKE_SOURCE_DIR}/resources")
#set(traget_root "${CMAKE_BINARY_DIR}/resources")
# copy "resources" 文件夹下的指定文件夹
set(folders_to_copy "logo" "licenses" "changelog")
set(source_root "${CMAKE_SOURCE_DIR}/src/resources")
set(traget_root "${CMAKE_BINARY_DIR}/resources")

## 遍历复制文件夹集合中的每个文件夹
#foreach(it ${folders_to_copy})
# set(copy_source_dir "${source_root}/${it}")
## set(copy_traget_dir "${traget_root}/${it}")
# file(COPY ${copy_source_dir} DESTINATION ${traget_root})
#endforeach()
# 遍历复制文件夹集合中的每个文件夹
foreach(it ${folders_to_copy})
set(copy_source_dir "${source_root}/${it}")
# set(copy_traget_dir "${traget_root}/${it}")
file(COPY ${copy_source_dir} DESTINATION ${traget_root})
endforeach()

#************************************************* .ts 生成 .qm***************************************************
# 创建保存 ts 的文件夹,和依据里面的 *.ts 文件,生成 .qm 放入最终文件中
Expand Down Expand Up @@ -377,9 +376,6 @@ endif()


if(APPLE)
# file(COPY "/usr/local/Cellar/openssl@3/3.1.1/lib/libcrypto.3.dylib" DESTINATION "${EXECUTABLE_OUTPUT_PATH}")
# file(COPY "/usr/local/Cellar/openssl@3/3.1.1/lib/libssl.3.dylib" DESTINATION "${exe_output_dir}")

set(windeployqt "${env_qt_dir}/bin/macdeployqt")
add_custom_command(TARGET ${project_name} POST_BUILD
COMMAND "${windeployqt} ${EXECUTABLE_OUTPUT_PATH}/${project_name}.app" -verbose=1
Expand All @@ -392,19 +388,6 @@ if(APPLE)
elseif(UNIX)

elseif(WIN32)
# if(${build_x64bit})
# set(ssl_dir "C:/Qt/Tools/OpenSSL/Win_x64/")
# set(ssl_file "libssl-1_1-x64.dll" "libcrypto-1_1-x64.dll")
# else()
# set(ssl_dir "C:/Qt/Tools/OpenSSL/Win_x86/")
# set(ssl_file "libssl-1_1.dll" "libcrypto-1_1.dll")
# endif()

# foreach(it ${ssl_file})
# file(COPY "${ssl_dir}/bin/${it}" DESTINATION "${EXECUTABLE_OUTPUT_PATH}")
# message("--->it:" "${ssl_dir}/bin/${it}")
# endforeach()

set(windeployqt "${env_qt_dir}/bin/windeployqt.exe")
add_custom_command(TARGET ${project_name} POST_BUILD
COMMAND "${windeployqt}" "${EXECUTABLE_OUTPUT_PATH}/${project_name}.exe" --no-translations
Expand Down
6 changes: 4 additions & 2 deletions src/Resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
<file>resources/tool_para/text/outline.svg</file>
<file>resources/tool/custompath.svg</file>
<file>resources/border_style/light_blue/boardPoint.svg</file>
<file>resources/Logo.png</file>
<file>resources/Logo.svg</file>
<file>resources/logo/logo.ico</file>
<file>resources/logo/logo.png</file>
<file>resources/logo/logo.svg</file>
<file>resources/logo/resources.rc</file>
</qresource>
</RCC>
1 change: 0 additions & 1 deletion src/logo.rc

This file was deleted.

2 changes: 0 additions & 2 deletions src/preference/prefmanage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ void PrefManage::initUIHotkeys()

void PrefManage::initUIAbout()
{
// ui->labLogo->setPixmap(QIcon(":/resources/Logo.png").pixmap(QSize(200, 200)));

QString bit;
if (_BIT_ARCH == 4) bit = "x86";
else if (_BIT_ARCH == 8) bit = "x64";
Expand Down
4 changes: 2 additions & 2 deletions src/preference/prefmanage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../Resources.qrc">:/resources/Logo.png</pixmap>
<pixmap resource="../resources.qrc">:/resources/logo/logo.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
Expand Down Expand Up @@ -1346,7 +1346,7 @@
</layout>
</widget>
<resources>
<include location="../Resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections/>
</ui>
120 changes: 120 additions & 0 deletions src/resources/changelog/changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
FLIPPED (1.3.0) UNRELEASED; urgency=medium

* Refactor the entire UI, and CMakelist.

flipped (1.2.3) UNRELEASED; urgency=medium

* fix build Linux and MacOS
* UI refactor

-- XMuli <xmuli@xmuli-pc> Sun, 23 Arpil 2023 22:08:13 +0800

flipped (1.1.0) UNRELEASED; urgency=medium

* 重构整个程序和 .ini 交互的逻辑架构,也使用了很多宏;代码清爽了很多
* 功能:Quick save
* 功能:Auto save
* 功能:快捷键冲突检测、系统消息通知

-- XMuli <xmuli@xmuli-pc> Sta, 16 Arpil 2023 19:20:13 +0800

flipped (1.0.1) UNRELEASED; urgency=medium

* 添加开机自启动[Windows]

-- XMuli <xmuli@xmuli-pc> Sta, 1 Arpil 2023 18:20:13 +0800

flipped (1.0.0) UNRELEASED; urgency=medium

* 修复诸多缺陷、屏蔽尚未开发好的部分代码
* 一个较大部分的代码重构、部分架构重新设计
* 整理项目代码规范、添加对应 README 和介绍视频等

-- XMuli <xmuli@xmuli-pc> Mon, 31 Oct 2022 19:52:18 +0800

picshot (0.4.1) UNRELEASED; urgency=medium

picshot (0.4.7) UNRELEASED; urgency=medium

* 重新实现绘画 toolbar 的透明磨砂在跨平台上面实现的效果
* 修复跨平台(MacOS) 下的编译失败失败,低版本 10.15+、12.0+ 都支持
* 完整支持国际化:暂为 English、简体中文、繁体中文

-- XMuli <xmuli@xmuli-pc> Mon, 31 Oct 2022 19:52:18 +0800

picshot (0.4.1) UNRELEASED; urgency=medium

* 修复 MacOS 下的构建 dmg 包 CI

-- XMuli <[email protected]> Sat, 01 Oct 2022 14:17:01 +0800

picshot (0.4) UNRELEASED; urgency=medium

* 优化 CMake 构建,创建 Linux 下的 install 命令

-- XMuli <[email protected]> Fri, 26 Aug 2022 21:23:01 +0800


picshot (0.3.2) UNRELEASED; urgency=medium

* 修复 Linux 构建 *.deb 失败
* 构建包名使用小写

-- XMuli <[email protected]> Mon, 15 Aug 2022 23:13:29 +0800

picshot (0.3.1) UNRELEASED; urgency=medium

* 修复 Linux 和 MacOS 编译失败
* 修复 MacOS 显示图片区域不正常
* Ubuntu apt 安装 qt 最大 5.12.8,故control 切换回 5.12.0

-- xmuli <xmuli@xmuli-virtual-machine> Mon, 15 Aug 2022 00:33:46 +0800

picshot (0.3-1) unstable; urgency=medium

* 添加贴图功能
* 添加十字线功能
* 添加高亮活动色的支持
* 偏好界面的槽函数实现
* Qt 升级 5.12.11 --> 5.15.2
* 添加国际化支持
* 优化的 1080 和 4K 屏幕下各自的控件大小,优化 UI 显示
* 优化 CMake 的书写
* 优化冗余和注释代码

-- XMuli <[email protected]> Thu, 04 Aug 2022 23:53:03 +0800

picshot (0.2-1) unstable; urgency=medium

* 采用全新 UI 设计:截图工具栏和偏好设置界面
* 优化内存,且彻底重构掉旧的架构逻辑(两周重构了半年的代码,好累啊)
* CMake 进步了,采用树形目录结构在 Visual Studio 中展示,便于开发

-- XMuli <[email protected]> Mon, 04 Jul 2022 23:01:03 +0800


picshot (0.1.4-1) unstable; urgency=medium

* 支持智能选中窗口(Linux)
* 绘画工具栏的位置自动改变
* 添加插件机制(水印)

-- XMuli <[email protected]> Sun, 05 Jun 2022 16:50:38 +0800


picshot (0.1.3-1) unstable; urgency=medium

* 支持选中绘画图形后拖曳后移动位置
* 支持智能选中窗口(windows)
* 绘画由“相对坐标”切换为“绝对坐标”
* 优化存储绘画图像的堆栈
* 添加 PKGBUILD 为 Arch 构建脚本

-- XMuli <[email protected]> Thur, 07 Apr 2022 21:24:38 +0800


picshot (0.1.2-1) unstable; urgency=medium

* try build .deb on Linux(ubuntu 20.04)

-- XMuli <[email protected]> Sun, 27 Mar 2022 16:16:38 +0800
Loading

0 comments on commit 0c2a88f

Please sign in to comment.