CLI: Set ncli.log for log4j(windows)

Change-Id: I1070ac63139b67373a3cee8a8bacfd709487e914
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>

diff --git a/org.tizen.ncli.ide/resources/log4j-progress.xml b/org.tizen.ncli.ide/resources/log4j-progress.xml
index 5e86100..dd01198 100644 (file)
--- a/org.tizen.ncli.ide/resources/log4j-progress.xml
+++ b/org.tizen.ncli.ide/resources/log4j-progress.xml
@@ -1,46 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-       <appender name="console" class="org.apache.log4j.ConsoleAppender">
-               <param name="Target" value="System.out" />
-               <layout class="org.apache.log4j.PatternLayout">
-                       <param name="ConversionPattern" value="[%p] %F(%L) - %m%n" />
-               </layout>
-       </appender>
-       <appender name="file-appender" class="org.apache.log4j.FileAppender">
+    <appender name="console" class="org.apache.log4j.ConsoleAppender">
+        <param name="Target" value="System.out" />
+        <layout class="org.apache.log4j.PatternLayout">
+           <param name="ConversionPattern" value="[%p] %F(%L) - %m%n" />
+        </layout>
+    </appender>
+    <appender name="file-appender" class="org.apache.log4j.FileAppender">
         <param name="File" value=CLI_LOG_FILE />
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{ISO8601} [%p] %F(%L) - %m%n" />
         </layout>
     </appender>
-       <appender name="progress-console" class="org.apache.log4j.ConsoleAppender">
+    <appender name="progress-console" class="org.apache.log4j.ConsoleAppender">
         <param name="Target" value="System.out" />
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%m%n" />
         </layout>
     </appender>
-    
     <appender name="null" class="org.apache.log4j.varia.NullAppender">
     </appender>
-       
-       <logger name="NCLI_PROGRESS">
-          <level value="info"/>
-          <appender-ref ref="progress-console" />
-       </logger>
-       
-       <logger name="org.tizen.ncli.ide">
-          <level value="trace"/>
+    <logger name="NCLI_PROGRESS">
+       <level value="info"/>
+       <appender-ref ref="progress-console" />
+    </logger>
+    <logger name="org.tizen.ncli.ide">
+       <level value="trace"/>
        <appender-ref ref="file-appender" />
-       </logger>
-       
-       <logger name="org.tizen.core.ide">
+    </logger>
+    <logger name="org.tizen.core.ide">
        <level value="off"/>
        <appender-ref ref="file-appender" />
     </logger>
-       
-       
-       <root>
-               <priority value="off" />
-               <appender-ref ref="null" />
-       </root>
-</log4j:configuration>
+    <root>
+        <priority value="off" />
+        <appender-ref ref="null" />
+    </root>
+</log4j:configuration>
\ No newline at end of file

diff --git a/org.tizen.ncli.ide/resources/preset_windows.xml b/org.tizen.ncli.ide/resources/preset_windows.xml
new file mode 100644 (file)
index 0000000..0eb109a
--- /dev/null
+++ b/org.tizen.ncli.ide/resources/preset_windows.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">

diff --git a/package/new-common-cli.install.windows b/package/new-common-cli.install.windows
index 00880d7..58d4fff 100644 (file)
--- a/package/new-common-cli.install.windows
+++ b/package/new-common-cli.install.windows
@@ -2,6 +2,7 @@
 set TIZEN_SDK_INSTALL_PATH=%INSTALLED_PATH%
 set TOOLS_PATH=%TIZEN_SDK_INSTALL_PATH%\tools
 
+:: Make link file
 set TEMP_SCRIPT="%TEMP%\%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.vbs"
 set HOME_PATH=%TOOLS_PATH%\ide\bin
 set LINK_FILE=%HOME_PATH%\tizen.lnk
@@ -15,3 +16,30 @@ echo Link.Save >> %TEMP_SCRIPT%
 
 cscript /nologo %TEMP_SCRIPT%
 del %TEMP_SCRIPT%
+
+:: Set path for ncli log
+setlocal enabledelayedexpansion
+
+set NCLI_CONFIG_PATH=%TOOLS_PATH%\ide\conf-ncli
+
+set NCLI_LOG_FILE="ncli.log"
+set LOG4J_CONFIG=log4j-progress.xml
+set LOG4J_CONFIG_PATH=%NCLI_CONFIG_PATH%\%LOG4J_CONFIG%
+set PRESET_CONFIG=%NCLI_CONFIG_PATH%\preset_windows.xml
+
+set COUNT=0
+
+(for /F "delims=" %%a in (%LOG4J_CONFIG_PATH%) do (
+   set /a COUNT=!COUNT!+1
+   if !COUNT! GTR 2 (
+   set "line=%%a"
+   set "newline=!line:CLI_LOG_FILE=!"
+   if "!newline!" NEQ "!line!" (
+      set "newline=        <param name="File" value=%NCLI_LOG_FILE% />"
+   )
+   echo !newline!
+)
+)) >> %PRESET_CONFIG%
+
+del %LOG4J_CONFIG_PATH%
+ren %PRESET_CONFIG% log4j-progress.xml