convert project to Tizen 4.0

Change-Id: Ida320bfa2c9a532d2236a46039c2dabaca45895f

diff --git a/clock/.cproject b/clock/.cproject
index 981bbb93c38eb41457392cb2f4279e932629f687..0f81da67602eb720190a8853d1a2f79a8b69b6df 100644 (file)
--- a/clock/.cproject
+++ b/clock/.cproject
@@ -22,24 +22,20 @@
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.892802998" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder autoBuildTarget="all" buildPath="${workspace_loc:/clock}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.1204808108" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1608926515" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.655564352" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="i586-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.655564352" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.2127669562" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.560740604" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1289916342" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1180801303" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-4.0-emulator.core_gcc62.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.728385348" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -141,24 +137,20 @@
                                                                <option id="gnu.cpp.compiler.option.dialect.std.69724678" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.199822626" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2100102180" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="i586-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2100102180" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1483719457" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1101789042" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.207975531" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.600001807" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-4.0-emulator.core_gcc62.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.2111102001" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -261,7 +253,7 @@
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1367772119" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.127664922" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1378586237" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="i586-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1378586237" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1279887189" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.1568218794" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1706707732" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -281,7 +273,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.784950171" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="i586-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.784950171" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1097107177" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.1050341554" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
@@ -291,10 +283,10 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.1505207441" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1401781971" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1751056377" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.1681512688" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.1681512688" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/images&quot;"/>
                                                                </option>
-                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.1236753742" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList">
+                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.1236753742" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/sounds&quot;"/>
                                                                </option>
                                                        </tool>
@@ -331,33 +323,25 @@
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1532033279" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder buildPath="${workspace_loc:/clock}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.549814260" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1296644219" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1933855854" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="i586-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1933855854" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.2054731509" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.default" id="sbi.gnu.cpp.compiler.option.debugging.level.core.528013451" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.769356524" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.977246393" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core.private_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-4.0-emulator.core_gcc62.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1940012844" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/auth-fw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cbhm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
@@ -392,7 +376,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -417,24 +400,19 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui-viewmgr&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
@@ -459,33 +437,25 @@
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2115671374" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.943681896" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="i586-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.943681896" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1941787049" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.2114961681" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1440158952" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.1740904427" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core.private_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-4.0-emulator.core_gcc62.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.32910582" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/auth-fw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cbhm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
@@ -520,7 +490,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -545,24 +514,19 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui-viewmgr&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
@@ -588,7 +552,7 @@
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1126445800" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.414847091" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.2052119761" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="i586-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.2052119761" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1801951609" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.266415034" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.782229630" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -608,7 +572,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.682699775" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="i586-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.682699775" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.769911710" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.2143864082" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
@@ -618,10 +582,10 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.1949343937" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.922874542" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1868317165" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.1921346350" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.1921346350" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/images&quot;"/>
                                                                </option>
-                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.851314279" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList">
+                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.851314279" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/sounds&quot;"/>
                                                                </option>
                                                        </tool>

diff --git a/clock/.tproject b/clock/.tproject
index 56660b2fd003072244ba4be2385f2e3c27f8a780..468a8344f3f958decf4dac574e37f96713cc9e93 100644 (file)
--- a/clock/.tproject
+++ b/clock/.tproject
@@ -2,7 +2,7 @@
 <tproject xmlns="http://www.tizen.org/tproject">
     <platforms>
         <platform>
-            <name>mobile-3.0</name>
+            <name>mobile-4.0</name>
         </platform>
     </platforms>
     <package>

diff --git a/clock/Build/basedef.mk b/clock/Build/basedef.mk
index 88126243b4cb2616c7bfe9a77134d948578cdce3..a762983068f2597282350bd7d10d11e42e954bc8 100644 (file)
--- a/clock/Build/basedef.mk
+++ b/clock/Build/basedef.mk
@@ -1,24 +1,34 @@
 # Add inputs and outputs from these tool invocations to the build variables
 
-C_DEPS +=
 
