Changeset 5747:17e1c9dacc8f in roaraudio for roarclients

Timestamp:

11/14/12 04:32:25 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Provide a more common interface for path config.

Location:

roarclients

Files:

• Makefile (modified) (1 diff)
• roar-config.c (modified) (4 diffs)

roarclients/Makefile

@@ -90 +90 @@
         $L
 roar-config: roar-config.o
-        $(LNL)
+        $L
 roarvorbis: roarvorbis.o
         ${CC} ${LDFLAGS} -o roarvorbis roarvorbis.o $(VORBISLIBS) $(LIBS)

roarclients/roar-config.c

@@ -53 +53 @@
 }, * flags_ptr = NULL;
 
-const struct path {
- const char * name;
- const char * path;
-} paths[] = {
- {"prefix",     ROAR_PREFIX},
- {"prefix-bin", ROAR_PREFIX_BIN},
- {"prefix-lib", ROAR_PREFIX_LIB},
- {"prefix-inc", ROAR_PREFIX_INC},
- {"prefix-man", ROAR_PREFIX_MAN},
- {"prefix-pc",  ROAR_PREFIX_PC},
- {"prefix-comp-libs", ROAR_PREFIX_COMP_LIBS},
- {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS},
- {"prefix-plugins", ROAR_PREFIX_PLUGINS},
- {"prefix-buildsystem", ROAR_PREFIX_BUILDSYSTEM},
- {"<<<END>>>", NULL}
-};
-
-void print_path(const char * name) {
- size_t i;
-
- for (i = 0; i < (sizeof(paths)/sizeof(*paths)); i++) {
-  if ( !strcasecmp(name, paths[i].name) ) {
-   printf("%s\n", paths[i].path);
-   return;
-  }
- }
+void print_path(const char * name, int null_as_universal, const char * product, const char * provider) {
+ char * path = roar_libroar_get_path(name, null_as_universal, product, provider);
+ if ( path == NULL )
+  return;
+ printf("%s\n", path);
+ roar_mm_free(path);
 }
 
@@ -87 +67 @@
 
  printf(
-        "  --version          - Show version of library\n"
-        "  --path NAME        - Print path NAME\n"
-        "  --libs             - Show linker flags (-lxxx) needed to link library\n"
-        "  --cflags           - Show compiler flags needed to link library\n"
-        "  --output-pc        - Output PC format\n"
-        "  --output-normal    - Output PC format\n"
+        "  --version           - Show version of library\n"
+        "  --path NAME         - Print path NAME\n"
+        "  --product PRODUCT   - Product string for --path\n"
+        "  --provider PROVIDER - Provider string for --path\n"
+        "  --universal         - Use universal path for --path\n"
+        "  --libs              - Show linker flags (-lxxx) needed to link library\n"
+        "  --cflags            - Show compiler flags needed to link library\n"
+        "  --output-pc         - Output PC format\n"
+        "  --output-normal     - Output PC format\n"
        );
 
@@ -101 +84 @@
 int main (int argc, char * argv[]) {
  enum { NORMAL, PC } mode = NORMAL;
+ int null_as_universal = 0;
+ const char * product = NULL;
+ const char * provider = NULL;
  int i, h;
  int cflags = 0;
@@ -117 +103 @@
    usage();
    return 0;
+  } else if ( !strcmp(argv[i], "--product") ) {
+   product = argv[++i];
+  } else if ( !strcmp(argv[i], "--provider") ) {
+   provider = argv[++i];
+  } else if ( !strcmp(argv[i], "--universal") ) {
+   null_as_universal = 1;
   } else if ( !strcmp(argv[i], "--path") ) {
-   print_path(argv[++i]);
+   print_path(argv[++i], null_as_universal, product, provider);
   } else if ( !strcmp(argv[i], "--libs") ) {
    libs   = 1;