Changeset 4652:bca0fa4eabf1 in roaraudio for roard

Timestamp:

12/09/10 18:07:09 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for distri version string part

Location:

roard

Files:

• Makefile (modified) (1 diff)
• req.c (modified) (1 diff)

roard/Makefile

@@ -16 +16 @@
 #DEFINES        = -DDEBUG
 #DEFINES        = -DMONITOR_LATENCY
-PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\""
+PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" -DDISTRIBUTION_VERSION_STRING="\"$(DISTRIBUTION_VERSION_STRING)\""
 INCLUDE   = -I../include -I./include
 CFLAGS   += -g -Wall -O2 $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH)

roard/req.c

@@ -595 +595 @@
    memset(&info, 0, sizeof(info));
 
-   info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";
+   // the following if is optimized out by compiler.
+   if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {
+    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";
+   } else {
+    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")";
+   }
 
    if ( !!strcmp(g_config->location, CONF_DEF_STRING) )