--- a/buildframework/helium/sf/java/legacy/src/com/nokia/ant/HeliumLogger.java	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/java/legacy/src/com/nokia/ant/HeliumLogger.java	Fri Aug 13 14:59:05 2010 +0300
@@ -44,9 +44,11 @@
 public class HeliumLogger extends DefaultLogger {
 
     private static boolean stopLogToConsole;
+    private static final String INTERNALPROPERTY = "internal.";
 
     private Project project;
     private Logger log = Logger.getLogger(this.getClass());
+    
 
 
     /**
@@ -78,13 +80,28 @@
         /**if the target is not going to execute (due to 'if' or 'unless' conditions) 
         print a message telling the user why it is not going to execute**/
         if (!testIfCondition(ifCondition) && ifCondition != null) {
-            project.log("Skipped because property '"
-                + project.replaceProperties(ifCondition)
-                + "' not set.", Project.MSG_INFO);
+            if (ifCondition.startsWith(INTERNALPROPERTY)) {
+                String enableProperty = ifCondition.substring(INTERNALPROPERTY.length());
+                project.log("Skipped because property '"
+                        + enableProperty
+                        + "' not set to 'true'.", Project.MSG_INFO);
+            } else {
+                project.log("Skipped because property '"
+                        + project.replaceProperties(ifCondition)
+                        + "' is not set.", Project.MSG_INFO);
+            }
+            
         } else if (!testUnlessCondition(unlessCondition) && unlessCondition != null) {
-            project.log("Skipped because property '"
-                + project.replaceProperties(unlessCondition)
-                + "' set.", Project.MSG_INFO);
+            if (unlessCondition.startsWith(INTERNALPROPERTY)) {
+                String enableProperty = unlessCondition.substring(INTERNALPROPERTY.length());
+                project.log("Skipped because property '"
+                        + enableProperty
+                        + "' is set.", Project.MSG_INFO);
+            } else {
+                project.log("Skipped because property '"
+                        + project.replaceProperties(unlessCondition)
+                        + "' set.", Project.MSG_INFO);
+            }
         }
     }
 
@@ -129,17 +146,18 @@
      * See if build needs a final cleanup target to be called.
      */
     private void cleanup() {
-        String loggingoutputfile = project.getProperty("logging.output.file");
-        if (loggingoutputfile != null) {
-            File file = new File(loggingoutputfile);
-            if (file.exists()) {
-                file.delete();
+        if (project != null) {
+            String loggingoutputfile = project.getProperty("logging.output.file");
+            if (loggingoutputfile != null) {
+                File file = new File(loggingoutputfile);
+                if (file.exists()) {
+                    file.delete();
+                }
             }
-        }
-
-        if ((project.getProperty("call.cleanup") != null)
-                && (project.getProperty("call.cleanup").equals("yes"))) {
-            project.executeTarget("cleanup-all");
+            if ((project.getProperty("call.cleanup") != null)
+                    && (project.getProperty("call.cleanup").equals("yes"))) {
+                project.executeTarget("cleanup-all");
+            }
         }
     }