-USES_EFL = yes
-USES_USR_INC = yes
+OS_NAME := $(shell $(UNAME))
 
-SYSROOT = $(SBI_SYSROOT)
 
-USR_INCS := $(addprefix -I $(SYSROOT),$(PLATFORM_INCS_EX))
-EFL_INCS = 
+#ifeq ($(origin BUILD_CONFIG), undefined)
+BUILD_CONFIG ?= Debug
+#endif
 
-ifeq ($(strip $(PLATFORM_LIB_PATHS)),)
-RS_LIB_PATHS := "$(SYSROOT)/usr/lib"
-else
-RS_LIB_PATHS := $(addprefix -L$(SYSROOT),$(PLATFORM_LIB_PATHS))
-endif
+#ifeq ($(origin ARCH), undefined)
+ARCH ?= i386
+#endif
 
-RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX))
+#ifeq ($(origin PROJPATH), undefined)
+PROJPATH ?= .
+#endif
 
-PLATFORM_INCS = $(USR_INCS) $(EFL_INCS) \
-     -I"$(SDK_PATH)/library"
 
-OS_NAME := $(shell $(UNAME))
+#ifeq ($(origin PROJ_PATH), undefined)
+PROJ_PATH ?= $(PROJPATH)
+#endif
+
+#ifeq ($(strip $(OUTPUT_DIR)),)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#endif
+
+#ifeq ($(strip $(BUILD_ARCH)),)
+BUILD_ARCH ?= $(ARCH)
+#endif
+
+#ifeq ($(strip $(ENVENTOR_PATH)),)
+ENVENTOR_PATH ?= $(SDK_TOOLPATH)/enventor
+#endif

diff --git a/clock/Build/build_c.mk b/clock/Build/build_c.mk
index 81940cdc95411448e0430969118a1934093e42ed..5fffeea1e3aa3585c73d5dd50d3cc762b9f0dda5 100644 (file)
--- a/clock/Build/build_c.mk
+++ b/clock/Build/build_c.mk
@@ -10,10 +10,11 @@ _FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp)
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - .ext
-CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1))))
+#  $(4) - unique id
+CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(notdir $(patsubst %.$(3),%-$(4).o,$(1))))
 
-CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c)
-CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
+#CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c)
+#CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
 
 
 # parameter :
@@ -27,13 +28,13 @@ CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
 # output :
 #  $(8) - output files list
 define C_BUILD_PROC_RAW
-$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7)
+$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) : $(call DECODE_4MAKE,$(1)) $(7)
        @echo '  Building file: $$<'
        @echo '  Invoking: $(3) Compiler'
        $$(call MAKEDIRS,$$(@D))
-       $(5) -c "$$<" -o "$$@" $(6) @$(7)
+       $(5) -c "$$<" -o "$$@" $(6) -Wp,@$(7)
        @echo '  Finished building: $$<'
-$(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4))
+$(9) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8))
 endef
 
 
@@ -50,17 +51,17 @@ endef
 #  $(10) - ext (c/cpp)
 #  $(11) - compiler ($(CC)/$(CXX))
 # output :
-#  $(12) - OBJS 
+#  $(12) - OBJS
 # return :
 #  none
 define C_PROC_RAW
 
 _OUTPUT_DIR := $$(strip $(1))#
-_SRCS := $(2)# 
-_INCS := $(3)# 
-_INC_FILES := $(4)# 
-_DEFS := $(5)# 
-_UNDEFS := $(6)# 
+_SRCS := $(2)#
+_INCS := $(3)#
+_INC_FILES := $(4)#
+_DEFS := $(5)#
+_UNDEFS := $(6)#
 
 _OPT := $(7)
 _OPT_FILE := $(8)
@@ -71,7 +72,7 @@ _COMPILER := $(11)
 
 #_OUTPUT_FILES := $(12)
 
-_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) 
+_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS))
 _ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS))
 
 ifneq ($$(strip $$(_SRCS)),)
@@ -84,7 +85,7 @@ _ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \
 
 ifneq ($$(strip $$(_ALL_SRCS)),)
 
