OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
Fork

libqttools: Commit

This library contains code that extends and simplifies different operations
for C++ language based programs which use Qt5 framework as well


Commit MetaInfo

Revision85439b6bf18e2192fc0ec7a130cfff7d1bed917d (tree)
Zeit2023-02-26 05:50:41
AutorSergey Gusarov <laborer2008@gmai...>
CommiterSergey Gusarov

Log Message

Copy file_property.rc from libctools

Ändern Zusammenfassung

Diff

diff -r 498074183939 -r 85439b6bf18e .hgignore
--- a/.hgignore Mon Sep 12 04:34:56 2022 +0300
+++ b/.hgignore Sat Feb 25 23:50:41 2023 +0300
@@ -13,6 +13,7 @@
1313
1414 build_info/include/qttools/version_info.h
1515 build_info/include/qttools/version_info.hpp
16+build_info/file_property.rc
1617
1718 libcpptools_README.pdf
1819 libcpptools_README_RU.pdf
diff -r 498074183939 -r 85439b6bf18e .hgsubstate
--- a/.hgsubstate Mon Sep 12 04:34:56 2022 +0300
+++ b/.hgsubstate Sat Feb 25 23:50:41 2023 +0300
@@ -1,2 +1,2 @@
1-0e62181a24601b73e362fdd7f681413e19033cb0 libcpptools
2-0556a9e3eb8cef3262acbd7be988447b41b14215 pyrepo
1+c2fd1130d9aa1f8b50e9dbdaceff762b72e47e13 libcpptools
2+c99ed6de035765057f05a5b8a3bcd23d47256b0c pyrepo
diff -r 498074183939 -r 85439b6bf18e CMakeLists.txt
--- a/CMakeLists.txt Mon Sep 12 04:34:56 2022 +0300
+++ b/CMakeLists.txt Sat Feb 25 23:50:41 2023 +0300
@@ -22,6 +22,19 @@
2222
2323 include(${CMAKE_CURRENT_SOURCE_DIR}/libcpptools/libctools/cmake/cmake_tools/tools/python_binary.cmake)
2424
25+if (WIN32)
26+ set(RC_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/build_info")
27+ set(RC_FILES "${RC_INCLUDE}/file_property.rc")
28+
29+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libcpptools/libctools/build_info/file_property.rc.template ${RC_INCLUDE})
30+
31+ # windres.exe for mingw, rc.exe for ms vc++
32+ # 65001 == utf8
33+ set(CMAKE_RC_FLAGS "-v -c 65001 -I${RC_INCLUDE} -Iinclude\qttools")
34+else()
35+ set(RC_FILES)
36+endif()
37+
2538 execute_process(COMMAND ${CMT_PYTHON_BINARY} ${CMAKE_CURRENT_LIST_DIR}/pyrepo/gen_build_info.py
2639 "QTT" ${CMAKE_CURRENT_LIST_DIR}/build_info/include/qttools
2740 )
@@ -149,16 +162,6 @@
149162 file(GLOB_RECURSE INC3 build_info/include/*.h)
150163 file(GLOB_RECURSE INC4 build_info/include/*.hpp)
151164
152-if (WIN32)
153- set(RC_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/build_info")
154- set(RC_FILES "${RC_INCLUDE}/file_property.rc")
155-
156- # windres.exe for mingw, rc.exe for ms vc++
157- # 65001 == utf8
158- set(CMAKE_RC_FLAGS "-v -c 65001 -I${RC_INCLUDE} -Iinclude")
159-else()
160- set(RC_FILES)
161-endif()
162165
163166 set(SOURCES ${SRCS1} ${INC1} ${INC2} ${INC3} ${INC4} ${RC_FILES})
164167
diff -r 498074183939 -r 85439b6bf18e build_info/file_property.rc
--- a/build_info/file_property.rc Mon Sep 12 04:34:56 2022 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
1-#include "windows.h"
2-
3-#include <ctools\predef\compiler.h>
4-
5-#include <qttools\version_info.h>
6-
7-
8-#define VER_COMMA(hi, lo, build) CT_NUMBERIZE(hi),CT_NUMBERIZE(lo),CT_NUMBERIZE(build),0 // Like 0,2,0,0
9-#define FILE_VER_COMMA VER_COMMA(QTT_MAJOR_VERSION, QTT_MINOR_VERSION, QTT_BUILD_REVISION)
10-
11-#if QTT_INTERNAL_BUILD == true
12- #define VER_DEBUG VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PRIVATEBUILD
13-#else
14- #define VER_DEBUG 0
15-#endif
16-
17-#define VER_FILE_DESCRIPTION_STR QTT_LIBRARY_NAME " library"
18-
19-#ifdef CT_COMPL_GCC_EMULATION
20-# define VER_ORIGINAL_FILE_NAME_STR "lib" QTT_LIBRARY_NAME ".dll"
21-#else
22-# define VER_ORIGINAL_FILE_NAME_STR QTT_LIBRARY_NAME ".dll"
23-#endif
24-
25-// --------- resources of type Version -----------
26-
27-1 VERSIONINFO
28-FILEVERSION FILE_VER_COMMA
29-PRODUCTVERSION FILE_VER_COMMA
30-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
31-FILEFLAGS VER_DEBUG
32-FILEOS VOS__WINDOWS32
33-FILETYPE VFT_APP
34-FILESUBTYPE VFT2_UNKNOWN
35-
36-BEGIN
37- BLOCK "StringFileInfo"
38- BEGIN
39- BLOCK "040904e4"
40- BEGIN
41- VALUE "FileDescription", VER_FILE_DESCRIPTION_STR
42- VALUE "FileVersion", QTT_K_VERSION
43- VALUE "InternalName", QTT_LIBRARY_NAME
44- VALUE "LegalCopyright", "All rights reserved"
45- VALUE "OriginalFilename", VER_ORIGINAL_FILE_NAME_STR
46- VALUE "ProductName", QTT_LIBRARY_NAME
47- VALUE "ProductVersion", QTT_K_VERSION
48- END
49- END
50- BLOCK "VarFileInfo"
51- BEGIN
52- /* The following line should only be modified for localized versions. */
53- /* It consists of any number of WORD,WORD pairs, with each pair */
54- /* describing a language,codepage combination supported by the file. */
55- /* */
56- /* For example, a file might have values "0x409,1252" indicating that it */
57- /* supports English language (0x409) in the Windows ANSI codepage (1252). */
58-
59- VALUE "Translation", 0x409, 1252
60- END
61-END
diff -r 498074183939 -r 85439b6bf18e build_info/include/qttools/version_info.h.template
--- a/build_info/include/qttools/version_info.h.template Mon Sep 12 04:34:56 2022 +0300
+++ b/build_info/include/qttools/version_info.h.template Sat Feb 25 23:50:41 2023 +0300
@@ -6,7 +6,7 @@
66 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
77 *
88 * @section DESCRIPTION
9- * This file should be process by C/C++ compilers and MS resource compiler
9+ * This file should be processed by C/C++ compilers and MS resource compiler.
1010 * Do not edit. Automatically generated file
1111 */
1212
diff -r 498074183939 -r 85439b6bf18e build_info/include/qttools/version_info.hpp.template
--- a/build_info/include/qttools/version_info.hpp.template Mon Sep 12 04:34:56 2022 +0300
+++ b/build_info/include/qttools/version_info.hpp.template Sat Feb 25 23:50:41 2023 +0300
@@ -6,6 +6,7 @@
66 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
77 *
88 * @section DESCRIPTION
9+ * This file should be processed by C/C++ compilers and MS resource compiler.
910 * Do not edit. Automatically generated file
1011 */
1112
diff -r 498074183939 -r 85439b6bf18e scripts/cleanall.py
--- a/scripts/cleanall.py Mon Sep 12 04:34:56 2022 +0300
+++ b/scripts/cleanall.py Sat Feb 25 23:50:41 2023 +0300
@@ -25,6 +25,8 @@
2525 fsys.removeFile(os.path.join(parentDir, 'build_info', 'include', 'qttools', 'version_info.h'))
2626 fsys.removeFile(os.path.join(parentDir, 'build_info', 'include', 'qttools', 'version_info.hpp'))
2727
28+ fsys.removeFile(os.path.join(parentDir, 'build_info', 'file_property.rc'))
29+
2830 subprocess.check_call(os.path.join(parentDir, 'libcpptools', 'scripts', 'cleanall.py'), shell = True)
2931
3032
Show on old repository browser