Changeset 727 for branches


Ignore:
Timestamp:
Jun 27, 2014, 4:48:54 PM (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fault_tolerance/softs/tsar_boot/Makefile

    r724 r727  
    9090all: $(TARGET)
    9191
    92 $(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) version version.sh
     92$(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) VERSION version.sh
    9393        $(ECHO) "[version.sh]"
    9494        ./version.sh > $(BUILD_DIR)/version.c
     
    143143        $(DU) -D $@ > $@.txt
    144144
    145 .SILENT:
  • branches/fault_tolerance/softs/tsar_boot/version.sh

    r724 r727  
    88
    99reporev=$(svn info 2>/dev/null)
    10 if [ $? -eq 0 ];
     10if [[ $? > 0 ]];
    1111then
    12     repotype="svn"
    13     reporev=$(echo "$reporev" | awk -F: '$1 == "Last Changed Rev" {print $2}')
    14 else
    15     repotype="git"
    16     reporev=$(git rev-parse HEAD)
     12    reporev=$(git svn info 2>/dev/null)
    1713fi
    1814
     15reporev=$(echo "$reporev" | awk -F: '$1 == "Last Changed Rev" {print $2}')
    1916printf "%s" \
    20    "const char versionstr[]=\"$n $v ($u@$h $t) ($repotype revision $reporev)\n\r\";"
     17   "const char versionstr[]=\"$n $v ($u@$h $t) (svn revision $reporev)\n\r\";"
Note: See TracChangeset for help on using the changeset viewer.