Merge branch 'tizen' into mw & version up

Conflicts:
	org.tizen.dynamicanalysis.ide.eplugin/plugin.xml

Change-Id: I536b867d39cdfbf8b7b4b84d45ec5636a8f28906
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

diff --cc org.tizen.dynamicanalysis.ide.eplugin/plugin.xml
index 32271a5,800ebf3..d9be852
--- 1/org.tizen.dynamicanalysis.ide.eplugin/plugin.xml
--- 2/org.tizen.dynamicanalysis.ide.eplugin/plugin.xml
+++ b/org.tizen.dynamicanalysis.ide.eplugin/plugin.xml
@@@ -7,83 -7,8 +7,8 @@@
              class="org.tizen.dynamicanalysis.ide.eplugin.communication.ServerStartup">
        </startup>
     </extension>
-    
-    <extension point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
-          <toolChain            
-             id="org.tizen.nativecore.toolchain.sbi.gnu.da" 
-             isAbstract="false"            
-             superClass="org.tizen.nativecore.toolchain.sbi.gnu">
-             <tool
-                id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.da" 
-                isAbstract="false" 
-                superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
-                <option
-                   category="gnu.cpp.compiler.category.other" 
-                   command="-g -pg -funwind-tables -finstrument-functions" 
-                   defaultValue="true" 
-                   id="sbi.gnu.cpp.compiler.option.misc.pic.da" 
-                   name="Dynamic Analyzer Option" 
-                   superClass="sbi.gnu.cpp.compiler.option.misc.pic.cpp" 
-                   valueType="boolean">
-                </option>
-             </tool>
-             <tool
-                id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.da" 
-                isAbstract="false" 
-                superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
-                <option
-                   category="gnu.cpp.link.category.options" 
-                   command="-pg" 
-                   defaultValue="true" 
-                   id="sbi.gnu.cpp.linker.option.da_flag.cpp" 
-                   name="Dynamic Analyzer Option"
-                                 superClass="gnu.cpp.link.option.shared"
-                                 valueHandler="org.tizen.dynamicanalysis.ide.eplugin.launch.DynamicOptionValueHandler"
-                   valueType="boolean">
-                </option>
-             </tool>
-      </toolChain>        
-          <projectType
-              buildArtefactType="org.tizen.nativecore.buildArtefactType.app" 
-             id="org.tizen.nativecore.target.sbi.gcc45.app.da">
-              <configuration
-                     buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-                    id="org.tizen.nativecore.config.sbi.gcc45.app.debug.da" 
-                    name="Dynamic Analyzer" 
-                    parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
-                 <toolChain
-                       id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.da"
-                       superClass="org.tizen.nativecore.toolchain.sbi.gnu.da">
-                 </toolChain>
-             </configuration>
-          </projectType>
-          <projectType
-                buildArtefactType="org.tizen.nativecore.buildArtefactType.app"
-                id="org.tizen.nativecore.target.sbi.gcc45.app.da.2.0">
-             <configuration
-                   id="org.tizen.nativecore.config.sbi.gcc45.app.debug.emulator.da"
-                   name="DA-Tizen-Emulator"
-                   parent="org.tizen.nativecore.config.sbi.gcc45.app.debug.emulator">
-                <toolChain
-                      id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.emulator.da"
-                      isAbstract="true"
-                      superClass="org.tizen.nativecore.toolchain.sbi.gnu.da">
-                </toolChain>
-             </configuration>
-             <configuration
-                   id="org.tizen.nativecore.config.sbi.gcc45.app.debug.device.da"
-                   name="DA-Tizen-Device"
-                   parent="org.tizen.nativecore.config.sbi.gcc45.app.debug.device">
-                <toolChain
-                      id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.device.da"
-                      isAbstract="true"
-                      superClass="org.tizen.nativecore.toolchain.sbi.gnu.da">
-                </toolChain>
-             </configuration>
-          </projectType>
-     </extension>
--    
-     <extension
++
+       <extension
          point="org.eclipse.debug.ui.launchShortcuts">
          <shortcut
                class="org.tizen.dynamicanalysis.ide.eplugin.launch.TizenNativeApplicationDAShortcut"

diff --cc package/changelog
index 1b9b335,b7a845b..bda26c8
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,9 -1,3 +1,12 @@@
++* 2.2.15
++Remove factors concerning build type "Dynamic Analyzer"
++== jungwook.ryu <jungwook.ryu@samsung.com> 2014-10-23
 +* 2.2.14
 +Exception Log(not error) print console -> write to file
 +== jungwook.ryu <jungwook.ryu@samsung.com> 2014-09-23
 +* 2.2.13
 +- Apply "Changed native template (nativcpp -> nativecore)"
 +== jungwook.ryu <jungwook.ryu@samsung.com> 2014-09-11
  * 2.2.12
  - Fix communication with DA tool proxy network environment
  == jungwook.ryu <jungwook.ryu@samsung.com> 2014-09-07

diff --cc package/pkginfo.manifest
index 1ba81e6,708050b..3b691f7
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,4 -1,4 +1,4 @@@
- Version:2.2.14
 -Version:2.2.12
++Version:2.2.15
  Source:dynamic-analysis-ide-eplugin
  Maintainer:Jungwook Ryu <jungwook.ryu@samsung.com>, Juyoung Kim <j0.kim@samsung.com>