-_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) 
+_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS))
 
 _CDEFS := $$(CDEFS)
 _CDEFS += $$(addprefix -D,$$(_DEFS))
@@ -92,15 +93,17 @@ _CDEFS += $$(addprefix -U,$$(_UNDEFS))
 
 _ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS))
 _ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS))
- 
-_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) 
+
+_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES))
 _ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES))
 
 _C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES))
 
 _DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT)
 
-$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12))))
+_UNIQUE_ID = $$(firstword $$(shell echo $$(var) | $$(CKSUM)))
+
+$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$$(_UNIQUE_ID),$(12))))
 
 endif  # (_(strip _(_ALL_SRCS)),)
 

diff --git a/clock/Build/build_edc.mk b/clock/Build/build_edc.mk
index 8485bb295313bb47601ede0f82c240d880515ba1..6f85fdd962ff28a7e050e95a55f53a1739935102 100644 (file)
--- a/clock/Build/build_edc.mk
+++ b/clock/Build/build_edc.mk
@@ -58,9 +58,9 @@ ifneq ($$(strip $$(_ALL_SRCS)),)
 
 _ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) 
 
-_COMPILER_FLAGS := -id "$$(_OUTPUT_DIR)" -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images"
-_COMPILER_FLAGS += -sd "$$(_OUTPUT_DIR)" -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds"
-_COMPILER_FLAGS += -fd "$$(_OUTPUT_DIR)" -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts"
+_COMPILER_FLAGS := -id "$$(ENVENTOR_SHARED_RES_PATH)/images"
+_COMPILER_FLAGS += -sd "$$(ENVENTOR_SHARED_RES_PATH)/sounds"
+_COMPILER_FLAGS += -fd "$$(ENVENTOR_SHARED_RES_PATH)/fonts"
 
 ifneq ($$(strip $$(_IMAGE_DIRS)),)
 _COMPILER_FLAGS += $$(addprefix -id ,$$(_IMAGE_DIRS))

diff --git a/clock/Build/build_po.mk b/clock/Build/build_po.mk
index 23eb0df0d090df9dd2cda04648bffdbaac3f38b3..d88d71aa611b6a388665a31ef44a7f57aefd1bd6 100644 (file)
--- a/clock/Build/build_po.mk
+++ b/clock/Build/build_po.mk
@@ -37,7 +37,7 @@ endef
 
 define MO_PROC_RAW
 
-_PROJ_ROOT := $(1)
+_OUTPUT_DIR := $(1)
 _SRCS := $(2)
 _APPNAME := $(3)
 

diff --git a/clock/Build/flags.mk b/clock/Build/flags.mk
index bd750bdf039216a4ec85aebc87d2ef75d523208b..39e3e395c782114b7732a404ac3f6856139a31eb 100644 (file)
--- a/clock/Build/flags.mk
+++ b/clock/Build/flags.mk
@@ -1,16 +1,16 @@
 
-DEBUG_OP = -g3 
-CPP_DEBUG_OP = 
+DEBUG_OP = 
+CPP_DEBUG_OP = -g3 
 
-OPTIMIZATION_OP = -O0 
-CPP_OPTIMIZATION_OP = 
+OPTIMIZATION_OP = 
+CPP_OPTIMIZATION_OP = -O0 
 
-COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0 
+COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) 
 
-CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP)  -std=c++11
+CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP) -std=c++0x -Wall -c -fmessage-length=0 
 
 LINK_FLAGS = 
 
 AR_FLAGS = 
 
-EDC_COMPILE_FLAGS = 
+EDC_COMPILE_FLAGS = 
\ No newline at end of file

diff --git a/clock/Build/funcs.mk b/clock/Build/funcs.mk
index 8297d1800ce08bf82e33bfd70ee837e22f4d745d..3ba778b3949fb7d2df9f4516fb94883b73f15a50 100644 (file)
--- a/clock/Build/funcs.mk
+++ b/clock/Build/funcs.mk
@@ -45,6 +45,6 @@ CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_
 PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1)))
 define MAKEDIRS0
        @echo '  Building directory: $(1)'
