3fc819f60fb716d4d35cc3160a1ada5b208c13ea — octaspire 2 months ago 5554612 v0.118.0
Update GNUmakefile and README.md, git tag versions
M GNUmakefile => GNUmakefile +35 -8
@@ 31,7 31,21 @@ $(TESTDR)test_vector.o       \
              $(TESTDR)test_semver.o
  
- .PHONY: development submodules-init submodules-pull clean codestyle cppcheck valgrind test coverage major minor patch push
+ UNAME := $(shell uname)
+ MACHINE := $(shell uname -m)
+ OS := "Unknown"
+ 
+ MAKE=make
+ 
+ 
+ # TODO Detect more platforms and show message about using the amalgamation on other platforms
+ ifeq ($(UNAME), OpenBSD)
+     OS := "OpenBSD"
+     MAKE=gmake
+ endif
+ 
+ 
+ .PHONY: development submodules-init submodules-pull clean codestyle cppcheck valgrind test coverage major minor patch push tag
  
  
  all: development


@@ 120,7 134,7 @@ submodules-pull:
  	@echo "Pulling submodules..."
  	@git submodule update --recursive --remote
- 	@make -s TAGS
+ 	@$(MAKE) -s TAGS
  	@echo "Done."
  
  $(AMALGAMATION): $(ETCDIR)amalgamation_head.c                \


@@ 270,21 284,34 @@   major:
  	@sh dev/etc/bump-version.sh major
- 	@make -s TAGS
- 	@echo "Done."
+ 	@rm -f release/octaspire-core-amalgamated.c      # This ensures that the version number is updated
+ 	@$(MAKE) -s release/octaspire-core-amalgamated.c # also in the amalgamation.
+ 	@$(MAKE) -s TAGS
+ 	@echo "OK  Done."
  
  minor:
  	@sh dev/etc/bump-version.sh minor
- 	@make -s TAGS
- 	@echo "Done."
+ 	@rm -f release/octaspire-core-amalgamated.c      # This ensures that the version number is updated
+ 	@$(MAKE) -s release/octaspire-core-amalgamated.c # also in the amalgamation.
+ 	@$(MAKE) -s TAGS
+ 	@echo "OK  Done."
  
  patch:
  	@sh dev/etc/bump-version.sh patch
- 	@make -s TAGS
- 	@echo "Done."
+ 	@rm -f release/octaspire-core-amalgamated.c      # This ensures that the version number is updated
+ 	@$(MAKE) -s release/octaspire-core-amalgamated.c # also in the amalgamation.
+ 	@$(MAKE) -s TAGS
+ 	@echo "OK  Done."
+ 
+ tag:
+ 	@sh dev/etc/tag-version.sh
  
  push:
  	@git push origin-gitlab
+ 	@git push origin-gitlab --tags
  	@git push origin-bitbucket
+ 	@git push origin-bitbucket --tags
  	@git push origin-sr
+ 	@git push origin-sr --tags
+ 	@git push origin-github --tags
  	@git push origin-github

M README.md => README.md +16 -0
@@ 7,3 7,19 @@   [https://octaspire.io](https://octaspire.io)
  
+ Please use the amalgamated release
+ `octaspire-core-amalgamated.c` that
+ can be found from the `release`-directory.
+ 
+ It contains **everything** needed to build
+ and run unit test runner or use Core
+ in other programs.
+ 
+ The Makefile is used only in development
+ builds when developing Core itself, and it
+ will run only on some platforms. The amalgamated
+ release can be used in all platforms without
+ any build or metabuild tools.
+ 
+ See the manual for more information.
+ 

A dev/etc/tag-version.sh => dev/etc/tag-version.sh +13 -0
@@ 0,0 1,13 @@
+ #!/usr/bin/env bash
+ 
+ CONFIG_FILE="dev/include/octaspire/core/octaspire_core_config.h"
+ STR_MAJOR="define OCTASPIRE_CORE_CONFIG_VERSION_MAJOR"
+ STR_MINOR="define OCTASPIRE_CORE_CONFIG_VERSION_MINOR"
+ STR_PATCH="define OCTASPIRE_CORE_CONFIG_VERSION_PATCH"
+ 
+ MAJOR=$(grep "$STR_MAJOR" "$CONFIG_FILE" | awk '{ print $3 }' | sed s/\"//g)
+ MINOR=$(grep "$STR_MINOR" "$CONFIG_FILE" | awk '{ print $3 }' | sed s/\"//g)
+ PATCH=$(grep "$STR_PATCH" "$CONFIG_FILE" | awk '{ print $3 }' | sed s/\"//g)
+ 
+ echo "Tag version $MAJOR.$MINOR.$PATCH"
+ git tag -a "v$MAJOR.$MINOR.$PATCH" -m "Core version $MAJOR.$MINOR.$PATCH"

M dev/include/octaspire/core/octaspire_core_config.h => dev/include/octaspire/core/octaspire_core_config.h +2 -2
@@ 18,8 18,8 @@ #define OCTASPIRE_CORE_CONFIG_H
  
  #define OCTASPIRE_CORE_CONFIG_VERSION_MAJOR "0"
- #define OCTASPIRE_CORE_CONFIG_VERSION_MINOR "117"
- #define OCTASPIRE_CORE_CONFIG_VERSION_PATCH "4"
+ #define OCTASPIRE_CORE_CONFIG_VERSION_MINOR "118"
+ #define OCTASPIRE_CORE_CONFIG_VERSION_PATCH "0"
  
  #define OCTASPIRE_CORE_CONFIG_VERSION_STR "Octaspire Core version " \
      OCTASPIRE_CORE_CONFIG_VERSION_MAJOR "." \

M release/octaspire-core-amalgamated.c => release/octaspire-core-amalgamated.c +2 -2
@@ 144,8 144,8 @@ #define OCTASPIRE_CORE_CONFIG_H
  
  #define OCTASPIRE_CORE_CONFIG_VERSION_MAJOR "0"
- #define OCTASPIRE_CORE_CONFIG_VERSION_MINOR "117"
- #define OCTASPIRE_CORE_CONFIG_VERSION_PATCH "4"
+ #define OCTASPIRE_CORE_CONFIG_VERSION_MINOR "118"
+ #define OCTASPIRE_CORE_CONFIG_VERSION_PATCH "0"
  
  #define OCTASPIRE_CORE_CONFIG_VERSION_STR "Octaspire Core version " \
      OCTASPIRE_CORE_CONFIG_VERSION_MAJOR "." \