Changeset 727 for branches/fault_tolerance

Timestamp:

Jun 27, 2014, 4:48:54 PM (11 years ago)

Author:

cfuguet

Message:

tsar_boot: version.sh

• When using git svn, display git svn info version instead of git revision hashcode

Location:

branches/fault_tolerance/softs/tsar_boot

Files:

• Makefile (modified) (2 diffs)
• version.sh (modified) (1 diff)

branches/fault_tolerance/softs/tsar_boot/Makefile

@@ -90 +90 @@
 all: $(TARGET)
 
-$(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) version version.sh
+$(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) VERSION version.sh
         $(ECHO) "[version.sh]"
         ./version.sh > $(BUILD_DIR)/version.c
@@ -143 +143 @@
         $(DU) -D $@ > $@.txt
 
-.SILENT:

branches/fault_tolerance/softs/tsar_boot/version.sh

@@ -8 +8 @@
 
 reporev=$(svn info 2>/dev/null)
-if [ $? -eq 0 ];
+if [[ $? > 0 ]];
 then
-    repotype="svn"
-    reporev=$(echo "$reporev" | awk -F: '$1 == "Last Changed Rev" {print $2}')
-else
-    repotype="git"
-    reporev=$(git rev-parse HEAD)
+    reporev=$(git svn info 2>/dev/null)
 fi
 
+reporev=$(echo "$reporev" | awk -F: '$1 == "Last Changed Rev" {print $2}')
 printf "%s" \
-   "const char versionstr[]=\"$n $v ($u@$h $t) ($repotype revision $reporev)\n\r\";"
+   "const char versionstr[]=\"$n $v ($u@$h $t) (svn revision $reporev)\n\r\";"