[or-cvs] r11319: Improve labeling of the version to use the tagging and branc (in incognito/trunk: . arch/x86)

[double at seul.org]

Author: double
Date: 2007-08-30 14:20:02 -0400 (Thu, 30 Aug 2007)
New Revision: 11319

Modified:
   incognito/trunk/arch/x86/livecd-stage2-tiny.spec
   incognito/trunk/arch/x86/livecd-stage2.spec
   incognito/trunk/livecd-stage2.sh
Log:
Improve labeling of the version to use the tagging and branching scheme.


Modified: incognito/trunk/arch/x86/livecd-stage2-tiny.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2-tiny.spec	2007-08-30 15:21:05 UTC (rev 11318)
+++ incognito/trunk/arch/x86/livecd-stage2-tiny.spec	2007-08-30 18:20:02 UTC (rev 11319)
@@ -1,5 +1,5 @@
 subarch: i686
-version_stamp: 20070824
+version_stamp: __INCOGNITO_VERSION__
 target: livecd-stage2
 rel_type: incognitotiny
 profile: default-linux/x86/2007.0
@@ -10,7 +10,7 @@
 
 livecd/fstype: squashfs
 livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.36-cdtar.tar.bz2
-livecd/iso: /var/tmp/catalyst/builds/incognito/incognitotiny-i686-20070824.iso
+livecd/iso: /var/tmp/catalyst/builds/incognito/incognitotiny-i686-__INCOGNITO_VERSION__.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1
 livecd/xdm: gentoox

Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec	2007-08-30 15:21:05 UTC (rev 11318)
+++ incognito/trunk/arch/x86/livecd-stage2.spec	2007-08-30 18:20:02 UTC (rev 11319)
@@ -1,5 +1,5 @@
 subarch: i686
-version_stamp: 20070824
+version_stamp: __INCOGNITO_VERSION__
 target: livecd-stage2
 rel_type: incognito
 profile: default-linux/x86/2007.0
@@ -10,7 +10,7 @@
 
 livecd/fstype: squashfs
 livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.36-cdtar.tar.bz2
-livecd/iso: /var/tmp/catalyst/builds/incognito/incognito-i686-20070824.iso
+livecd/iso: /var/tmp/catalyst/builds/incognito/incognito-i686-__INCOGNITO_VERSION__.iso
 livecd/splash_type: gensplash
 livecd/splash_theme: livecd-2006.1
 livecd/xdm: kdm

Modified: incognito/trunk/livecd-stage2.sh
===================================================================
--- incognito/trunk/livecd-stage2.sh	2007-08-30 15:21:05 UTC (rev 11318)
+++ incognito/trunk/livecd-stage2.sh	2007-08-30 18:20:02 UTC (rev 11319)
@@ -1,4 +1,4 @@
-v!/bin/sh
+#!/bin/sh
 
 # Build a livecd-stage2 ensuring the .svn directories don't make it on
 
@@ -39,31 +39,37 @@
 	sed -i "s/livecd\/root_overlay:.*/livecd\/root_overlay: ${DIR//\//\\/}\/root_overlay/" "${DIR}/livecd-stage2.spec"
 fi
 
-# Remove SVN directories
-find "${DIR}" -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
-
 # Do branding replacement
 # TODO: Get these two from somewhere else
 INCOGNITO="Incognito"
 INCOGNITO_TITLE="Incognito CD/USB"
+INCOGNITO_VERSION="custom"
 
 # Add revision
 SVN_URL="$(svn info --xml 2>/dev/null | grep url | sed 's/<url>\(.*\)<\/url>/\1/')"
-grep trunk <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion)"
+grep trunk >/dev/null <<EOF && INCOGNITO_VERSION="trunk" && INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion)"
 ${SVN_URL}
 EOF
-grep tags <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} $(basename ${SVN_URL})"
+grep tags  >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION}"
 ${SVN_URL}
 EOF
-grep branches <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} $(basename ${SVN_URL}) r$(svnversion)"
+grep branches >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION} r$(svnversion)"
 ${SVN_URL}
 EOF
 
-export INCOGNITO INCOGNITO_TITLE
+echo "========"
+echo "Building: ${INCOGNITO_TITLE}"
+echo "========"
 
+export INCOGNITO INCOGNITO_TITLE INCOGNITO_VERSION
+
+# Remove SVN directories
+find "${DIR}" -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
+
 find "${DIR}" -type f | while read FILE; do
 	sed -i "s/__INCOGNITO__/${INCOGNITO//\//\/}/" "${FILE}"
 	sed -i "s/__INCOGNITO_TITLE__/${INCOGNITO_TITLE//\//\/}/" "${FILE}"
+	sed -i "s/__INCOGNITO_VERSION__/${INCOGNITO_VERSION//\//\/}/" "${FILE}"
 done
 
 # Build it