mirror/xemu
3
0
Fork 0
mirror of https://github.com/mborgerson/xemu.git synced 2026-02-04 13:45:48 +00:00
Code Issues Projects Releases Wiki Activity

ui: Drop xemu branch tracking

Browse Source
This commit is contained in:
Matt Borgerson
2026-01-04 23:04:49 -07:00
committed by mborgerson
parent 3334a76f73
commit e409f7afd9
9 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/archive-source.sh
View File

@ -89,8 +89,7 @@ for sp in $subprojects; do
done done
git rev-parse HEAD 2>/dev/null | tr -d '\n' > XEMU_COMMIT git rev-parse HEAD 2>/dev/null | tr -d '\n' > XEMU_COMMIT
git symbolic-ref --short HEAD > XEMU_BRANCH
git describe --tags --match 'v*' | cut -c 2- | tr -d '\n' > XEMU_VERSION git describe --tags --match 'v*' | cut -c 2- | tr -d '\n' > XEMU_VERSION
tar -r --file "$tar_file" XEMU_COMMIT XEMU_BRANCH XEMU_VERSION tar -r --file "$tar_file" XEMU_COMMIT XEMU_VERSION
exit 0 exit 0

8
scripts/xemu-version.sh
View File

@ -11,13 +11,6 @@ XEMU_COMMIT=$( \
elif test -e XEMU_COMMIT; then \ elif test -e XEMU_COMMIT; then \
cat XEMU_COMMIT; \ cat XEMU_COMMIT; \
fi) fi)
XEMU_BRANCH=$( \
cd "$dir"; \
if test -e .git; then \
git symbolic-ref --short HEAD || echo $XEMU_COMMIT; \
elif test -e XEMU_BRANCH; then \
cat XEMU_BRANCH; \
fi)
XEMU_VERSION=$( \ XEMU_VERSION=$( \
cd "$dir"; \ cd "$dir"; \
if test -e .git; then \ if test -e .git; then \
@ -49,7 +42,6 @@ cat <<EOF
#define XEMU_VERSION_MINOR $XEMU_VERSION_MINOR #define XEMU_VERSION_MINOR $XEMU_VERSION_MINOR
#define XEMU_VERSION_PATCH $XEMU_VERSION_PATCH #define XEMU_VERSION_PATCH $XEMU_VERSION_PATCH
#define XEMU_VERSION_COMMIT $XEMU_VERSION_COMMIT #define XEMU_VERSION_COMMIT $XEMU_VERSION_COMMIT
#define XEMU_BRANCH "$XEMU_BRANCH"
#define XEMU_COMMIT "$XEMU_COMMIT" #define XEMU_COMMIT "$XEMU_COMMIT"
#define XEMU_DATE "$XEMU_DATE" #define XEMU_DATE "$XEMU_DATE"
EOF EOF

1
ui/xemu.c
View File

@ -1342,7 +1342,6 @@ int main(int argc, char **argv)
#endif #endif
fprintf(stderr, "xemu_version: %s\n", xemu_version); fprintf(stderr, "xemu_version: %s\n", xemu_version);
fprintf(stderr, "xemu_branch: %s\n", xemu_branch);
fprintf(stderr, "xemu_commit: %s\n", xemu_commit); fprintf(stderr, "xemu_commit: %s\n", xemu_commit);
fprintf(stderr, "xemu_date: %s\n", xemu_date); fprintf(stderr, "xemu_date: %s\n", xemu_date);

1
ui/xui/compat.cc
View File

@ -33,7 +33,6 @@ CompatibilityReporter::CompatibilityReporter()
report.token = ""; report.token = "";
report.xemu_version = xemu_version; report.xemu_version = xemu_version;
report.xemu_branch = xemu_branch;
report.xemu_commit = xemu_commit; report.xemu_commit = xemu_commit;
report.xemu_date = xemu_date; report.xemu_date = xemu_date;
report.os_platform = xemu_get_os_platform(); report.os_platform = xemu_get_os_platform();

7
ui/xui/main-menu.cc
View File

@ -1592,9 +1592,10 @@ void MainMenuAboutView::Draw()
static const char *build_info_text = NULL; static const char *build_info_text = NULL;
if (build_info_text == NULL) { if (build_info_text == NULL) {
build_info_text = build_info_text =
g_strdup_printf("Version: %s\nBranch: %s\nCommit: " g_strdup_printf("Version: %s\n"
"%s\nDate: %s", "Commit: %s\n"
xemu_version, xemu_branch, xemu_commit, xemu_date); "Date: %s",
xemu_version, xemu_commit, xemu_date);
} }
static const char *sys_info_text = NULL; static const char *sys_info_text = NULL;

2
ui/xui/reporting.cc
View File

@ -44,7 +44,7 @@ const std::string &CompatibilityReport::GetSerializedReport()
json report = { json report = {
{"token", token}, {"token", token},
{"xemu_version", xemu_version}, {"xemu_version", xemu_version},
{"xemu_branch", xemu_branch}, {"xemu_branch", ""},
{"xemu_commit", xemu_commit}, {"xemu_commit", xemu_commit},
{"xemu_date", xemu_date}, {"xemu_date", xemu_date},
{"os_platform", os_platform}, {"os_platform", os_platform},

1
ui/xui/reporting.hh
View File

@ -28,7 +28,6 @@ class CompatibilityReport {
public: public:
std::string token; std::string token;
std::string xemu_version; std::string xemu_version;
std::string xemu_branch;
std::string xemu_commit; std::string xemu_commit;
std::string xemu_date; std::string xemu_date;
std::string os_platform; std::string os_platform;

1
xemu-version.c
View File

@ -4,6 +4,5 @@ const int xemu_version_major = XEMU_VERSION_MAJOR;
const int xemu_version_minor = XEMU_VERSION_MINOR; const int xemu_version_minor = XEMU_VERSION_MINOR;
const int xemu_version_patch = XEMU_VERSION_PATCH; const int xemu_version_patch = XEMU_VERSION_PATCH;
const char *xemu_version = XEMU_VERSION; const char *xemu_version = XEMU_VERSION;
const char *xemu_branch = XEMU_BRANCH;;
const char *xemu_commit = XEMU_COMMIT; const char *xemu_commit = XEMU_COMMIT;
const char *xemu_date = XEMU_DATE; const char *xemu_date = XEMU_DATE;

1
xemu-version.h
View File

@ -5,7 +5,6 @@ extern const int xemu_version_major;
extern const int xemu_version_minor; extern const int xemu_version_minor;
extern const int xemu_version_patch; extern const int xemu_version_patch;
extern const char *xemu_version; extern const char *xemu_version;
extern const char *xemu_branch;
extern const char *xemu_commit; extern const char *xemu_commit;
extern const char *xemu_date; extern const char *xemu_date;