WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/makelib.pl2

 #-------------------------------------------------------------------------------
 # Function        : ActiveProject
+#
 # Description     : Determine if the specified project is currenly 'active'
+#
-# Inputs          : A list of projects. The projects may be comma seperated
+# Inputs          : $project            - one or more project names separated
+#                                         by either a comma or a colon
+#
 # Returns         : TRUE    if the project is active
+#
 sub ActiveProject
+{
     my ($project) = @_;
-    foreach (  split( '\s*,\s*', $project ) )
+    foreach (  split( '\s*[:,]\s*', $project ) )
+    {
         return 1
             if ( $_ eq $::ScmBuildProject );
+    }
     return 0;
+}
+#-------------------------------------------------------------------------------
+# Function        : ActiveDefine
+#
+# Description     : Determine if the specified definition is currenly 'active'
+#
+# Inputs          : $defs               - one or more variable names separated
+#                                         by either a comma or a colon
+#
+# Returns         : TRUE    if any of the definitions are known
+#
+sub ActiveDefine
+{
+    my ($defs) = @_;
+    no strict 'refs';
+    foreach (  split( '\s*[:,]\s*', $defs ) )
+    {
+        return 1
+            if ( defined( $$_ ) || defined( @$_ ) );
+    }
+    use strict 'refs';
+    return 0;
+}
+#-------------------------------------------------------------------------------
+# Function        : ActiveMachType
+#
+# Description     : Determine if the specified MachType is currenly 'active'
+#
+# Inputs          : $mtype              - one or more machine names separated
+#                                         by either a comma or a colon
+#
+# Returns         : TRUE    if any of the current MachType is in the list
+#
+sub ActiveMachType
+{
+    my ($mtype) = @_;
+    foreach (  split( '\s*[:,]\s*', $mtype ) )
+    {
+        return 1
+            if ( uc($_) eq uc($::GBE_MACHTYPE) );
+    }
+    return 0;
+}
 #-------------------------------------------------------------------------------
 # Function        : ActivePlatform
+#
 # Description     : Determine if the specified platform is currently 'active'
+#
 #                   Format of platform_spec. One or more of
 #                       PlatformName
 #                       AliasName
 #                       TargetName,--Target
-#                       --Project=ProjectName
-#                       --Defined=SomeValue
-#                       --MachType=SomeValue
-#                   Special markers (Must be True)
+#                   Special Options (Must all be True)
-#                       (!)++Project=ProjectName
+#                       --Project=ProjectName[:ProjectName]+
-#                       (!)++Defined=SomeValue
+#                       --Defined=SomeValue[:SomeValue]+
-#                       (!)++MachType=SomeValue
+#                       --MachType=SomeValue[:SomeValue]+
-#
-#                   Each can be prefxied with a '!' to negate the test
+#                   Each can be prefixed with a '!' to negate the test
+#
 #                   Valid options are:
 #                       --Target        - indicates that the platform is a 'target'
+#
 # Returns         : TRUE if the platform spec is satisfied
     #   Extract non-platform arguments
     #   Process to yield a dummy platform of '0' or '1' - these will be seen later
+    #
     foreach ( split( '\s*,\s*', $platform_spec ) )
+    {
-        my ($result, $mode, $not);
+        my ($result, $not);
-        if ( m~^(!?)(--|\+\+)Project=(.+)~ ) {
+        if ( m~^(!?)--Project=(.+)~ ) {
             $not = $1;
-            $mode = $2;
-            $result = ActiveProject($3);
+            $result = ActiveProject($2);
-        } elsif ( m~^(!?)(--|\+\+)Defined=(.+)~ ) {
+        } elsif ( m~^(!?)--Defined=(.+)~ ) {
             $not = $1;
-            $mode = $2;
-            $result = 0;
+            $result = ActiveDefine($2);
-            no strict 'refs';
-            $result = 1 if ( defined( $$3 ) || defined( @$3 ) );
-            use strict 'refs';
-        } elsif ( m~^(!?)(--|\+\+)MachType=(.+)~ ) {
+        } elsif ( m~^(!?)--MachType=(.+)~ ) {
             $not = $1;
-            $mode = $2;
-            $result = ( uc($3) eq uc($::GBE_MACHTYPE) );
+            $result = ActiveMachType($2);
         } else {
+            #
             #   Must be a platform argument
             #   Add to a list
+            #
             next;
+        }
+        #
         #   Continue processing non-platform arguments
-        #   If an ++ prefix, then its an AND operation so we can
-        #   terminate now if its not satisfied
+        #   Each one must be TRUE, allowing for negation.
+        #
         $result = $result ? 1 : 0;
-        if ( $mode eq '++' ) {
-            $result = ! $result if ( $not );
+        $result = ! $result if ( $not );
-            return 0 unless ( $result );
+        return 0 unless ( $result );
-        } else {
-            push @plist, "$not$result";
-        }
+    }
     #   Platform specified may be an Alias
     #   Perform alias expansion
+    #

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 343 → 345