This commit was generated by cvs2svn to compensate for changes in r3037,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=3038

3 files changed, 28 insertions, 12 deletions

diff --git a/libical/scripts/mkderivedproperties.pl b/libical/scripts/mkderivedproperties.pl
index f3c94f2cfd..010e35d178 100755
--- a/libical/scripts/mkderivedproperties.pl
+++ b/libical/scripts/mkderivedproperties.pl
@@ -56,7 +56,11 @@ if ($opt_i) {
 
   }    
 
-  print "/* Everything below this line is machine generated. Do not edit. */\n";
+  if($opt_p){
+    print "# Everything below this line is machine generated. Do not edit. \n";
+  } else {
+    print "/* Everything below this line is machine generated. Do not edit. */\n";
+  }
 
 }
 
diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl
index a0909a6d94..ca2ee4b3a1 100755
--- a/libical/scripts/mkderivedvalues.pl
+++ b/libical/scripts/mkderivedvalues.pl
@@ -32,7 +32,11 @@ if ($opt_i) {
 
   }    
 
-  print "/* Everything below this line is machine generated. Do not edit. */\n";
+  if($opt_p){
+    print "# Everything below this line is machine generated. Do not edit. \n";
+  } else {
+    print "/* Everything below this line is machine generated. Do not edit. */\n";
+  }
 
 }
 
@@ -224,9 +228,9 @@ EOM
 
 print <<EOM;
 
-package ICal::Value::${ucf}; 
-use ICal::Value;
-\@ISA=qw(ICal::Value);
+package Net::ICal::Value::${ucf}; 
+use Net::ICal::Value;
+\@ISA=qw(Net::ICal::Value);
 sub new
 {
    my \$self = [];
@@ -238,9 +242,9 @@ sub new
    my \$p;
 
    if (\$value){
-      \$p = ICal::icalvalue_new_from_string(\$ICal::ICAL_${uc}_VALUE,\$value);
+      \$p = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$value);
    } else {
-      \$p = ICal::icalvalue_new(\$ICal::ICAL_${uc}_VALUE);
+      \$p = Net::ICal::icalvalue_new(\$Net::ICal::ICAL_${uc}_VALUE);
    }
 
    \$self->[0] = \$p;
@@ -256,9 +260,9 @@ sub set
    my \$impl = \$self->_impl();
 
    if (\$v) {
-      my \$new_value = ICal::icalvalue_new_from_string(\$ICal::ICAL_${uc}_VALUE,\$v);
+      my \$new_value = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$v);
       if (\$new_value){
-         ICal::icalvalue_free(\$self->[0]);
+         Net::ICal::icalvalue_free(\$self->[0]);
           \$self->[0] = \$new_value;
       }
 
@@ -273,7 +277,7 @@ sub get
 
    if (defined \$impl){
 
-     return  ICal::icalvalue_as_ical_string(\$impl);
+     return  Net::ICal::icalvalue_as_ical_string(\$impl);
 
    }
 }
diff --git a/libical/scripts/mkrestrictiontable.pl b/libical/scripts/mkrestrictiontable.pl
index c91f3d0bc4..1dab5709b9 100755
--- a/libical/scripts/mkrestrictiontable.pl
+++ b/libical/scripts/mkrestrictiontable.pl
@@ -30,6 +30,7 @@ if ($opt_i) {
   close IN;
 }
 
+# First build the property restriction table 
 print "icalrestriction_property_record icalrestriction_property_records[] = {\n";
 
 while(<F>)
@@ -54,6 +55,7 @@ while(<F>)
 }
 
 
+# Print the terminating line 
 print "    {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_NONE}\n";
 
 print "};\n";
@@ -61,6 +63,7 @@ print "};\n";
 print "icalrestriction_component_record icalrestriction_component_records[] = {\n";
 
 
+# Go back through the entire file and build the component restriction table
 close(F);  
 open(F,"$ARGV[0]") || die "Can't open restriction data file $ARGV[0]:$!";
 
@@ -71,16 +74,21 @@ while(<F>)
 
   s/\#.*$//;
 
-  my($method,$targetcomp,$prop,$subcomp,$restr) = split(/,/,$_);
+  my($method,$targetcomp,$prop,$subcomp,$restr,$sub) = split(/,/,$_);
 
   next if !$method;
   
+  if(!$sub) {
+    $sub = "0";
+  }
+
 
     if($subcomp ne "NONE"){
-      print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${subcomp}_COMPONENT,ICAL_RESTRICTION_${restr}\},\n");
+      print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${subcomp}_COMPONENT,ICAL_RESTRICTION_${restr},$sub\},\n");
     }
 
 }
 
+# print the terminating line 
 print "    {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_NONE}\n";
 print "};\n";