-       @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1)) 
+       @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))
 endef
 MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0)

diff --git a/clock/Build/makefile b/clock/Build/makefile
index 9348c50a450b67fd4d2d50b68ce60775d5f771bd..f491b50b962ab78873a8262f00314974b5515978 100644 (file)
--- a/clock/Build/makefile
+++ b/clock/Build/makefile
@@ -24,7 +24,7 @@ endif
 
 app_build :
        @echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk"
-       @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
+       @$(MAKE_BIN) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
 
 app_clean :
        @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean

diff --git a/clock/Build/makefile.mk b/clock/Build/makefile.mk
index 7384d248a72e6cf4305aa0dce3e4f5ec1269e55a..205a3ad3c05a62d241f9341cbc3766f2f955dcbb 100644 (file)
--- a/clock/Build/makefile.mk
+++ b/clock/Build/makefile.mk
@@ -1,8 +1,8 @@
-# 
-# Usege : make -f <proj_root>/Build/makefile -C <proj_root> 
 #
- 
-BUILD_SCRIPT_VERSION := 1.2.2
+# Usege : make -f <proj_root>/Build/makefile -C <proj_root>
+#
+
+BUILD_SCRIPT_VERSION := 1.2.3
 
 .PHONY : app_version app_clean build_version
 
@@ -14,18 +14,20 @@ clean : app_clean
 version : build_version
 
 
-#PROJ_ROOT := $(call BSLASH2SLASH,$(PROJPATH))
+#PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
 PROJ_ROOT := .
 BUILD_ROOT := $(PROJ_ROOT)/Build
 
+include $(BUILD_ROOT)/basedef.mk
+
 include $(PROJ_ROOT)/project_def.prop
 -include $(PROJ_ROOT)/build_def.prop
 
 include $(BUILD_ROOT)/funcs.mk
 
--include $(BUILD_ROOT)/basedef.mk
 -include $(BUILD_ROOT)/tooldef.mk
 -include $(BUILD_ROOT)/flags.mk
+-include $(BUILD_ROOT)/platform.mk
 
 
 APPTYPE := $(type)
@@ -63,11 +65,11 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
-OBJS := # 
+OBJS := #
 
 # Global C/C++
 ifeq ($(strip $(USER_ROOT)),)
@@ -79,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -107,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: C/C++ Linker'
        $(call MAKEDIRS,$(@D))
-       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread -Xlinker -rpath="/home/developer/sdk_tools/lib" --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -115,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: Archive utility'
        $(call MAKEDIRS,$(@D))
-       $(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+       $(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -123,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: C/C++ Linker'
        $(call MAKEDIRS,$(@D))
-       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 
@@ -134,7 +136,7 @@ $(OBJ_OUTPUT) :
 $(OUTPUT_DIR) :
        $(call MAKEDIRS,$@)
 
-  
+
 ifneq ($(strip $(PLATFORM_INCS)),)
 $(PLATFORM_INCS_FILE) : $(OBJ_OUTPUT)
        @echo '  Building inc file: $@'
@@ -143,7 +145,7 @@ ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
        $(file > $@,$(PLATFORM_INCS))
 else
        @echo $(PLATFORM_INCS) > $@
-endif    
+endif
 else
        @echo $(PLATFORM_INCS) > $@
 endif
@@ -151,7 +153,11 @@ endif
 
 
 include $(BUILD_ROOT)/build_edc.mk
- 
+
+#ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)
+ENVENTOR_SHARED_RES_PATH ?= $(ENVENTOR_PATH)/share/enventor
+#endif
+
 EDJ_FILES :=
 
 # Global EDCs

diff --git a/clock/Build/platform.mk b/clock/Build/platform.mk
new file mode 100644 (file)
index 0000000..294a38a
--- /dev/null
+++ b/clock/Build/platform.mk
@@ -0,0 +1,15 @@
+# Add inputs and outputs from these tool invocations to the build variables
+
+SYSROOT = $(SBI_SYSROOT)
+
+USR_INCS := $(addprefix -I $(SYSROOT),$(PLATFORM_INCS_EX))
+
+ifeq ($(strip $(PLATFORM_LIB_PATHS)),)
+RS_LIB_PATHS := "$(SYSROOT)/usr/lib"
+else
+RS_LIB_PATHS := $(addprefix -L$(SYSROOT),$(PLATFORM_LIB_PATHS))
+endif
+
+RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX))
+
+PLATFORM_INCS = $(USR_INCS) -I"$(SDK_PATH)/library"

