1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0cecf0..95e8fe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,8 +44,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
set(ANDROID_OPENSSL_PATH "${ANDROID_SDK_ROOT}/android_openssl/ssl_3" CACHE STRING "Path to the folder with https://github.com/KDAB/android_openssl.git")
endif()
-set(VERSION "0.0.0" CACHE STRING "This is where we start working with the version string as passed from the build script")
-set(VERSION_RELEASEDATE "1970-01-01" CACHE STRING "Release date to be used in metadata, used in Linux appdata only for now.")
+set(LITH_VERSION "0.0.0" CACHE STRING "This is where we start working with the version string as passed from the build script")
+set(LITH_VERSION_RELEASEDATE "1970-01-01" CACHE STRING "Release date to be used in metadata, used in Linux appdata only for now.")
find_package(Git REQUIRED)
# rerun git metadata retrieval on each commit message change
@@ -57,13 +57,13 @@ set_property(
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
- OUTPUT_VARIABLE COMMIT_HASH
+ OUTPUT_VARIABLE LITH_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND "${GIT_EXECUTABLE}" describe --tags --dirty
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
- OUTPUT_VARIABLE GIT_STATE
+ OUTPUT_VARIABLE LITH_GIT_STATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
@@ -79,29 +79,29 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-if (VERSION AND NOT "${VERSION}" STREQUAL "0.0.0")
- set(PROJECT_VERSION ${VERSION} CACHE STRING "" FORCE)
- if (NOT "${VERSION_RELEASEDATE}" STREQUAL "1970-01-01")
- set(PROJECT_VERSION_RELEASEDATE "${VERSION_RELEASEDATE}" CACHE STRING "" FORCE)
+if (LITH_VERSION AND NOT "${LITH_VERSION}" STREQUAL "0.0.0")
+ set(LITH_PROJECT_VERSION ${LITH_VERSION} CACHE STRING "" FORCE)
+ if (NOT "${LITH_VERSION_RELEASEDATE}" STREQUAL "1970-01-01")
+ set(LITH_PROJECT_VERSION_RELEASEDATE "${LITH_VERSION_RELEASEDATE}" CACHE STRING "" FORCE)
else()
message("Release date was not supplied but version was, metadata will show today")
- string(TIMESTAMP PROJECT_VERSION_RELEASEDATE "%Y-%m-%d")
+ string(TIMESTAMP LITH_PROJECT_VERSION_RELEASEDATE "%Y-%m-%d")
endif()
- message("Building Lith version ${PROJECT_VERSION}, release date: ${PROJECT_VERSION_RELEASEDATE}")
+ message("Building Lith version ${LITH_PROJECT_VERSION}, release date: ${LITH_PROJECT_VERSION_RELEASEDATE}")
elseif(GIT_LAST_TAG)
- set(PROJECT_VERSION "${GIT_LAST_TAG}" CACHE STRING "" FORCE)
- set(PROJECT_VERSION_RELEASEDATE "${GIT_LAST_TAG_DATE}" CACHE STRING "" FORCE)
- message("Version passed to CMake was empty, using last one retrieved from git: ${PROJECT_VERSION}, tagged on ${PROJECT_VERSION_RELEASEDATE}")
+ set(LITH_PROJECT_VERSION "${GIT_LAST_TAG}" CACHE STRING "" FORCE)
+ set(LITH_PROJECT_VERSION_RELEASEDATE "${GIT_LAST_TAG_DATE}" CACHE STRING "" FORCE)
+ message("Version passed to CMake was empty, using last one retrieved from git: ${LITH_PROJECT_VERSION}, tagged on ${LITH_PROJECT_VERSION_RELEASEDATE}")
else()
- set(PROJECT_VERSION "0.0.0" CACHE STRING "" FORCE)
- set(PROJECT_VERSION_RELEASEDATE "1970-01-01" CACHE STRING "" FORCE)
- message(WARNING "Version passed to CMake was empty, this may have been done on accident, using ${PROJECT_VERSION}")
+ set(LITH_PROJECT_VERSION "0.0.0" CACHE STRING "" FORCE)
+ set(LITH_PROJECT_VERSION_RELEASEDATE "1970-01-01" CACHE STRING "" FORCE)
+ message(WARNING "Version passed to CMake was empty, this may have been done on accident, using ${LITH_PROJECT_VERSION}")
endif()
-string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION})
-list(GET VERSION_LIST 0 PROJECT_VERSION_MAJOR)
-list(GET VERSION_LIST 1 PROJECT_VERSION_MINOR)
-list(GET VERSION_LIST 2 PROJECT_VERSION_PATCH)
+string(REPLACE "." ";" VERSION_LIST ${LITH_PROJECT_VERSION})
+list(GET VERSION_LIST 0 LITH_PROJECT_VERSION_MAJOR)
+list(GET VERSION_LIST 1 LITH_PROJECT_VERSION_MINOR)
+list(GET VERSION_LIST 2 LITH_PROJECT_VERSION_PATCH)
if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL Profile)
set(LITH_IS_DEBUG_BUILD ON CACHE STRING "")
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 0147b5d..1fd32c3 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -76,8 +76,8 @@ set_target_properties(Lith PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE_GUI_IDENTIFIER cz.rtinbriza.ma.Lith
MACOSX_BUNDLE_BUNDLE_NAME Lith
- MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
- MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
+ MACOSX_BUNDLE_BUNDLE_VERSION ${LITH_PROJECT_VERSION}
+ MACOSX_BUNDLE_SHORT_VERSION_STRING ${LITH_PROJECT_VERSION}
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/dist/ios/Info.plist.in"
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER cz.rtinbriza.ma.Lith
diff --git a/app/main.cpp b/app/main.cpp
index 05e3956..8b81773 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -57,16 +57,16 @@ int main(int argc, char* argv[]) {
QCoreApplication::setOrganizationName("Lith");
QCoreApplication::setOrganizationDomain("lith.app");
QCoreApplication::setApplicationName("Lith");
- if (QStringLiteral(PROJECT_VERSION) == QStringLiteral("0.0.0")) {
- if (QStringLiteral(GIT_STATE).isEmpty()) {
+ if (QStringLiteral(LITH_PROJECT_VERSION) == QStringLiteral("0.0.0")) {
+ if (QStringLiteral(LITH_GIT_STATE).isEmpty()) {
QCoreApplication::setApplicationVersion(QStringLiteral(
"Unknown version, please report this to https://github.com/LithApp/Lith and mention your platform and where you got this package."
));
} else {
- QCoreApplication::setApplicationVersion(QStringLiteral(GIT_STATE));
+ QCoreApplication::setApplicationVersion(QStringLiteral(LITH_GIT_STATE));
}
} else {
- QCoreApplication::setApplicationVersion(QStringLiteral(PROJECT_VERSION));
+ QCoreApplication::setApplicationVersion(QStringLiteral(LITH_PROJECT_VERSION));
}
QApplication app(argc, argv);
diff --git a/dist/android/build.sh b/dist/android/build.sh
index 936e875..cf1d605 100644
--- a/dist/android/build.sh
+++ b/dist/android/build.sh
@@ -11,7 +11,7 @@ fi
export QT_HOST_PATH="${QT_ROOT_DIR}/../gcc_64"
export CMAKE_PREFIX_PATH=${QT_ROOT_DIR}/lib/cmake
-cmake .. -DQT_DEBUG_FIND_PACKAGE=ON -DCMAKE_BUILD_TYPE=Release -DIMGUR_API_KEY=$IMGUR_API_KEY -DCMAKE_INSTALL_PREFIX=installed -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake -DANDROID_OPENSSL_PATH="${ANDROID_OPENSSL_PATH}" -DQT_ANDROID_BUILD_ALL_ABIS=ON
+cmake .. -DQT_DEBUG_FIND_PACKAGE=ON -DCMAKE_BUILD_TYPE=Release -DLITH_IMGUR_API_KEY=$IMGUR_API_KEY -DCMAKE_INSTALL_PREFIX=installed -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake -DANDROID_OPENSSL_PATH="${ANDROID_OPENSSL_PATH}" -DQT_ANDROID_BUILD_ALL_ABIS=ON
cmake --build . --target Lith -- -j2
cmake --build . --target apk -- -j2
diff --git a/dist/ios/Info.plist.in b/dist/ios/Info.plist.in
index 2b235c7..5d82441 100644
--- a/dist/ios/Info.plist.in
+++ b/dist/ios/Info.plist.in
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}</string>
+ <string>${LITH_PROJECT_VERSION_MAJOR}.${LITH_PROJECT_VERSION_MINOR}</string>
<key>CFBundleVersion</key>
- <string>${VERSION}</string>
+ <string>${LITH_VERSION}</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>CFBundleIconName</key>
diff --git a/dist/ios/build.sh b/dist/ios/build.sh
index 16bc191..924c743 100644
--- a/dist/ios/build.sh
+++ b/dist/ios/build.sh
@@ -6,7 +6,7 @@ mkdir build_ios
cd build_ios
export QT_HOST_PATH="${QT_ROOT_DIR}/../macos"
-cmake .. -GXcode -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVERSION=$VERSION_NAME -DIOS_DEVELOPMENT_TEAM_ID=Z52EFCPL6D -DIMGUR_API_KEY=$IMGUR_API_KEY
+cmake .. -GXcode -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLITH_VERSION=$VERSION_NAME -DIOS_DEVELOPMENT_TEAM_ID=Z52EFCPL6D -DLITH_IMGUR_API_KEY=$IMGUR_API_KEY
xcodebuild -project Lith.xcodeproj -destination generic/platform=iOS -scheme Lith -configuration RelWithDebInfo DEVELOPMENT_TEAM=Z52EFCPL6D build
xcodebuild -project Lith.xcodeproj -scheme Lith -configuration RelWithDebInfo archive -archivePath Lith.xcarchive DEVELOPMENT_TEAM=Z52EFCPL6D
diff --git a/dist/linux/app.lith.Lith.appdata.xml.in b/dist/linux/app.lith.Lith.appdata.xml.in
index d561629..a0f4db0 100644
--- a/dist/linux/app.lith.Lith.appdata.xml.in
+++ b/dist/linux/app.lith.Lith.appdata.xml.in
@@ -28,6 +28,6 @@
<update_contact>m@rtinbriza.cz</update_contact>
<content_rating type="oars-1.1"/>
<releases>
- <release version="${PROJECT_VERSION}" date="${PROJECT_VERSION_RELEASEDATE}"/>
+ <release version="${LITH_PROJECT_VERSION}" date="${LITH_PROJECT_VERSION_RELEASEDATE}"/>
</releases>
</component>
diff --git a/dist/macos/build.sh b/dist/macos/build.sh
index 31ee22f..0ed31c8 100755
--- a/dist/macos/build.sh
+++ b/dist/macos/build.sh
@@ -3,5 +3,5 @@
mkdir build_macos
cd build_macos
export CMAKE_PREFIX_PATH=$QT_ROOT_DIR/lib/cmake
-cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DIMGUR_API_KEY=$IMGUR_API_KEY -DVERSION=$VERSION_NAME -DCMAKE_INSTALL_PREFIX=installed
+cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DLITH_IMGUR_API_KEY=$IMGUR_API_KEY -DLITH_VERSION=$VERSION_NAME -DCMAKE_INSTALL_PREFIX=installed
cmake --build . --parallel
diff --git a/dist/wasm/build.sh b/dist/wasm/build.sh
index 340c35e..b1e1b2f 100644
--- a/dist/wasm/build.sh
+++ b/dist/wasm/build.sh
@@ -7,6 +7,6 @@ pushd build_wasm
export QT_HOST_PATH="${QT_ROOT_DIR}/../gcc_64"
export CMAKE_PREFIX_PATH=$QT_ROOT_DIR/lib/cmake
-cmake .. -DCMAKE_BUILD_TYPE=Release -DIMGUR_API_KEY=$IMGUR_API_KEY -DCMAKE_INSTALL_PREFIX=installed -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake
+cmake .. -DCMAKE_BUILD_TYPE=Release -DLITH_IMGUR_API_KEY=$IMGUR_API_KEY -DCMAKE_INSTALL_PREFIX=installed -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake
cmake --build .
cmake --install .
diff --git a/modules/Lith/Core/cmakedefs.h.in b/modules/Lith/Core/cmakedefs.h.in
index fe1fdcd..d8367ae 100644
--- a/modules/Lith/Core/cmakedefs.h.in
+++ b/modules/Lith/Core/cmakedefs.h.in
@@ -1,27 +1,27 @@
#ifndef CMAKEDEFS_H_IN
#define CMAKEDEFS_H_IN
-#define PROJECT_VERSION "${PROJECT_VERSION}"
-#define PROJECT_VERSION_MAJOR \
+#define LITH_PROJECT_VERSION "${LITH_PROJECT_VERSION}"
+#define LITH_PROJECT_VERSION_MAJOR \
$ { \
- PROJECT_VERSION_MAJOR \
+ LITH_PROJECT_VERSION_MAJOR \
}
-#define PROJECT_VERSION_MINOR \
+#define LITH_PROJECT_VERSION_MINOR \
$ { \
- PROJECT_VERSION_MINOR \
+ LITH_PROJECT_VERSION_MINOR \
}
-#define PROJECT_VERSION_PATCH \
+#define LITH_PROJECT_VERSION_PATCH \
$ { \
- PROJECT_VERSION_PATCH \
+ LITH_PROJECT_VERSION_PATCH \
}
-#define COMMIT_HASH "${COMMIT_HASH}"
-#define GIT_STATE "${GIT_STATE}"
+#define LITH_COMMIT_HASH "${LITH_COMMIT_HASH}"
+#define LITH_GIT_STATE "${LITH_GIT_STATE}"
#cmakedefine01 LITH_IS_DEBUG_BUILD
#define CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
-#define IMGUR_API_KEY "${IMGUR_API_KEY}"
+#define LITH_IMGUR_API_KEY "${LITH_IMGUR_API_KEY}"
#define LITH_INSTALL_MODULEDIR "${LITH_INSTALL_MODULEDIR}"
diff --git a/modules/Lith/Core/lith.cpp b/modules/Lith/Core/lith.cpp
index d66094f..e14ba58 100644
--- a/modules/Lith/Core/lith.cpp
+++ b/modules/Lith/Core/lith.cpp
@@ -193,7 +193,7 @@ NotificationHandler* Lith::notificationHandler() {
}
QString Lith::gitVersion() {
- return QStringLiteral(GIT_STATE);
+ return QStringLiteral(LITH_GIT_STATE);
}
bool Lith::debugVersion() {
diff --git a/modules/Lith/Core/settings.h b/modules/Lith/Core/settings.h
index 9998d9a..2b3d6ed 100644
--- a/modules/Lith/Core/settings.h
+++ b/modules/Lith/Core/settings.h
@@ -173,7 +173,7 @@ class LITHCORE_EXPORT Settings : public QObject {
// This is hidden for now
SETTING(bool, terminalLikeChat, true)
- SETTING(QString, imgurApiKey, QStringLiteral(IMGUR_API_KEY))
+ SETTING(QString, imgurApiKey, QStringLiteral(LITH_IMGUR_API_KEY))
// UNUSED SETTINGS
// determine what to do about these later
|