Changeset 8284

Timestamp:

08/12/11 18:04:11 (6 months ago)

Author:

westram

Message:

• problem:
  • order of files in generated headers depended on the order reported by makes '$(wildcard ...)'
  • make in suse12.1 changed that order slightly
• aisc_mkpts now sorts filenames of input-files
• moved a few header promotions

Location:

trunk

Files:

• AISC_MKPTPS/mkptypes.cxx (modified) (3 diffs)
• NTREE/AP_consensus.cxx (modified) (1 diff)
• NTREE/NT_cb.cxx (modified) (1 diff)

trunk/AISC_MKPTPS/mkptypes.cxx

@@ -1480 +1480 @@
 }
 
+static int string_comparator(const void *v0, const void *v1) {
+    return strcmp(*(const char **)v0, *(const char **)v1);
+}
+
 int ARB_main(int argc, const char *argv[]) {
     FILE *f;
@@ -1652 +1656 @@
     }
     else {
+        const char *filename[1000];
+        int         fcount = 0;
 
         while (argc > 0 && *argv) {
+            filename[fcount++] = *argv;
+            argc--; argv++;
+        }
+
+        qsort(&filename, fcount, sizeof(filename[0]), string_comparator);
+
+        for (int i = 0; i<fcount; ++i) {
             DEBUG_PRINT("trying new file '");
-            DEBUG_PRINT(*argv);
+            DEBUG_PRINT(filename[i]);
             DEBUG_PRINT("'\n");
 
-            if (!(f = fopen(*argv, "r"))) {
-                perror(*argv);
+            if (!(f = fopen(filename[i], "r"))) {
+                perror(filename[i]);
                 exit(EXIT_FAILURE);
             }
@@ -1667 +1680 @@
             newline_seen = 1;
             glastc       = ' ';
-            getdecl(f, *argv);
-            argc--; argv++;
+            getdecl(f, filename[i]);
             fclose(f);
 

trunk/NTREE/AP_consensus.cxx

@@ -55 +55 @@
 #include <arbdbt.h>
 #include <arb_strbuf.h>
+
+// AISC_MKPT_PROMOTE:#ifndef AW_BASE_HXX
+// AISC_MKPT_PROMOTE:#include <aw_base.hxx>
+// AISC_MKPT_PROMOTE:#endif
 
 #define AWAR_MAX_FREQ   "tmp/CON_MAX_FREQ/"

trunk/NTREE/NT_cb.cxx

@@ -27 +27 @@
 // AISC_MKPT_PROMOTE:#include <aw_base.hxx>
 // AISC_MKPT_PROMOTE:#endif
-// AISC_MKPT_PROMOTE:
-// AISC_MKPT_PROMOTE:class AW_window;
 // AISC_MKPT_PROMOTE:class AWT_canvas;