diff --git a/clock/Build/tooldef.mk b/clock/Build/tooldef.mk
index 9df2a39fa2900fea0682de47f3340fe80ec6df60..c62243c3abd95299a04a7c8dcedcd387eea89dda 100644 (file)
--- a/clock/Build/tooldef.mk
+++ b/clock/Build/tooldef.mk
@@ -1,17 +1,5 @@
 # Add inputs and outputs from these tool invocations to the build variables
 
-ifeq ($(strip $(BUILD_CONFIG)),)
-BUILD_CONFIG = Debug
-endif
-
-ifneq ($(strip $(PROJROOT)),)
-PROJPATH := $(PROJROOT)
-endif
-
-ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR := $(PROJPATH)/$(BUILD_CONFIG)
-endif
-
 ifneq ($(strip $(SHELL_BIN)),)
 SHELL = $(SHELL_BIN)
 else
@@ -74,3 +62,9 @@ else
 MSGFMT = msgfmt
 endif
 
+ifneq ($(strip $(CKSUM_BIN)),)
+CKSUM = $(CKSUM_BIN)
+else
+CKSUM = cksum
+endif
+

diff --git a/clock/project_def.prop b/clock/project_def.prop
index 9a8e6c4675179a05df1ea6b5d928daf1847dce5f..1776845f86ef038d75d827bbe2955e5d9af0ebc9 100644 (file)
--- a/clock/project_def.prop
+++ b/clock/project_def.prop
@@ -6,21 +6,20 @@ APPNAME = clock
 type = app
 
 # Project Profile
-profile = mobile-3.0
+profile = mobile-4.0
 
