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

This reapplies commit 236f815.

Change-Id: Ia0f9d188647d5943b2c8b3550c58d335c36b6424

diff --git a/org.tizen.dynamicanalyzer.cli/.classpath b/org.tizen.dynamicanalyzer.cli/.classpath
index 600f714..8909a43 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/.classpath
+++ b/org.tizen.dynamicanalyzer.cli/.classpath
@@ -12,13 +12,5 @@
        <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 4c6d521..d5b405e 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/build.xml
+++ b/org.tizen.dynamicanalyzer.cli/build.xml
@@ -12,9 +12,6 @@
     <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" />
@@ -29,14 +26,6 @@
         <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}" />
@@ -51,11 +40,6 @@
             <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
deleted file mode 100644 (file)
index 3b1e6bd..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/hsqldb.jar and /dev/null 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
deleted file mode 100644 (file)
index 66347a6..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/json-simple-1.1.1.jar and /dev/null 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
deleted file mode 100644 (file)
index 3748965..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.core_5.3.1.201109151620.jar and /dev/null 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
deleted file mode 100644 (file)
index 0aea6c6..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar and /dev/null 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
deleted file mode 100644 (file)
index 8868fd6..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.cdt.dsf_2.2.0.201109151620.jar and /dev/null 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
deleted file mode 100644 (file)
index 56c93af..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar and /dev/null 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
deleted file mode 100644 (file)
index cff3207..0000000
Binary files a/org.tizen.dynamicanalyzer.cli/lib/org.eclipse.nebula.widgets.grid_1.0.0.jar and /dev/null differ

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

diff --git a/package/build.linux b/package/build.linux
index 2d61cfc..095c131 100644 (file)
--- a/package/build.linux
+++ b/package/build.linux
@@ -161,6 +161,20 @@ __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..."
@@ -215,6 +229,7 @@ build_plugins()
        __set_product_about_info
        __compose_da_dependencies
        __execute_pde_build
+       __repack_bundles
        __execute_ant_build
        __cleanup
        __restore_product_info