Changed build directory to tizen

Change-Id: I8984f027f032c26c623f8bb9b6e22c84151ceae5

diff --git a/.gitignore b/.gitignore
index cb5662f..96a5860 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,27 +31,7 @@ dali.doxy
 .libs
 *.swp
 /docs/generated/*
-/build/slp/doc
-/build/slp/.cov
+/build/tizen/doc
+/build/tizen/.cov
 /build/desktop
-/debian/build-stamp
-/debian/config.status
-/debian/libdali-toolkit-dbg.debhelper.log
-/debian/libdali-toolkit-dbg
-/debian/libdali-toolkit-dev.debhelper.log
-/debian/libdali-toolkit-dev
-/debian/libdali-toolkit.debhelper.log
-/debian/libdali-toolkit.postinst.debhelper
-/debian/libdali-toolkit.postrm.debhelper
-/debian/libdali-toolkit.substvars
-/debian/libdali-toolkit
-/debian/tmp
-/debian/files
-/debian/libdali-toolkit-dbg.substvars
-/debian/libdali-toolkit-dev.substvars
-/debian/libdali-nsplugin.debhelper.log
-/debian/libdali-nsplugin.postinst.debhelper
-/debian/libdali-nsplugin.postrm.debhelper
-/debian/libdali-nsplugin.substvars
-/debian/libdali-nsplugin
 /packaging/home*

diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh
index 98131bf..e6106ef 100755 (executable)
--- a/automated-tests/coverage.sh
+++ b/automated-tests/coverage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-( cd ../build/slp ; make cov_data )
+( cd ../build/tizen ; make cov_data )
 
 
 for i in `find . -name "*.dir"` ; do
@@ -18,7 +18,7 @@ done
 
 (
     cd .. ;
-    genhtml -o build/slp/doc/coverage `find . -name dali.info`
+    genhtml -o build/tizen/doc/coverage `find . -name dali.info`
 )
 
-echo "Coverage output: ../build/slp/doc/coverage/index.html"
+echo "Coverage output: ../build/tizen/doc/coverage/index.html"

diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh
index 3bd6b06..aedd933 100755 (executable)
--- a/automated-tests/execute.sh
+++ b/automated-tests/execute.sh
@@ -11,9 +11,7 @@ function execute
 rm -f tct*core-tests.xml
 
 # Clean up old coverage data
-if [ -d ../build/slp ] ; then
-    rm -f ../build/slp/dali-core/.libs/*.gcda
-elif [ -d ../build/tizen ] ; then
+if [ -d ../build/tizen ] ; then
     rm -f ../build/tizen/dali-core/.libs/*.gcda
 fi
 

diff --git a/build/slp/.gitignore b/build/tizen/.gitignore
similarity index 100%
rename from build/slp/.gitignore
rename to build/tizen/.gitignore

diff --git a/build/slp/Makefile.am b/build/tizen/Makefile.am
similarity index 100%
rename from build/slp/Makefile.am
rename to build/tizen/Makefile.am

diff --git a/build/slp/README b/build/tizen/README
similarity index 100%
rename from build/slp/README
rename to build/tizen/README

diff --git a/build/slp/configure.ac b/build/tizen/configure.ac
similarity index 98%
rename from build/slp/configure.ac
rename to build/tizen/configure.ac
index ed3d8bb..20810b3 100644 (file)
--- a/build/slp/configure.ac
+++ b/build/tizen/configure.ac
@@ -33,7 +33,7 @@ PKG_CHECK_MODULES(DALI, dali)
 PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
 
-DALI_TOOLKIT_CFLAGS=-DPLATFORM_SLP
+DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
 
 AC_ARG_ENABLE(exportall,
               [AC_HELP_STRING([--enable-exportall],

diff --git a/build/slp/dali-toolkit.pc.in b/build/tizen/dali-toolkit.pc.in
similarity index 100%
rename from build/slp/dali-toolkit.pc.in
rename to build/tizen/dali-toolkit.pc.in

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
similarity index 100%
rename from build/slp/dali-toolkit/Makefile.am
rename to build/tizen/dali-toolkit/Makefile.am

diff --git a/build/slp/docs/.gitignore b/build/tizen/docs/.gitignore
similarity index 100%
rename from build/slp/docs/.gitignore
rename to build/tizen/docs/.gitignore

diff --git a/build/slp/docs/Makefile.am b/build/tizen/docs/Makefile.am
similarity index 100%
rename from build/slp/docs/Makefile.am
rename to build/tizen/docs/Makefile.am

diff --git a/build/slp/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
similarity index 100%
rename from build/slp/docs/dali.doxy.in
rename to build/tizen/docs/dali.doxy.in

diff --git a/docs/README b/docs/README
index 2baf18b..7acb25f 100644 (file)
--- a/docs/README
+++ b/docs/README
@@ -1,7 +1,7 @@
 To build the documentation from a Desktop build environment
 
 On the desktop:
-- cd dali-toolkit/build/slp/docs
+- cd dali-toolkit/build/tizen/docs
 - doxygen dali.doxy
   or
   make

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 0ae01d7..cc8481d 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -61,7 +61,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
 libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/slp
+cd %{_builddir}/dali-toolkit-%{version}/build/tizen
 autoreconf --install
 DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
 DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
@@ -73,7 +73,7 @@ make %{?jobs:-j%jobs}
 ##############################
 %install
 rm -rf %{buildroot}
-cd build/slp
+cd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
 # LICENSE