[Freeciv-Dev] (PR#8814) built sources out of date?

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=8814 >

When I run "make" the sources get modified.  generate_packets is being 
rerun and creating different code than what's there.

jason

? convert.sh
? eff
? flags
? data/flags
Index: common/packets_gen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets_gen.c,v
retrieving revision 1.27
diff -u -r1.27 packets_gen.c
--- common/packets_gen.c        22 May 2004 11:37:40 -0000      1.27
+++ common/packets_gen.c        22 May 2004 18:19:15 -0000
@@ -20266,7 +20266,7 @@
 
 #define cmp_packet_ruleset_unit_101 cmp_const
 
-BV_DEFINE(packet_ruleset_unit_101_fields, 35);
+BV_DEFINE(packet_ruleset_unit_101_fields, 33);
 
 static struct packet_ruleset_unit *receive_packet_ruleset_unit_101(struct 
connection *pc, enum packet_type type)
 {
@@ -20378,45 +20378,15 @@
     dio_get_uint8(&din, (int *) &real_packet->paratroopers_mr_sub);
   }
   if (BV_ISSET(fields, 29)) {
-    
-    {
-      int i;
-    
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-        dio_get_string(&din, real_packet->veteran_name[i], 
sizeof(real_packet->veteran_name[i]));
-      }
-    }
+    dio_get_uint8(&din, (int *) &real_packet->bombard_rate);
   }
   if (BV_ISSET(fields, 30)) {
-    
-    {
-      int i;
-    
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-        int tmp;
-    
-        dio_get_uint32(&din, &tmp);
-        real_packet->power_fact[i] = (float)(tmp) / 10000.0;
-      }
-    }
-  }
-  if (BV_ISSET(fields, 31)) {
-    
-    {
-      int i;
-    
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-        dio_get_uint8(&din, (int *) &real_packet->move_bonus[i]);
-      }
-    }
-  }
-  if (BV_ISSET(fields, 32)) {
     dio_get_string(&din, real_packet->helptext, sizeof(real_packet->helptext));
   }
-  if (BV_ISSET(fields, 33)) {
+  if (BV_ISSET(fields, 31)) {
     DIO_BV_GET(&din, real_packet->flags);
   }
-  if (BV_ISSET(fields, 34)) {
+  if (BV_ISSET(fields, 32)) {
     DIO_BV_GET(&din, real_packet->roles);
   }
 
@@ -20569,65 +20539,21 @@
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 28);}
 
-
-    {
-      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
-      if(!differ) {
-        int i;
-        for (i = 0; i < MAX_VET_LEVELS; i++) {
-          if (strcmp(old->veteran_name[i], real_packet->veteran_name[i]) != 0) 
{
-            differ = TRUE;
-            break;
-          }
-        }
-      }
-    }
+  differ = (old->bombard_rate != real_packet->bombard_rate);
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 29);}
 
-
-    {
-      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
-      if(!differ) {
-        int i;
-        for (i = 0; i < MAX_VET_LEVELS; i++) {
-          if (old->power_fact[i] != real_packet->power_fact[i]) {
-            differ = TRUE;
-            break;
-          }
-        }
-      }
-    }
-  if(differ) {different++;}
-  if(differ) {BV_SET(fields, 30);}
-
-
-    {
-      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
-      if(!differ) {
-        int i;
-        for (i = 0; i < MAX_VET_LEVELS; i++) {
-          if (old->move_bonus[i] != real_packet->move_bonus[i]) {
-            differ = TRUE;
-            break;
-          }
-        }
-      }
-    }
-  if(differ) {different++;}
-  if(differ) {BV_SET(fields, 31);}
-
   differ = (strcmp(old->helptext, real_packet->helptext) != 0);
   if(differ) {different++;}
-  if(differ) {BV_SET(fields, 32);}
+  if(differ) {BV_SET(fields, 30);}
 
   differ = !BV_ARE_EQUAL(old->flags, real_packet->flags);
   if(differ) {different++;}
-  if(differ) {BV_SET(fields, 33);}
+  if(differ) {BV_SET(fields, 31);}
 
   differ = !BV_ARE_EQUAL(old->roles, real_packet->roles);
   if(differ) {different++;}
