[Title] sdblib dependency fixed

[Desc.] sdblib dependency fixed
[Issue] -

diff --git a/builder/build.properties.clean b/builder/build.properties.clean
index d47f059..93898c9 100644 (file)
--- a/builder/build.properties.clean
+++ b/builder/build.properties.clean
@@ -27,7 +27,7 @@ topLevelElementId=org.tizen.dynamicanalyzer.workbench.feature
 product=/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product
 runPackager=true
 
-p2.gathering=true
+#p2.gathering=true
 
 #Set the name of the archive that will result from the product build.
 #archiveNamePrefix=
@@ -104,8 +104,8 @@ allowBinaryCycles=true
 #jnlp.configs=${configs}                       #uncomment to filter the content of the generated jnlp files based on the configuration being built
 
 #Set to true if you want to sign jars
-jarProcessor.unsign=true
-signJars=true
+#jarProcessor.unsign=true
+#signJars=true
 #sign.alias=<alias>
 #sign.keystore=<keystore location>
 #sign.storepass=<keystore password>

diff --git a/org.tizen.dynamicanalyzer.workbench.feature/feature.xml b/org.tizen.dynamicanalyzer.workbench.feature/feature.xml
index 2fbba75..a8e1344 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench.feature/feature.xml
+++ b/org.tizen.dynamicanalyzer.workbench.feature/feature.xml
@@ -21,10 +21,9 @@
          id="org.eclipse.rcp"
          version="0.0.0"/>
 
- <includes    
-          id="org.eclipse.equinox.executable"    
-          version="0.0.0"/>  
-
+   <includes
+         id="org.eclipse.equinox.executable"
+         version="0.0.0"/>
 
    <plugin
          id="com.ibm.icu"
@@ -270,4 +269,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.tizen.common.sdblib"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/org.tizen.dynamicanalyzer/.classpath b/org.tizen.dynamicanalyzer/.classpath
index e431430..dc27ca6 100644 (file)
--- a/org.tizen.dynamicanalyzer/.classpath
+++ b/org.tizen.dynamicanalyzer/.classpath
@@ -9,7 +9,6 @@
        <classpathentry exported="true" kind="lib" path="lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.effects.stw.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.17.jar"/>
-       <classpathentry kind="lib" path="lib/sdblib.jar"/>
-       <classpathentry kind="lib" path="lib/org.eclipse.nebula.widgets.grid_1.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.widgets.grid_1.0.0.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
index 11c248d..481defd 100644 (file)
--- a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
+++ b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
@@ -18,8 +18,7 @@ Bundle-ClassPath: .,
  lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar,
  lib/org.eclipse.nebula.widgets.grid_1.0.0.jar,
  lib/org.eclipse.nebula.effects.stw.jar,
- lib/jcommon-1.0.17.jar,
- lib/sdblib.jar
+ lib/jcommon-1.0.17.jar
 Export-Package: org.tizen.dynamicanalyzer.common,
  org.tizen.dynamicanalyzer.communicator,
  org.tizen.dynamicanalyzer.error,
@@ -27,3 +26,4 @@ Export-Package: org.tizen.dynamicanalyzer.common,
  org.tizen.dynamicanalyzer.ui.toolbar,
  org.tizen.dynamicanalyzer.ui.widgets,
  org.tizen.dynamicanalyzer.utils
+Import-Package: org.tizen.sdblib

diff --git a/org.tizen.dynamicanalyzer/lib/sdblib.jar b/org.tizen.dynamicanalyzer/lib/sdblib.jar
deleted file mode 100644 (file)
index d541e48..0000000
Binary files a/org.tizen.dynamicanalyzer/lib/sdblib.jar and /dev/null differ

diff --git a/package/build.linux b/package/build.linux
index 46bb045..d642a2b 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -152,7 +152,7 @@ __copy_build_sources()
 
 __copy_dependency_plugins()
 {
-       dependency_plugin_path=${ROOTDIR}/${ide_root_path_name}
+       dependency_plugin_path=${ROOTDIR}/ide
        if [ -d ${dependency_plugin_path} ]
        then
                cp -rf ${dependency_plugin_path}/features/* ${build_path}/features/

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index da450e1..391b69a 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -5,34 +5,34 @@ Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim, Jooyoul lee
 Package:dynamic-analyzer-product
 OS:ubuntu-32
 Build-host-os:ubuntu-32
-Build-dependency:indigo-pde [ubuntu-32]
+Build-dependency:indigo-pde [ubuntu-32], common-eplugin [ubuntu-32]
 Install-dependency:dynamic-analysis-probe [ubuntu-32], dynamic-analysis-manager [ubuntu-32]
 Description:Make Dynamic analyzer
 
 Package:dynamic-analyzer-product
 OS:windows-32
 Build-host-os:ubuntu-32
-Build-dependency:indigo-winpde [windows-32]
+Build-dependency:indigo-winpde [windows-32], common-eplugin [windows-32]
 Install-dependency:dynamic-analysis-probe [windows-32], dynamic-analysis-manager [windows-32]
 Description:Make Dynamic analyzer
 
 Package:dynamic-analyzer-product
 OS:ubuntu-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-pde [ubuntu-64]
+Build-dependency:indigo-pde [ubuntu-64], common-eplugin [ubuntu-64]
 Install-dependency:dynamic-analysis-probe [ubuntu-64], dynamic-analysis-manager [ubuntu-64]
 Description:Make Dynamic analyzer
 
 Package:dynamic-analyzer-product
 OS:windows-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-winpde [windows-64]
+Build-dependency:indigo-winpde [windows-64], common-eplugin [windows-64]
 Install-dependency:dynamic-analysis-probe [windows-64], dynamic-analysis-manager [windows-64]
 Description:Make Dynamic analyzer
 
 Package:dynamic-analyzer-product
 OS:macos-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-macpde [macos-64]
+Build-dependency:indigo-macpde [macos-64], common-eplugin [macos-64]
 Install-dependency:dynamic-analysis-probe [macos-64], dynamic-analysis-manager [macos-64]
 Description:Make Dynamic analyzer