Revert "SRADA-1011: repackaging script integrated in DIBS build"

This reverts commit 236f8154a4d86618411e38c2223f0271b00c7705.

Change-Id: I4528683701bee75db04a100ae690fb2b8623fed5

diff --git a/org.tizen.dynamicanalyzer.cli/.classpath b/org.tizen.dynamicanalyzer.cli/.classpath
index 8909a43..600f714 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/.classpath
+++ b/org.tizen.dynamicanalyzer.cli/.classpath
@@ -12,5 +12,13 @@
        <classpathentry combineaccessrules="false" kind="src" path="/org.tizen.dynamicanalyzer.common"/>
        <classpathentry combineaccessrules="false" kind="src" path="/org.tizen.dynamicanalyzer.workbench"/>
        <classpathentry kind="lib" path="lib/commons-cli-1.3.1.jar"/>
+       <classpathentry kind="lib" path="lib/hsqldb.jar"/>
+       <classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
+       <classpathentry kind="lib" path="lib/org.eclipse.cdt.core_5.3.1.201109151620.jar"/>
+       <classpathentry kind="lib" path="lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar"/>
+       <classpathentry kind="lib" path="lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar"/>
+       <classpathentry kind="lib" path="lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar"/>
+       <classpathentry kind="lib" path="lib/org.eclipse.nebula.widgets.grid_1.0.0.jar"/>
+       <classpathentry kind="lib" path="lib/protobuf.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.tizen.dynamicanalyzer.cli/build.xml b/org.tizen.dynamicanalyzer.cli/build.xml
index d5b405e..4c6d521 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/build.xml
+++ b/org.tizen.dynamicanalyzer.cli/build.xml
@@ -12,6 +12,9 @@
     <property name="libjars.dir"      location="${build.dir}/plugins" />
     <property name="jar.dest"         location="${build.dir}/${ant.project.name}.jar" />
     <property name="dacli.lib.dir"    value="${libjars.dir}/org.tizen.dynamicanalyzer.cli/lib" />
+    <property name="common.lib.dir"   value="${libjars.dir}/org.tizen.common" />
+    <fileset  id="common.jar.fileset" dir="${libjars.dir}" includes="org.tizen.common_*.jar"/>
+    <property name="common.jar"       location="${libjars.dir}/${toString:common.jar.fileset}" />
     <property name="test.classes.dir" location="test/bin/classes" />
     <property name="test.src.dir"     location="test/src" />
     <property name="test.report.dir"  location="test/report" />
@@ -26,6 +29,14 @@
         <fileset dir="lib" />
     </copy>
 
+    <mkdir dir="${common.lib.dir}" />
+    <unzip src="${common.jar}" dest="${common.lib.dir}">
+        <patternset>
+            <include name="lib/*.jar" />
+            <exclude name="lib/ant.jar" />
+        </patternset>
+    </unzip>
+
     <target name="clean">
         <delete file="${build.dir}/${ant.project.name}.jar" />
         <delete dir="${classes.dir}" />
@@ -40,6 +51,11 @@
             <exclude name="**/junit*.jar" />
         </fileset>
 
+        <fileset dir="${common.lib.dir}">
+            <include name="**/*.jar" />
+            <exclude name="**/ant.jar" />
+        </fileset>
+
         <dirset dir="${libjars.dir}" includes="org.tizen.dynamicanalyzer.workbench_*" />
 
         <fileset dir="${dacli.lib.dir}">

diff --git a/org.tizen.dynamicanalyzer.cli/lib/hsqldb.jar b/org.tizen.dynamicanalyzer.cli/lib/hsqldb.jar
new file mode 100644 (file)
index 0000000..3b1e6bd
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/hsqldb.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/json-simple-1.1.1.jar b/org.tizen.dynamicanalyzer.cli/lib/json-simple-1.1.1.jar
new file mode 100644 (file)
index 0000000..66347a6
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/json-simple-1.1.1.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.core_5.3.1.201109151620.jar b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.core_5.3.1.201109151620.jar
new file mode 100644 (file)
index 0000000..3748965
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.core_5.3.1.201109151620.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar
new file mode 100644 (file)
index 0000000..0aea6c6
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar
new file mode 100644 (file)
index 0000000..8868fd6
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar
new file mode 100644 (file)
index 0000000..56c93af
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.nebula.widgets.grid_1.0.0.jar b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.nebula.widgets.grid_1.0.0.jar
new file mode 100644 (file)
index 0000000..cff3207
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.nebula.widgets.grid_1.0.0.jar differ

diff --git a/org.tizen.dynamicanalyzer.cli/lib/protobuf.jar b/org.tizen.dynamicanalyzer.cli/lib/protobuf.jar
new file mode 100644 (file)
index 0000000..be6164f
Binary files /dev/null and b/org.tizen.dynamicanalyzer.cli/lib/protobuf.jar differ

diff --git a/package/build.linux b/package/build.linux
index b4defa0..99359c9 100644 (file)
--- a/package/build.linux
+++ b/package/build.linux
@@ -182,20 +182,6 @@ __execute_pde_build()
        fi
 }
 
-__repack_bundles()
-{
-       echo "Repack some bundles..."
-       cd ${SRCDIR}/package
-
-       to_repack="org.tizen.common org.tizen.dynamicanalyzer"
-
-       for plugin in ${to_repack}; do
-               ./bundle-repack.py -o ${build_result_path}/plugins -c lib -u -f \
-                  -b ${build_result_path}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info \
-                  ${build_result_path}/plugins/${plugin}_*
-       done
-}
-
 __execute_ant_build()
 {
        echo "Execute Ant Builder..."
@@ -251,7 +237,6 @@ build_plugins()
        __prepare_eclipse
        __compose_da_dependencies
        __execute_pde_build
-       __repack_bundles
        __execute_ant_build
        __cleanup
        __restore_product_info