-  if(differ) {BV_SET(fields, 34);}
+  if(differ) {BV_SET(fields, 32);}
 
   if (different == 0 && !force_send_of_unchanged) {
     return 0;
@@ -20723,42 +20649,15 @@
     dio_put_uint8(&dout, real_packet->paratroopers_mr_sub);
   }
   if (BV_ISSET(fields, 29)) {
-  
-    {
-      int i;
-
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-        dio_put_string(&dout, real_packet->veteran_name[i]);
-      }
-    } 
+    dio_put_uint8(&dout, real_packet->bombard_rate);
   }
   if (BV_ISSET(fields, 30)) {
-  
-    {
-      int i;
-
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-          dio_put_uint32(&dout, (int)(real_packet->power_fact[i] * 10000));
-      }
-    } 
-  }
-  if (BV_ISSET(fields, 31)) {
-  
-    {
-      int i;
-
-      for (i = 0; i < MAX_VET_LEVELS; i++) {
-        dio_put_uint8(&dout, real_packet->move_bonus[i]);
-      }
-    } 
-  }
-  if (BV_ISSET(fields, 32)) {
     dio_put_string(&dout, real_packet->helptext);
   }
-  if (BV_ISSET(fields, 33)) {
+  if (BV_ISSET(fields, 31)) {
   DIO_BV_PUT(&dout, packet->flags);
   }
-  if (BV_ISSET(fields, 34)) {
+  if (BV_ISSET(fields, 32)) {
   DIO_BV_PUT(&dout, packet->roles);
   }
 
@@ -20778,7 +20677,7 @@
 
 #define cmp_packet_ruleset_unit_102 cmp_const
 
-BV_DEFINE(packet_ruleset_unit_102_fields, 33);
+BV_DEFINE(packet_ruleset_unit_102_fields, 35);
 
 static struct packet_ruleset_unit *receive_packet_ruleset_unit_102(struct 
connection *pc, enum packet_type type)
 {
@@ -20890,15 +20789,45 @@
     dio_get_uint8(&din, (int *) &real_packet->paratroopers_mr_sub);
   }
   if (BV_ISSET(fields, 29)) {
-    dio_get_uint8(&din, (int *) &real_packet->bombard_rate);
+    
+    {
+      int i;
+    
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+        dio_get_string(&din, real_packet->veteran_name[i], 
sizeof(real_packet->veteran_name[i]));
+      }
+    }
   }
   if (BV_ISSET(fields, 30)) {
-    dio_get_string(&din, real_packet->helptext, sizeof(real_packet->helptext));
+    
+    {
+      int i;
+    
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+        int tmp;
+    
+        dio_get_uint32(&din, &tmp);
+        real_packet->power_fact[i] = (float)(tmp) / 10000.0;
+      }
+    }
   }
   if (BV_ISSET(fields, 31)) {
-    DIO_BV_GET(&din, real_packet->flags);
+    
+    {
+      int i;
+    
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+        dio_get_uint8(&din, (int *) &real_packet->move_bonus[i]);
+      }
+    }
   }
   if (BV_ISSET(fields, 32)) {
+    dio_get_string(&din, real_packet->helptext, sizeof(real_packet->helptext));
+  }
+  if (BV_ISSET(fields, 33)) {
+    DIO_BV_GET(&din, real_packet->flags);
+  }
+  if (BV_ISSET(fields, 34)) {
     DIO_BV_GET(&din, real_packet->roles);
   }
 
@@ -21051,22 +20980,66 @@
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 28);}
 
-  differ = (old->bombard_rate != real_packet->bombard_rate);
+
+    {
+      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
+      if(!differ) {
+        int i;
+        for (i = 0; i < MAX_VET_LEVELS; i++) {
+          if (strcmp(old->veteran_name[i], real_packet->veteran_name[i]) != 0) 
{
+            differ = TRUE;
+            break;
+          }
+        }
+      }
+    }
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 29);}
 
-  differ = (strcmp(old->helptext, real_packet->helptext) != 0);
+
+    {
+      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
+      if(!differ) {
+        int i;
+        for (i = 0; i < MAX_VET_LEVELS; i++) {
+          if (old->power_fact[i] != real_packet->power_fact[i]) {
+            differ = TRUE;
+            break;
+          }
+        }
+      }
+    }
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 30);}
 
