diff --git a/.syncexclude b/.syncexclude index 88e5e20f..8f9fa9fd 100644 --- a/.syncexclude +++ b/.syncexclude @@ -7,7 +7,5 @@ # * .obs # * .github # are always ignored -linglong.yaml -conanfile.py VERSION CHANGELOG.md diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index c1a33e27..00000000 --- a/conanfile.py +++ /dev/null @@ -1,91 +0,0 @@ -# SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. -# -# SPDX-License-Identifier: LGPL-3.0-or-later - -from conans import ConanFile, tools - - -class DtkcoreConan(ConanFile): - name = 'dtkcore' - version = '2.0.9' - license = 'GPL' - author = 'Iceyer me@iceyer.net' - url = 'https://github.com/linuxdeepin/dtkcore' - description = 'cross platform ui library' - topics = ('qt', 'dtk') - settings = 'os', 'compiler', 'build_type', 'arch' - options = {'shared': [True, False]} - default_options = 'shared=False' - generators = 'qmake' - exports_sources = '*' - requires = 'jom_installer/1.1.2@bincrafters/stable', 'qt/5.6.3@iceyer/stable' - - def extend_include_path(self): - return '%s/include/libdtk-%s/DCore' % (self.package_folder, self.version) - - # def source(self): - # self.run('git clone https://github.com/linuxdeepin/dtkcore.git source') - # self.run('cd source && git checkout 2.0.9.9') - - def build(self): - outdir = self.build_folder - # includedir = outdir + '/include' - mkspecsdir = outdir + '/mkspecs' - # libdir = outdir + '/lib' - - env_vars = tools.vcvars_dict(self.settings) - env_vars['_CL_'] = '/utf-8' - with tools.environment_append(env_vars): - command = 'qmake -r' - command += ' VERSION=%s' % self.version - # command += ' CONFIG-=debug_and_release' - # command += ' CONFIG-=debug_and_release_target' - command += ' CONFIG+=release' - command += ' PREFIX=%s' % outdir - command += ' MKSPECS_INSTALL_DIR=%s' % mkspecsdir - command += ' DTK_STATIC_LIB=YES' - command += ' DTK_STATIC_TRANSLATION=YES' - command += ' DTK_NO_MULTIMEDIA=YES' - command += ' %s' % self.source_folder - self.run(command) - self.run('jom clean') - self.run('jom') - self.run('jom install') - - def package(self): - self.deploy() - - outdir = self.build_folder - self.copy('*', dst='include', src=outdir+'/include') - self.copy('*.lib', dst='lib', src=outdir+'/lib') - self.copy('*', dst='mkspecs', src=outdir+'/mkspecs') - - def package_info(self): - self.cpp_info.libs = ['dtkcore'] - self.cpp_info.includedirs.append(self.extend_include_path()) - self.env_info.QMAKEPATH = self.cpp_info.rootpath - self.env_info.QMAKEFEATURES = self.cpp_info.rootpath + '/mkspecs/features' - - def deploy(self): - try: - content = [] - module_pri = self.build_folder + '/mkspecs/modules/qt_lib_dtkcore.pri' - s = open(module_pri) - for line in s.readlines(): - if line.startswith('QT.dtkcore.tools'): - line = 'QT.dtkcore.tools = %s\n' % ( - self.package_folder + '/bin') - elif line.startswith('QT.dtkcore.libs'): - line = 'QT.dtkcore.libs = %s\n' % ( - self.package_folder + '/lib') - elif line.startswith('QT.dtkcore.includes'): - line = 'QT.dtkcore.includes = %s\n' % ( - self.extend_include_path()) - content.append(line) - s.close() - - # print('create module file', content) - s = open(module_pri, 'w') - s.writelines(content) - except FileNotFoundError: - print('skip update qt module file') diff --git a/linglong.yaml b/linglong.yaml deleted file mode 100644 index d3bc9046..00000000 --- a/linglong.yaml +++ /dev/null @@ -1,29 +0,0 @@ -package: - id: dtkcore - name: dtkcore - kind: lib - version: 5.6.3 - description: | - Deepin Tool Kit Core Devel library \ - DtkCore is base devel library of Deepin Qt/C++ applications. - -base: - id: org.deepin.base/23.0.0 - -depends: - - id: qtbase/5.15.7 - - id: dtkcommon/5.6.0.1 - - id: gsettings-qt/0.3.1.1 - -source: - kind: local - -variables: - extra_args: | - -DBUILD_EXAMPLES=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_TESTING=OFF \ - -DDTK_VERSION=${VERSION} - -build: - kind: cmake diff --git a/rpm/dtkcore.spec b/rpm/dtkcore.spec index 0c1f95ff..2aed1fae 100644 --- a/rpm/dtkcore.spec +++ b/rpm/dtkcore.spec @@ -1,6 +1,6 @@ Name: dtkcore -Version: 5.7.17 -Release: 1 +Version: 5.7.17 +Release: 1%{?dist} Summary: Deepin tool kit core modules License: LGPLv3+ URL: https://github.com/linuxdeepin/dtkcore