summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet2018-01-22 10:27:23 +0100
committerblotus2018-01-22 10:27:23 +0100
commitcb613937dceda3e9768b96a67e2a6b6cad800c24 (patch)
treef03883e3738ee47144aa434028a92d29cb97833d
parentc166a9ff5b7213276a3c14e00a9ba7f0ede98186 (diff)
switch to commonly used version schema (#136)
* switch to commonly used version schema * update release process
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--Makefile1
-rw-r--r--src/php_snuffleupagus.h3
3 files changed, 4 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf8d7e5..13130f5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -120,7 +120,7 @@ Any maintainer is allowed to merge a PR if all of these conditions are met.
120Maintainers need to do the following to push out a release: 120Maintainers need to do the following to push out a release:
121 121
1221. Make sure that all pending and mergeable pull requests are in 1221. Make sure that all pending and mergeable pull requests are in
1232. Update the `snuffleupagus.h` file with the new version number 1232. Update the `snuffleupagus.h` file: drop the -dev suffix and check new version comply with [semantic versioning](https://semver.org/)
1243. Update the changelog page in the documentation 1243. Update the changelog page in the documentation
1254. Update the Debian changelog in ./debian/changelog with `dch` 1254. Update the Debian changelog in ./debian/changelog with `dch`
1265. Create a tag for the release: 1265. Create a tag for the release:
@@ -136,4 +136,5 @@ Maintainers need to do the following to push out a release:
136 ``` 136 ```
137 137
1386. Create the [release on github](https://github.com/nbs-system/snuffleupagus/releases) 1386. Create the [release on github](https://github.com/nbs-system/snuffleupagus/releases)
1397. Do the *secret release dance* 1397. Update the `snuffleupagus.h` file: bump the version 3rd digit and add the -dev suffix
1408. Do the *secret release dance*
diff --git a/Makefile b/Makefile
index afde6b6..8470588 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ clean: ## clean everything
6 cd src; phpize --clean 6 cd src; phpize --clean
7 7
8release: ## compile with releases flags 8release: ## compile with releases flags
9 sed -i "s/#define PHP_SNUFFLEUPAGUS_COMMIT \"\"/#define PHP_SNUFFLEUPAGUS_COMMIT \"($$(git log --pretty=format:'%h' -n 1))\"/" ./src/php_snuffleupagus.h
10 cd src; phpize 9 cd src; phpize
11 cd src; ./configure --enable-snuffleupagus 10 cd src; ./configure --enable-snuffleupagus
12 make -C src 11 make -C src
diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index eea1c9e..95f271d 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -1,8 +1,7 @@
1#ifndef PHP_SNUFFLEUPAGUS_H 1#ifndef PHP_SNUFFLEUPAGUS_H
2#define PHP_SNUFFLEUPAGUS_H 2#define PHP_SNUFFLEUPAGUS_H
3 3
4#define PHP_SNUFFLEUPAGUS_COMMIT "" 4#define PHP_SNUFFLEUPAGUS_VERSION "0.2.1-dev"
5#define PHP_SNUFFLEUPAGUS_VERSION "0.2 " PHP_SNUFFLEUPAGUS_COMMIT
6#define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus" 5#define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus"
7#define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System" 6#define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System"
8#define PHP_SNUFFLEUPAGUS_URL "https://github.com/nbs-system/snuffleupagus" 7#define PHP_SNUFFLEUPAGUS_URL "https://github.com/nbs-system/snuffleupagus"