-  differ = !BV_ARE_EQUAL(old->flags, real_packet->flags);
+
+    {
+      differ = (MAX_VET_LEVELS != MAX_VET_LEVELS);
+      if(!differ) {
+        int i;
+        for (i = 0; i < MAX_VET_LEVELS; i++) {
+          if (old->move_bonus[i] != real_packet->move_bonus[i]) {
+            differ = TRUE;
+            break;
+          }
+        }
+      }
+    }
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 31);}
 
-  differ = !BV_ARE_EQUAL(old->roles, real_packet->roles);
+  differ = (strcmp(old->helptext, real_packet->helptext) != 0);
   if(differ) {different++;}
   if(differ) {BV_SET(fields, 32);}
 
+  differ = !BV_ARE_EQUAL(old->flags, real_packet->flags);
+  if(differ) {different++;}
+  if(differ) {BV_SET(fields, 33);}
+
+  differ = !BV_ARE_EQUAL(old->roles, real_packet->roles);
+  if(differ) {different++;}
+  if(differ) {BV_SET(fields, 34);}
+
   if (different == 0 && !force_send_of_unchanged) {
     return 0;
   }
@@ -21161,15 +21134,42 @@
     dio_put_uint8(&dout, real_packet->paratroopers_mr_sub);
   }
   if (BV_ISSET(fields, 29)) {
-    dio_put_uint8(&dout, real_packet->bombard_rate);
+  
+    {
+      int i;
+
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+        dio_put_string(&dout, real_packet->veteran_name[i]);
+      }
+    } 
   }
   if (BV_ISSET(fields, 30)) {
-    dio_put_string(&dout, real_packet->helptext);
+  
+    {
+      int i;
+
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+          dio_put_uint32(&dout, (int)(real_packet->power_fact[i] * 10000));
+      }
+    } 
   }
   if (BV_ISSET(fields, 31)) {
-  DIO_BV_PUT(&dout, packet->flags);
+  
+    {
+      int i;
+
+      for (i = 0; i < MAX_VET_LEVELS; i++) {
+        dio_put_uint8(&dout, real_packet->move_bonus[i]);
+      }
+    } 
   }
   if (BV_ISSET(fields, 32)) {
+    dio_put_string(&dout, real_packet->helptext);
+  }
+  if (BV_ISSET(fields, 33)) {
+  DIO_BV_PUT(&dout, packet->flags);
+  }
+  if (BV_ISSET(fields, 34)) {
   DIO_BV_PUT(&dout, packet->roles);
   }
 
@@ -21595,13 +21595,13 @@
   }
 
   if(FALSE) {
-  } else if((has_capability("veteran", pc->capability) && 
has_capability("veteran", our_capability)) && (has_capability("bombard", 
pc->capability) && has_capability("bombard", our_capability))) {
+  } else if((has_capability("bombard", pc->capability) && 
has_capability("bombard", our_capability)) && (has_capability("veteran", 
pc->capability) && has_capability("veteran", our_capability))) {
     variant = 100;
-  } else if((has_capability("veteran", pc->capability) && 
has_capability("veteran", our_capability)) && !(has_capability("bombard", 
pc->capability) && has_capability("bombard", our_capability))) {
-    variant = 101;
   } else if((has_capability("bombard", pc->capability) && 
has_capability("bombard", our_capability)) && !(has_capability("veteran", 
pc->capability) && has_capability("veteran", our_capability))) {
+    variant = 101;
+  } else if((has_capability("veteran", pc->capability) && 
has_capability("veteran", our_capability)) && !(has_capability("bombard", 
pc->capability) && has_capability("bombard", our_capability))) {
     variant = 102;
-  } else if(!(has_capability("veteran", pc->capability) && 
has_capability("veteran", our_capability)) && !(has_capability("bombard", 
pc->capability) && has_capability("bombard", our_capability))) {
+  } else if(!(has_capability("bombard", pc->capability) && 
has_capability("bombard", our_capability)) && !(has_capability("veteran", 
pc->capability) && has_capability("veteran", our_capability))) {
     variant = 103;
   } else {
     die("unknown variant");