From 4f9f31ef71ab0f4217005fc9e0af9818abf1a4b0 Mon Sep 17 00:00:00 2001 From: vit9696 Date: Tue, 22 May 2018 00:59:23 +0300 Subject: [PATCH] Unify version scheme and fix minor issues --- .appveyor.yml | 3 +-- .gitignore | 7 ++++++- UEFIDump/CMakeLists.txt | 1 + UEFIDump/uefidump_main.cpp | 3 ++- UEFIExtract/uefiextract.pro | 5 +++-- UEFIExtract/uefiextract_main.cpp | 3 ++- UEFIFind/uefifind.pro | 3 ++- UEFIFind/uefifind_main.cpp | 4 +++- UEFITool/uefitool.cpp | 5 +++-- UEFITool/uefitool.pro | 1 + unixbuild.sh | 13 +++++-------- version.h | 19 +++++++++++++++++++ 12 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 version.h diff --git a/.appveyor.yml b/.appveyor.yml index 4baa858..b797f18 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,11 +18,10 @@ deploy: auth_token: secure: zSJnpSnrKY1NO5RPVBaD/uq7UPyc+GW7ecjPFqEMsLjtnd6H+iNfROdoeuxJgt5T artifact: Binaries + prerelease: true on: appveyor_repo_tag: true artifacts: - path: dist\**\*.zip name: Binaries - - diff --git a/.gitignore b/.gitignore index 9eb95c6..161f117 100644 --- a/.gitignore +++ b/.gitignore @@ -232,9 +232,14 @@ pip-log.txt *.o Makefile -UEFITool/uefitool_plugin_import.cpp +uefitool_plugin_import.cpp UEFITool.app/ +UEFIDump/UEFIDump +UEFIExtract/UEFIExtract +UEFIFind/UEFIFind .qmake.stash CMakeCache.txt CMakeFiles cmake_install.cmake +DerivedData +*.xcodeproj diff --git a/UEFIDump/CMakeLists.txt b/UEFIDump/CMakeLists.txt index b0c8bbc..0663fc8 100644 --- a/UEFIDump/CMakeLists.txt +++ b/UEFIDump/CMakeLists.txt @@ -50,6 +50,7 @@ SET(PROJECT_HEADERS ../common/sha256.h ../common/bstrlib/bstrlib.h ../common/bstrlib/bstrwrap.h + ../version.h ) ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT) diff --git a/UEFIDump/uefidump_main.cpp b/UEFIDump/uefidump_main.cpp index 57558ad..0ccd4b0 100644 --- a/UEFIDump/uefidump_main.cpp +++ b/UEFIDump/uefidump_main.cpp @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include +#include "../version.h" #include "uefidump.h" int main(int argc, char *argv[]) @@ -29,7 +30,7 @@ int main(int argc, char *argv[]) return (uefidumper.dump(buffer, UString(argv[1])) != U_SUCCESS); } - std::cout << "UEFIDump 0.1.9" << std::endl << std::endl + std::cout << "UEFIDump " PROGRAM_VERSION << std::endl << std::endl << "Usage: UEFIDump imagefile" << std::endl; return 0; } diff --git a/UEFIExtract/uefiextract.pro b/UEFIExtract/uefiextract.pro index 8ecc101..2830f2c 100644 --- a/UEFIExtract/uefiextract.pro +++ b/UEFIExtract/uefiextract.pro @@ -50,5 +50,6 @@ HEADERS += \ ../common/ubytearray.h \ ../common/ustring.h \ ../common/bootguard.h \ - ../common/sha256.h - + ../common/sha256.h \ + ../version.h + diff --git a/UEFIExtract/uefiextract_main.cpp b/UEFIExtract/uefiextract_main.cpp index b9aa980..d2ff70a 100644 --- a/UEFIExtract/uefiextract_main.cpp +++ b/UEFIExtract/uefiextract_main.cpp @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include +#include "../version.h" #include "../common/ffsparser.h" #include "../common/ffsreport.h" #include "ffsdumper.h" @@ -121,7 +122,7 @@ int main(int argc, char *argv[]) } } // If parameters are different, show version and usage information - std::cout << "UEFIExtract 0.13.8" << std::endl << std::endl + std::cout << "UEFIExtract " PROGRAM_VERSION << std::endl << std::endl << "Usage: UEFIExtract imagefile - generate report and dump only leaf tree items into .dump folder." << std::endl << " UEFIExtract imagefile all - generate report and dump all tree items." << std::endl << " UEFIExtract imagefile dump - only generate dump, no report needed." << std::endl diff --git a/UEFIFind/uefifind.pro b/UEFIFind/uefifind.pro index e4b3e7f..4880eec 100644 --- a/UEFIFind/uefifind.pro +++ b/UEFIFind/uefifind.pro @@ -43,4 +43,5 @@ HEADERS += uefifind.h \ ../common/ustring.h \ ../common/ubytearray.h \ ../common/bootguard.h \ - ../common/sha256.h + ../common/sha256.h \ + ../version.h diff --git a/UEFIFind/uefifind_main.cpp b/UEFIFind/uefifind_main.cpp index 834fa82..7f32f54 100644 --- a/UEFIFind/uefifind_main.cpp +++ b/UEFIFind/uefifind_main.cpp @@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. */ #include #include + +#include "../version.h" #include "uefifind.h" int main(int argc, char *argv[]) @@ -148,7 +150,7 @@ int main(int argc, char *argv[]) return U_SUCCESS; } else { - std::cout << "UEFIFind 0.10.13" << std::endl << std::endl << + std::cout << "UEFIFind " PROGRAM_VERSION << std::endl << std::endl << "Usage: UEFIFind {header | body | all} {list | count} pattern imagefile" << std::endl << " or UEFIFind file patternsfile imagefile" << std::endl; return U_INVALID_PARAMETER; diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp index 77abdd6..9dd915f 100644 --- a/UEFITool/uefitool.cpp +++ b/UEFITool/uefitool.cpp @@ -11,13 +11,14 @@ */ +#include "../version.h" #include "uefitool.h" #include "ui_uefitool.h" UEFITool::UEFITool(QWidget *parent) : QMainWindow(parent), ui(new Ui::UEFITool), -version(tr("NE alpha 50")) +version(tr(PROGRAM_VERSION)) { clipboard = QApplication::clipboard(); @@ -723,7 +724,7 @@ void UEFITool::remove() void UEFITool::about() { QMessageBox::about(this, tr("About UEFITool"), tr( - "Copyright (c) 2018, LongSoft" + "Copyright (c) 2018, LongSoft.
" "Program icon made by Alexander Zhidkov.
" "The program uses QHexEdit2 library made by Simsys.
" "Qt-less engine is using Bstrlib made by Paul Hsieh.

