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

             push @tool_options, $_;
+        }
+    }
+    #
+    #   Validate some of the arguments
+    #   Ensure has not specified both --Prod and --Debug
+    #
+    Error ("Makeproject. Conflicting options --Debug and --Prod" )
+        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
+    #   Ensure that global --OnlyProd/Debug don't prevent builds
+    $PROJECTS{$proj}{'Debug'} = 1 if ($ScmBuildType eq 'D');
+    $PROJECTS{$proj}{'Prod'} = 1 if ($ScmBuildType eq 'P');
+    Error ("Makeproject. Global and Local options --Debug and --Prod prevent project being built" )
+        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
+    #
     #   Save the information
+    #
     $PROJECTS{$proj}{'options'} = \@tool_options;
     $PROJECTS{$proj}{'name'} = $proj;
     $PROJECTS{$proj}{'project'} = $project;
     $PROJECTS{$proj}{'basedir'} = $basedir;
     $PROJECTS{$proj}{'unittest'} = $unit_tests if ( $unit_tests );
     $PROJECTS{$proj}{'autotest'} = $auto_tests if ( $auto_tests );
     UniquePush (\@PROJECTS_ORDER, $proj);
-    #
-    #   Validate some of the arguments
-    #
-    Error ("Makeproject. Conflicting options --Debug and --Prod" )
-        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
+}
 #-------------------------------------------------------------------------------
 # Function        : _PackageFromProject
+#

Subversion Repositories DevTools