Create a file name REVISION while creating the tar ball. This is

uesfull as soon as OpenSLX is installed from the tar ball and not from
inside the subversion.  In this case svnversion can't provide the
revision the tar ball was made from.

Only append the repository resivion to the version string if
OPENSLX_SVN_SNAPSHOT from the environment is set to _anything_ != "".


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@895 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 11 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 6e3b0b0d..85be3bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,10 @@ endif
 #packaging tool for .deb packages too.
 
 tarball:
-	@OPENSLX_SVN_SNAPSHOT=$$( echo $${OPENSLX_SVN_SNAPSHOT} | \
-		tr [:upper:] [:lower:]); \
-	case "$${OPENSLX_SVN_SNAPSHOT}" in \
-		yes|y|1) OPENSLX_VERSION_SVNREV=$$( svnversion) ;; \
-	esac; \
+	@OPENSLX_VERSION_SVNREV=$$( svnversion); \
 	. ./VERSIONS; \
+	echo "OPENSLX_VERSION_SVNREV=\"$${OPENSLX_VERSION_SVNREV}\"" \
+		>REVISION; \
 	echo "Creating OpenSLX $${OPENSLX_VERSION_STRING} tar ball "; \
 	if test -e "../openslx-$${OPENSLX_VERSION_STRING}" -a \
 	! -L "../openslx-$${OPENSLX_VERSION_STRING}"; then \
@@ -84,7 +82,8 @@ tarball:
 		"openslx-$${OPENSLX_VERSION_STRING}/"; \
 	test "$${OPENSLX_SOURCEDIR_SYMLINK_CREATED}" = "yes" && \
 		rm -f "openslx-$${OPENSLX_VERSION_STRING}"; \
-	cd - >/dev/null
+	cd - >/dev/null; \
+	rm REVISION
 
 install:
 	@echo "Checking installation requirements..."; \
@@ -202,7 +201,11 @@ functions via\n# inclusion: '. /etc/functions' ..." \
 	    > $(DESTDIR)$(SLX_CONFIG_PATH)/settings.local
 
 	@# create slxversion script:
-	@OPENSLX_VERSION_SVNREV=$$(svnversion .); \
+	@if test -e REVISION; then \
+		. REVISION; \
+	else \
+		OPENSLX_VERSION_SVNREV=$$(svnversion .); \
+	fi; \
 	. ./VERSIONS; \
 	  echo "echo $${OPENSLX_VERSION_STRING}" \
 	    > $(DESTDIR)${SLX_BIN_PATH}/slxversion
diff --git a/VERSIONS b/VERSIONS
index 85374a92..5ffddb45 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,4 +1,4 @@
 OPENSLX_VERSION_MAJOR="4"
 OPENSLX_VERSION_MINOR="0"
 OPENSLX_VERSION_RELEASE="0"
-OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_VERSION_SVNREV:+rev$OPENSLX_VERSION_SVNREV}"
+OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_SVN_SNAPSHOT:+rev$OPENSLX_VERSION_SVNREV}"