Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/objects/mksource.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/mksource.pl (modified) (2 diffs)

branches/meh_branches/ppstack_test/psModules/src/objects

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

branches/meh_branches/ppstack_test/psModules/src/objects/mksource.pl

@@ -14 +14 @@
 
 # see if we can add in PS1_DV* and PS1_SV* as well...
-@cmfmodes = ("PS1_V1", 1,
+%cmfmodes = ("PS1_V1", 1,
              "PS1_V2", 2,
-             "PS1_V3", 3);
+             "PS1_V3", 3,
+             "PS1_V4", 4);
+
+print "1: $cmfmodes{1}\n";
+print "PS1_V1: $cmfmodes{'PS1_V1'}\n";
 
 open (FILE, "$template") || die "failed to open template $template\n";
@@ -50 +54 @@
 
     if ($gtMode) {
+        # print "gtMode : $line\n";
         $thisLevel = $cmfmodes{$gtMode};
         $myLevel = $cmfmodes{$cmfmode};
-        if ($thisLevel <= $myLevel) { next; }
-        $line =~ s|\@<\S*\@\s*||;
+        print "gtMode : $gtMode vs $cmfmode, $thisLevel, $myLevel\n";
+        if ($myLevel <= $thisLevel) { next; }
+        $line =~ s|\@>\S*\@\s*||;
     }
 
     if ($ltMode) {
+        # print "ltMode : $line\n";
         $thisLevel = $cmfmodes{$ltMode};
         $myLevel = $cmfmodes{$cmfmode};
-        if ($thisLevel >= $myLevel) { next; }
-        $line =~ s|\@>\S*\@\s*||;
+        print "ltMode : $ltMode vs $cmfmode, $thisLevel, $myLevel\n";
+        if ($myLevel >= $thisLevel) { next; }
+        $line =~ s|\@<\S*\@\s*||;
     }
 

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+