Skip to content

Commit

Permalink
documentation update - upversion to 3.3.1
Browse files Browse the repository at this point in the history
Signed-off-by: Martin <[email protected]>
  • Loading branch information
Ho-Ro committed Jul 31, 2022
1 parent f0523cf commit b3afdec
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Every commit triggers a workflow on
that builds and packages OpenHantek6022 for:
* Linux (`*.deb`, `*.rpm`, `*.tar.gz`)
* Windows (`*.zip`)
* macOS - currently only build but no package upload due to a regression caused by incompatible changes on macos side.
* macOS - (`*.dmg`, `*.tar.gz`)

[![GitHub CI](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml/badge.svg)](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml)
This status badge here (and on top) show the build status.
Expand All @@ -125,7 +125,7 @@ To make building for Linux even easier, I provide two shell scripts:
If you make small changes to the local source code, it is sufficient to call `make -j4` or `fakeroot make -j4 package` in the `build` directory.

## Install Prebuilt Binary Packages
* Download Linux (built on Ubuntu 1804 LTS), Raspberry Pi (Debian stable), FreeBSD (12.1), macOS (Catalina 10.15) and Windows (Visual Studio 2019) packages for your convenience from the [Releases](https://github.com/OpenHantek/OpenHantek6022/releases) page.
* Download Linux (Ubuntu 2004 LTS), Raspberry Pi (Debian stable), FreeBSD (12.1), macOS (Big Sur 11.6) and Windows (Visual Studio 2019) packages for your convenience from the [Releases](https://github.com/OpenHantek/OpenHantek6022/releases) page.
* If you want to follow ongoing development, packages built from a fairly recent commit are available in the [unstable release](https://github.com/OpenHantek/OpenHantek6022/releases/tag/unstable).
* For RPi4 see also [issue #28](https://github.com/OpenHantek/OpenHantek6022/issues/28).
* These binary packages are built on stable operating system versions and require an up-to-date system.
Expand Down
Binary file modified docs/OpenHantek6022_User_Manual.odt
Binary file not shown.
Binary file modified docs/OpenHantek6022_User_Manual.pdf
Binary file not shown.
7 changes: 6 additions & 1 deletion docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,19 @@ We recommend homebrew to install the required libraries.
git submodule update --init --recursive
brew update
brew install libusb fftw qt5 cmake binutils create-dmg
# the next two commands (hack from @warpme) fix #314
mkdir -p /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework
ln -sf /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib \
/usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework/libgcc_s.1.1.dylib

If you want to build an OSX bundle make sure the option in `openhantek/CMakeLists.txt` is set accordingly:

option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)

After you've installed the requirements run the following commands inside the top directory of this package:

mkdir build
mkdir -p build
rm -rf build/*
cd build
cmake ..
#
Expand Down
2 changes: 1 addition & 1 deletion openhantek/src/OH_BUILD.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Do not edit, will be re-created at each commit!
#define OH_BUILD "20220731 - commit 1039"
#define OH_BUILD "20220731 - commit 1040"
2 changes: 1 addition & 1 deletion openhantek/src/OH_VERSION.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// next line shall define either OH_VERSION or LAST_OH_VERSION
//
#define LAST_OH_VERSION "3.3.0.1"
#define OH_VERSION "3.3.1"


// do not edit below
Expand Down

0 comments on commit b3afdec

Please sign in to comment.