From 5f9ab2cc2c5456f5a1f291376ca3ce5e03f98c6f Mon Sep 17 00:00:00 2001
From: Taeyoung Son <taeyoung2.son@samsung.com>
Date: Fri, 24 May 2013 21:27:53 +0900
Subject: [PATCH] [Title] Handling minify exception         Add compress
 library [Desc.] [Issue]

Change-Id: Ie003bb852d6dd6f8655e4b259d9f47857c2d62cb
---
 .../src/org/tizen/cli/exec/web/build/Main.java        | 19 +++++++++++++++----
 package/build.linux                                   |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/web/build/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/web/build/Main.java
index 0266f0d..f6855cd 100755
--- a/org.tizen.cli/src/org/tizen/cli/exec/web/build/Main.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/web/build/Main.java
@@ -55,8 +55,9 @@ import org.tizen.common.util.FileUtil;
 import org.tizen.common.util.FilenameUtil;
 import org.tizen.common.util.IOUtil;
 import org.tizen.web.builder.HybridAppCLIBuilder;
-import org.tizen.web.builder.JavaScriptMinifier;
+import org.tizen.web.builder.JSMinifier;
 import org.tizen.web.builder.UIFWBuilder;
+import org.tizen.web.builder.exception.MinifyException;
 import org.tizen.web.common.WebConstant;
 
 /**
@@ -159,6 +160,7 @@ extends AbstractLauncher
 
         if (args.size() < 1) {
             printHelp();
+            return;
         }
 
         cwd = convertPath(args.get(0));
@@ -194,7 +196,16 @@ extends AbstractLauncher
         generateBuilders(cmdLine, buildProcess, this.lastLayer);
         if (buildProcess.getLastBuilder() != null) {
             logger.debug("start build process");
-            buildProcess.build(resources);
+            try {
+                buildProcess.build(resources);
+            } catch (MinifyException e) {
+                StringBuffer msg = new StringBuffer();
+                msg.append("Optimization failed.\n");
+                msg.append("Error: "+ e.getPath()+"("+e.getLineNumber()+"): "+e.getLineSource()+"\n");
+                msg.append("Cause: "+e.getMessage()+"\n");
+                getPrompter().notify(msg.toString());
+                return;
+            }
             
             // check succeeding status.
             checkProcessComplete( buildProcess );
@@ -412,10 +423,10 @@ extends AbstractLauncher
         }
 
         // add js minify builder
-        ResourceLayer jsMinLayer = new ResourceLayer(JavaScriptMinifier.RESOURCE_LAYER_NAME
+        ResourceLayer jsMinLayer = new ResourceLayer(JSMinifier.RESOURCE_LAYER_NAME
                                                         , parentLayer
                                                         , parentLayer.getFileHandler());
-        JavaScriptMinifier jsMin = new JavaScriptMinifier(jsMinLayer);
+        JSMinifier jsMin = new JSMinifier(jsMinLayer);
         buildProcess.addBuilder(jsMin);
     }
 
diff --git a/package/build.linux b/package/build.linux
index 245a05f..733bde3 100755
--- a/package/build.linux
+++ b/package/build.linux
@@ -74,6 +74,7 @@ build()
     org.tizen.common.verrari.realm_*
     org.tizen.common.sdblib_*
     org.tizen.web.builder_*
+    org.tizen.web.compressor.minifier.core_*
     org.tizen.web.zimlaunch_*
     org.tizen.web.project.wizard_*
     org.tizen.web.sign_*
-- 
2.7.4