From 5f6b79e7f4df8cec01e5f7529fc109003dd04511 Mon Sep 17 00:00:00 2001 From: Alcaro Date: Tue, 26 Sep 2017 01:05:43 +0200 Subject: [PATCH] Merge version.h, dist-cores.sh and version.all --- Makefile.openpandora | 2 +- Makefile.ps3 | 2 +- Makefile.ps3.cobra | 2 +- Makefile.psl1ght | 2 +- Makefile.version | 1 - dist-scripts/dist-cores.sh | 2 +- version.all | 13 +++++++++++++ version.h | 4 +--- 8 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 Makefile.version create mode 100644 version.all diff --git a/Makefile.openpandora b/Makefile.openpandora index 4a72fbb9f1..a17adf5afc 100644 --- a/Makefile.openpandora +++ b/Makefile.openpandora @@ -1,4 +1,4 @@ -include Makefile.version +include version.all DEBUG = 0 diff --git a/Makefile.ps3 b/Makefile.ps3 index 0ab0467f59..3e2771193c 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -1,4 +1,4 @@ -include Makefile.version +include version.all #which compiler to build with - GCC or SNC #set to GCC for debug builds for use with debugger diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra index d1ae13b3ad..17cd151fa2 100644 --- a/Makefile.ps3.cobra +++ b/Makefile.ps3.cobra @@ -1,4 +1,4 @@ -include Makefile.version +include version.all #which compiler to build with - GCC or SNC #set to GCC for debug builds for use with debugger diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 0ed9ffdd1e..d619e64b82 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -1,4 +1,4 @@ -include Makefile.version +include version.all DEBUG = 0 HAVE_LOGGER = 0 diff --git a/Makefile.version b/Makefile.version deleted file mode 100644 index 9af223c1cc..0000000000 --- a/Makefile.version +++ /dev/null @@ -1 +0,0 @@ -RARCH_VERSION = "1.6.7.0" diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh index dd708f539b..d1fafaafab 100755 --- a/dist-scripts/dist-cores.sh +++ b/dist-scripts/dist-cores.sh @@ -1,6 +1,6 @@ #!/bin/sh -RARCH_VERSION=1.6.7 +source ../version.all PLATFORM=$1 SALAMANDER=no MAKEFILE_GRIFFIN=no diff --git a/version.all b/version.all new file mode 100644 index 0000000000..7b71569142 --- /dev/null +++ b/version.all @@ -0,0 +1,13 @@ +# /* this file is a polyglot: it's valid C, Makefile and shell */ +# /* this reduces the number of files to update when changing the version */ +# /* files to change to update version: */ +# /* - this one, obviously */ +# /* - version.dtd */ +# /* - pkg/snap/snapcraft.yaml (including the github url) */ + +#if 0 +RARCH_VERSION="1.6.7" +#endif +#ifndef PACKAGE_VERSION +#define PACKAGE_VERSION "1.6.7" +#endif diff --git a/version.h b/version.h index e10de54d6a..e4304b615b 100644 --- a/version.h +++ b/version.h @@ -17,8 +17,6 @@ #ifndef RARCH_VERSION_H__ #define RARCH_VERSION_H__ -#ifndef PACKAGE_VERSION -#define PACKAGE_VERSION "1.6.7" -#endif +#include "version.all" #endif