Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

使用CPack打rpm和deb的包 #455

Open
wants to merge 4 commits into
base: 2.5.0-beta
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@ endif(APPLE)

set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(CPACK_PACKAGE_VERSION "${WIZNOTE_VERSION}")
set(CPACK_GENERATOR "RPM;DEB")
set(CPACK_PACKAGE_NAME "wiznote")
set(CPACK_PACKAGE_CONTACT "[email protected]")
set(CPACK_PACKAGE_RELEASE 1)
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "WizNote is a cross platform cloud based note-taking application.")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
set(CPACK_RPM_PACKAGE_GROUP "Application")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")

include(CPack)

# rpath resolve.
#set(CMAKE_BUILD_WITH_INSTALL_RPATH YES) // would cause wheelEvent problem on centos/fedora when compiled with qt5
if(APPLE)
Expand Down
80 changes: 0 additions & 80 deletions build/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion build/debian/compat

This file was deleted.

22 changes: 0 additions & 22 deletions build/debian/control

This file was deleted.

23 changes: 0 additions & 23 deletions build/debian/copyright

This file was deleted.

1 change: 0 additions & 1 deletion build/debian/docs

This file was deleted.

2 changes: 0 additions & 2 deletions build/debian/menu

This file was deleted.

13 changes: 0 additions & 13 deletions build/debian/rules

This file was deleted.

1 change: 0 additions & 1 deletion build/debian/source/format

This file was deleted.

48 changes: 0 additions & 48 deletions build/rpm/wiznote.spec

This file was deleted.

8 changes: 6 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
project(WizNote)

set(WIZNOTE_VERSION 2.5.0)

configure_file(WizDef.h.in WizDef.h)

add_subdirectory(test)

set(wiznote_SOURCES_MAC
Expand Down Expand Up @@ -77,7 +81,7 @@ set(wiznote_SOURCES
share/WizEnc.cpp
share/WizZiwReader.cpp
html/WizHtmlReader.cpp
html/WizHtmlCollector.cpp
html/WizHtmlCollector.cpp
share/WizSearch.cpp
widgets/WizScrollBar.cpp
sync/WizToken.cpp
Expand Down Expand Up @@ -186,7 +190,7 @@ set(wiznote_SOURCES
WizMobileFileReceiver.cpp
WizWebEngineInjectObject.cpp

WizOEMSettings.cpp
WizOEMSettings.cpp
mac/WizSearchWidget_mm.cpp
core/WizAccountManager.cpp
core/WizCommentManager.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/WizDef.h → src/WizDef.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <QtGlobal>

#define WIZ_CLIENT_VERSION "2.5.0"
#define WIZ_CLIENT_VERSION "@WIZNOTE_VERSION@"
#define WIZNOTE_FTS_VERSION "5"
#define WIZNOTE_THUMB_VERSION "3"
#define WIZ_NEW_FEATURE_GUIDE_VERSION "4"
Expand Down