-# C Sources
-USER_SRCS = src/*.cpp src/Controller/*.cpp src/View/*.cpp src/Presenter/*.cpp src/Model/*.cpp src/Utils/*.cpp src/Common/*.cpp
-USER_SRCS_ABS =
+# C/CPP Sources
+USER_SRCS = src/*.cpp src/View/*.cpp src/Controller/*.cpp src/Model/*.cpp src/Utils/*.cpp src/Presenter/*.cpp src/Common/*.cpp
 
 # EDC Sources
 USER_EDCS =  
 
 # PO Sources
-USER_POS = res/po/*.po
+USER_POS = res/po/sv.po res/po/uz.po res/po/da.po res/po/en.po res/po/mk.po res/po/tr_TR.po res/po/ca.po res/po/nl.po res/po/pt_PT.po res/po/ar.po res/po/hu.po res/po/zh_HK.po res/po/es_ES.po res/po/zh_TW.po res/po/cs.po res/po/hr.po res/po/fr_CA.po res/po/gl.po res/po/es_US.po res/po/nb.po res/po/et.po res/po/fr.po res/po/az.po res/po/it_IT.po res/po/eu.po res/po/kk.po res/po/ru_RU.po res/po/el_GR.po res/po/pt_BR.po res/po/zh_CN.po res/po/ro.po res/po/en_PH.po res/po/sr.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/de.po res/po/en_US.po res/po/fi.po res/po/bg.po res/po/pl.po res/po/uk.po res/po/hy.po res/po/lt.po res/po/sl.po res/po/ja_JP.po res/po/sk.po res/po/ga.po res/po/lv.po 
 
 # User Defines
 USER_DEFS = 
-USER_CPP_DEFS = 
+USER_CPP_DEFS = TIZEN_DEPRECATION DEPRECATION_WARNING 
 
 # User Undefines
 USER_UNDEFS = 
@@ -30,45 +29,35 @@ USER_CPP_UNDEFS =
 USER_LIBS = 
 
 # User Objects
-USER_OBJS =
-USER_OBJS_ABS = 
+USER_OBJS = 
 
 # User Includes
 ## C Compiler
-USER_INC_DIRS = inc/ $(workspace_loc)/common/inc
-USER_INC_DIRS_ABS =
+USER_C_INC_DIRS = 
 USER_INC_FILES = 
-USER_INC_FILES_ABS = 
 ## C++ Compiler
-USER_CPP_INC_DIRS =
-USER_CPP_INC_DIRS_ABS =
-USER_CPP_INC_FILES =
-USER_CPP_INC_FILES_ABS =
+USER_CPP_INC_DIRS = inc 
+USER_CPP_INC_FILES = 
+
+USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
 
 # User Library Path
-USER_LIB_DIRS = $(workspace_loc)/common/${BUILD_CONFIG}
-USER_LIB_DIRS_ABS =
+USER_LIB_DIRS = 
 
 # EDC Resource Path
-USER_EDCS_IMAGE_DIRS = res/edje/images
-USER_EDCS_IMAGE_DIRS_ABS = 
-USER_EDCS_SOUND_DIRS = res/edje/sounds res/edje/settings
-USER_EDCS_SOUND_DIRS_ABS = 
-USER_EDCS_FONT_DIRS = res/edje/fonts
-USER_EDCS_FONT_DIRS_ABS = 
+USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} res/edje/images 
+USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} res/edje/sounds 
+USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 
 
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/*.edc
-USER_EXT_EDC0_EDCS_IMAGE_DIRS = res/edje/images
-USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = 
-USER_EXT_EDC0_EDCS_SOUND_DIRS = res/edje/sounds
-USER_EXT_EDC0_EDCS_SOUND_DIRS_ABS = 
-USER_EXT_EDC0_EDCS_FONT_DIRS = res/edje/fonts
-USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = 
+USER_EXT_EDC0_EDCS = res/edje/alarm.edc res/edje/clock.edc res/edje/Counter.edc res/edje/CitiesListItem.edc res/edje/color_classes.edc res/edje/ring.edc res/edje/edit_alarm.edc res/edje/StopWatch.edc res/edje/WorldClock.edc res/edje/Timer.edc res/edje/WorldClockDeleteReorderList.edc 
+USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} res/edje/images 
+USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} res/edje/sounds 
+USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 
 
 # Resource Filter
 USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = res/edje/images
+USER_RES_EXCLUDE = 
 

diff --git a/clock/src/Utils/WorldClock.cpp b/clock/src/Utils/WorldClock.cpp
deleted file mode 100644 (file)
index 314738b..0000000
--- a/clock/src/Utils/WorldClock.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Copyright 2016  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.1 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://floralicense.org/license/
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-#include "Utils/WorldClock.h"
-#include "Utils/Time.h"
-#include "Utils/Translate.h"
-
-namespace utils {
-// local_timezone_offset and timezone_offset should be relative to GMT
-std::string GetTimezoneDiffDescription(int local_timezone_offset, int timezone_offset)
-{
-       std::string relative;
-
-       int offset_integer = (abs(timezone_offset - local_timezone_offset)) / 60;
-       int offset_remainder = (abs(timezone_offset - local_timezone_offset)) % 60;
-
-       if (timezone_offset < local_timezone_offset) {
-               if (offset_remainder > 0)
-                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_BEHIND_ABB",
-                                       offset_integer, offset_remainder);
-               else {
-                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PD_H_BEHIND_ABB", offset_integer);
-               }
-       } else if (timezone_offset > local_timezone_offset) {
-               if (offset_remainder > 0)
-                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_AHEAD_ABB",
-                                       offset_integer, offset_remainder);
-               else
-                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PD_H_AHEAD_ABB", offset_integer);
-       } else {
-               relative = Translate::Sprintf("IDS_CLOCK_SBODY_SAME_AS_LOCAL_TIME_M_STATUS");
-       }
-
-       return relative;
-}
-
-
-double GetSecondsToNextExactMinute()
-{
-       Time t = Time::Now();
-       double s = t.GetSecond();
-       double ms = t.GetMilliSec();
-       double diff = 60 - s - (ms / 1000);
-       return diff;
-}
-
-} /* utils */

