Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
- Updated CentOS repo in README.md
- Whitespace fixes
  • Loading branch information
Nightwalker-87 committed Apr 7, 2020
1 parent 41f8417 commit be6aafd
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
47 changes: 23 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
##
# This Makefile is used to drive building of Debug and Release
# targets of CMake
# This Makefile is used to drive building of Debug and Release targets of CMake
##
MAKEFLAGS += -s

all: release
ci: debug release test
ci: debug release test

help:
@echo " release: Run a release build"
@echo " debug: Run a debug build"
@echo " lint: Lint check all source-code"
@echo " test: Build and run tests"
@echo " clean: Clean all build output"
@echo "rebuild_cache: Rebuild all CMake caches"
@echo " release: Run a release build"
@echo " debug: Run a debug build"
@echo " lint: Lint check all source-code"
@echo " test: Build and run tests"
@echo " clean: Clean all build output"
@echo "rebuild_cache: Rebuild all CMake caches"

rebuild_cache: build/Debug build/Release
@$(MAKE) -C build/Debug rebuild_cache
@$(MAKE) -C build/Release rebuild_cache
@$(MAKE) -C build/Debug rebuild_cache
@$(MAKE) -C build/Release rebuild_cache

debug: build/Debug
@echo "[DEBUG]"
@$(MAKE) -C build/Debug
@echo "[DEBUG]"
@$(MAKE) -C build/Debug

release: build/Release
@echo "[RELEASE]"
@$(MAKE) -C build/Release
@echo "[RELEASE]"
@$(MAKE) -C build/Release

package: build/Release
@echo "[PACKAGE] Release"
@$(MAKE) -C build/Release package
@echo "[PACKAGE] Release"
@$(MAKE) -C build/Release package

test: debug
@$(MAKE) -C build/Debug test
@$(MAKE) -C build/Debug test

build/Debug:
@mkdir -p $@
@cd $@ && cmake -DCMAKE_BUILD_TYPE=Debug $(CMAKEFLAGS) ../../
@mkdir -p $@
@cd $@ && cmake -DCMAKE_BUILD_TYPE=Debug $(CMAKEFLAGS) ../../

build/Release:
@mkdir -p $@
@cd $@ && cmake -Wno-dev -DCMAKE_BUILD_TYPE=Release $(CMAKEFLAGS) ../../
@mkdir -p $@
@cd $@ && cmake -Wno-dev -DCMAKE_BUILD_TYPE=Release $(CMAKEFLAGS) ../../

clean:
@echo "[CLEAN]"
@rm -Rf build
@echo "[CLEAN]"
@rm -Rf build

.PHONY: clean
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ We recommend to install `stlink-tools` from the package repository of the used d

**Other Operating Systems**:

* RedHat/CentOS 7: Users can install [from EPEL repository](https://src.fedoraproject.org/rpms/stlink/branch/epel7)
* RedHat/CentOS 8: Users can install [from EPEL repository](https://src.fedoraproject.org/rpms/stlink/branch/epel8)
* FreeBSD: Users can install [from freshports](https://www.freshports.org/devel/stlink)
* OpenBSD: Users need to install [from source](doc/compiling.md).

Expand Down
3 changes: 2 additions & 1 deletion doc/version_support.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Sources: [pkgs.org - libusb](https://pkgs.org/search/?q=libusb) & [pkgs.org - cm


## Supported Operating Systems

### Microsoft Windows

On Windows users should ensure that cmake 3.17.0 is installed.<br />
Expand All @@ -14,6 +13,7 @@ Thus no user interaction regarding libusb is necessary.
* Windows 10
* Windows 8.1


### Apple macOS

On macOS users should ensure that cmake 3.17.0 is installed.
Expand All @@ -24,6 +24,7 @@ On macOS users should ensure that cmake 3.17.0 is installed.
* macOS 10.14 Mojave
* macOS 10.13 High Sierra


### Linux-/Unix-based:

| Operating System | libusb<br />version | cmake<br />version | Notes |
Expand Down

0 comments on commit be6aafd

Please sign in to comment.