" diff --git a/UEFITool/uefitool.pro b/UEFITool/uefitool.pro index 468aefa..9bf3473 100644 --- a/UEFITool/uefitool.pro +++ b/UEFITool/uefitool.pro @@ -43,6 +43,7 @@ HEADERS += uefitool.h \ ../common/ubytearray.h \ ../common/bootguard.h \ ../common/sha256.h \ + ../version.h \ qhexedit2/qhexedit.h \ qhexedit2/chunks.h \ qhexedit2/commands.h diff --git a/unixbuild.sh b/unixbuild.sh index b312696..ef72aba 100755 --- a/unixbuild.sh +++ b/unixbuild.sh @@ -57,10 +57,7 @@ fi echo "Attempting to build UEFITool NE for ${UPLATFORM}..." -UEFITOOL_VER=$(cat UEFITool/uefitool.cpp | grep ^version | cut -d'"' -f2 | sed 's/NE alpha /A/') -UEFIDUMP_VER=$(cat UEFIDump/uefidump_main.cpp | grep '"UEFIDump [0-9]' | cut -d'"' -f2 | cut -d' ' -f2) -UEFIEXTRACT_VER=$(cat UEFIExtract/uefiextract_main.cpp | grep '"UEFIExtract [0-9]' | cut -d'"' -f2 | cut -d' ' -f2) -UEFIFIND_VER=$(cat UEFIFind/uefifind_main.cpp | grep '"UEFIFind [0-9]' | cut -d'"' -f2 | cut -d' ' -f2) +UEFITOOL_VER=$(cat version.h | grep PROGRAM_VERSION | cut -d'"' -f2 | sed 's/NE alpha /A/') build_tool() { echo "Building $1 $2" @@ -115,9 +112,9 @@ build_tool() { rm -rf dist mkdir -p dist || exit 1 -build_tool UEFITool "$UEFITOOL_VER" uefitool.pro -build_tool UEFIDump "$UEFIDUMP_VER" "" -build_tool UEFIExtract "$UEFIEXTRACT_VER" uefiextract.pro -build_tool UEFIFind "$UEFIFIND_VER" uefifind.pro +build_tool UEFITool "$UEFITOOL_VER" uefitool.pro +build_tool UEFIDump "$UEFITOOL_VER" "" +build_tool UEFIExtract "$UEFITOOL_VER" uefiextract.pro +build_tool UEFIFind "$UEFITOOL_VER" uefifind.pro exit 0 diff --git a/version.h b/version.h new file mode 100644 index 0000000..1c61f9f --- /dev/null +++ b/version.h @@ -0,0 +1,19 @@ +/* types.h + +Copyright (c) 2015, Nikolaj Schlej. All rights reserved. +This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +*/ + +#ifndef __VERSION_H__ +#define __VERSION_H__ + +#define PROGRAM_VERSION "NE alpha 50" + +#endif \ No newline at end of file