Enabled full version string inlining and build type distinction in core manifest.plist.

The macro OO_VERSION_FULL is set to contain the full version string right off the GNUmakefile build command. The full version string is now set under the version key in the core manifest.plist. Additionally, the build type is now also inlined in the core manifest.plist under the key debug_functionality_disabled, which takes a yes/no value depending on whether we are building deployment or not.

Author: AnotherCommander

GNUmakefile

@@ -11,6 +11,22 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
 endif
 GNUSTEP_OBJ_DIR_BASENAME         := $(GNUSTEP_OBJ_DIR_NAME)
 
+VERSION                          := $(shell cat src/Cocoa/oolite-version.xcconfig | cut -d '=' -f 2)
+VER_MAJ                          := $(shell echo $(VERSION) | cut -d. -f1)
+VER_MIN                          := $(shell echo $(VERSION) | cut -d. -f2)
+VER_REV                          := $(shell echo $(VERSION) | cut -d. -f3)
+ifeq ($(VER_REV),)
+    VER_REV                       = 0
+endif
+VER_DATE                         := $(shell date +%y%m%d)
+VER_GITREV                       := $(shell git rev-list --count HEAD)
+VER_GITHASH                      := $(shell git rev-parse --short=7 HEAD)
+VER_FULL                         := $(VER_MAJ).$(VER_MIN).$(VER_REV).$(VER_GITREV)-$(VER_DATE)-$(VER_GITHASH)
+
+ifeq ($(DEPLOYMENT_RELEASE_CONFIGURATION),)
+DEPLOYMENT_RELEASE_CONFIGURATION := no
+endif
+
 ifeq ($(GNUSTEP_HOST_OS),mingw32)
 	vpath %.rc src/SDL/OOResourcesWin
 
@@ -104,8 +120,8 @@ endif
 
 # add specific flags if building modern
 ifeq ($(modern),yes)
-    ADDITIONAL_CFLAGS        += -DOOLITE_MODERN_BUILD=1 
-    ADDITIONAL_OBJCFLAGS     += -DOOLITE_MODERN_BUILD=1 
+    ADDITIONAL_CFLAGS        += -DOOLITE_MODERN_BUILD=1 -DOO_VERSION_FULL=\"$(VER_FULL)\" 
+    ADDITIONAL_OBJCFLAGS     += -DOOLITE_MODERN_BUILD=1 -DOO_VERSION_FULL=\"$(VER_FULL)\" 
 #   link time optimizations
     ifeq ($(lto),yes)
         ADDITIONAL_CFLAGS        += -flto

GNUmakefile.postamble

@@ -9,11 +9,13 @@ POST_BUILD_ENV = \
 	GNUSTEP_HOST_CPU="$(GNUSTEP_HOST_CPU)" \
 	MINGW_PREFIX="$(MINGW_PREFIX)" \
 	DEBUG="$(debug)" \
+	DEPLOYMENT_RELEASE_CONFIGURATION="$(DEPLOYMENT_RELEASE_CONFIGURATION)" \
 	MODERN="$(modern)" \
 	ESPEAK="$(ESPEAK)" \
 	USE_DEPS="$(use_deps)" \
 	STRIP_BIN="$(strip)" \
-	STRIP="$(STRIP)"
+	STRIP="$(STRIP)" \
+	VER_FULL="$(VER_FULL)"
 
 after-all::
 	@$(POST_BUILD_ENV) ShellScripts/common/post_build.sh

src/SDL/main.m

@@ -49,6 +49,11 @@
 uint32_t gDebugFlags = 0;
 #endif
 
+// This macro is normally defined in the build command
+#ifndef OO_VERSION_FULL
+#define OO_VERSION_FULL	"Undefined"
+#endif
+
 /**
  * \ingroup cli
  * Entry point for Linux and Windows systems.
@@ -186,6 +191,7 @@ int main(int argc, char *argv[])
 							"--xml"TABS3 TABS4"When compiling or exporting\n"TABS3 TABS4"system descriptions, use xml\n"TABS3 TABS4"format *\n"
 							"\n"
 							"Options marked with \"*\" are available only in Test Release configuration.\n"
+							"Version "OO_VERSION_FULL"\n"
 							"Built with "
 #if OOLITE_HAVE_CLANG
 							"Clang version " STRINGIFY(__clang_major__) "." STRINGIFY(__clang_minor__) "." STRINGIFY(__clang_patchlevel__)

tools/mkmanifest.sh

@@ -18,7 +18,9 @@ echo "{"
 echo "	title = \"Oolite core\";"
 echo "	identifier = \"org.oolite.oolite\";"
 echo "	"
-echo "	version = \"$OOLITE_VERSION\";"
+# echo "	version = \"$OOLITE_VERSION\";"
+echo "	version = \"$VER_FULL\";"
+echo "	debug_functionality_disabled = \"$DEPLOYMENT_RELEASE_CONFIGURATION\";"
 echo "	required_oolite_version = \"$OOLITE_VERSION\";"
 echo "	"
 echo "	license = \"GPL 2+ / CC-BY-NC-SA 3.0 - see LICENSE.md for details\";"