diff --git a/clock/src/Utils/WorldClockHelpers.cpp b/clock/src/Utils/WorldClockHelpers.cpp
new file mode 100644 (file)
index 0000000..314738b
--- /dev/null
+++ b/clock/src/Utils/WorldClockHelpers.cpp
@@ -0,0 +1,60 @@
+/*
+* Copyright 2016  Samsung Electronics Co., Ltd
+*
+* Licensed under the Flora License, Version 1.1 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://floralicense.org/license/
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "Utils/WorldClock.h"
+#include "Utils/Time.h"
+#include "Utils/Translate.h"
+
+namespace utils {
+// local_timezone_offset and timezone_offset should be relative to GMT
+std::string GetTimezoneDiffDescription(int local_timezone_offset, int timezone_offset)
+{
+       std::string relative;
+
+       int offset_integer = (abs(timezone_offset - local_timezone_offset)) / 60;
+       int offset_remainder = (abs(timezone_offset - local_timezone_offset)) % 60;
+
+       if (timezone_offset < local_timezone_offset) {
+               if (offset_remainder > 0)
+                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_BEHIND_ABB",
+                                       offset_integer, offset_remainder);
+               else {
+                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PD_H_BEHIND_ABB", offset_integer);
+               }
+       } else if (timezone_offset > local_timezone_offset) {
+               if (offset_remainder > 0)
+                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_AHEAD_ABB",
+                                       offset_integer, offset_remainder);
+               else
+                       relative = Translate::Sprintf("IDS_CLOCK_BODY_PD_H_AHEAD_ABB", offset_integer);
+       } else {
+               relative = Translate::Sprintf("IDS_CLOCK_SBODY_SAME_AS_LOCAL_TIME_M_STATUS");
+       }
+
+       return relative;
+}
+
+
+double GetSecondsToNextExactMinute()
+{
+       Time t = Time::Now();
+       double s = t.GetSecond();
+       double ms = t.GetMilliSec();
+       double diff = 60 - s - (ms / 1000);
+       return diff;
+}
+
+} /* utils */

diff --git a/clock/tizen-manifest.xml b/clock/tizen-manifest.xml
index 3daa41879f700dc4ab34f0caa941fb2ccbabaf59..647b81a29daa66206159af8ef01f492bf9397f0e 100644 (file)
--- a/clock/tizen-manifest.xml
+++ b/clock/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.clock" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.clock" version="1.0.0">
     <profile name="mobile"/>
-    <ui-application appid="org.tizen.clock" exec="clock" launch_mode="single" multiple="false" nodisplay="false" taskmanage="true" type="capp" hw-acceleration="on">
+    <ui-application appid="org.tizen.clock" exec="clock" hw-acceleration="on" launch_mode="single" multiple="false" nodisplay="false" taskmanage="true" type="capp">
         <label>Clock</label>
         <label xml:lang="hy-am">Ժամացույց</label>
         <label xml:lang="az-az">Saat</label>
@@ -57,11 +57,11 @@
         <icon>clock.png</icon>
     </ui-application>
     <privileges>
-        <privilege>http://tizen.org/privilege/alarm.set</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-       <privilege>http://tizen.org/privilege/window.priority.set</privilege>
-       <privilege>http://tizen.org/privilege/haptic</privilege>
-       <privilege>http://tizen.org/privilege/volume.set</privilege>
-       <privilege>http://tizen.org/privilege/notification</privilege>
+        <privilege>http://tizen.org/privilege/window.priority.set</privilege>
+        <privilege>http://tizen.org/privilege/volume.set</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
+        <privilege>http://tizen.org/privilege/alarm.set</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
     </privileges>
 </manifest>