diff options
| author | Andrey Klimenko <and.klimenko@samsung.com> | 2016-06-08 10:52:02 +0300 |
|---|---|---|
| committer | Dmytro Dragan <dm.dragan@samsung.com> | 2016-06-08 17:05:02 +0300 |
| commit | 7fcddade07e09399651405218c2c43129e7b23a3 (patch) | |
| tree | 872f2421d6ba8a2f32b4bcba88c9326a3dc932e6 | |
| parent | 76e955a1b1743a8bd65ec2c7c3b3f141a6c4403b (diff) | |
| download | libug-worldclock-efl-7fcddade07e09399651405218c2c43129e7b23a3.tar.gz libug-worldclock-efl-7fcddade07e09399651405218c2c43129e7b23a3.tar.bz2 libug-worldclock-efl-7fcddade07e09399651405218c2c43129e7b23a3.zip | |
corrected package-id in manifest to fix launch issues, also fixed issue with localizationsubmit/tizen/20160609.104115accepted/tizen/mobile/20160610.011655
Change-Id: I2563724a14262e27485c9899c5e9993819c27c03
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
| -rw-r--r-- | .cproject | 25 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | inc/worldclock_const.h | 2 | ||||
| -rw-r--r-- | org.tizen.worldclock-efl.manifest (renamed from libug-worldclock-efl.manifest) | 0 | ||||
| -rw-r--r-- | packaging/org.tizen.worldclock-efl.spec (renamed from packaging/libug-worldclock-efl.spec) | 4 | ||||
| -rw-r--r-- | tizen-manifest.xml | 4 |
6 files changed, 22 insertions, 15 deletions
@@ -16,7 +16,7 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactName="libug-worldclock-efl" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.894369097" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug" postbuildStep="" preannouncebuildStep="" prebuildStep=""> + <configuration artifactName="worldclock-efl" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.894369097" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug" postbuildStep="" preannouncebuildStep="" prebuildStep=""> <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.894369097." name="/" resourcePath=""> <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.317974252" name="Tizen Native Toolchain" nonInternalBuilderId="org.tizen.nativecore.target.sbi.gnu.builder" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug"> <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1850236046" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/> @@ -32,9 +32,11 @@ <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1643321792" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/attach-panel""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -110,6 +112,7 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> @@ -234,9 +237,11 @@ <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.258278345" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/attach-panel""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -312,6 +317,7 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> @@ -323,10 +329,10 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.1020965341" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="$(TC_COMPILER_MISC)"/> + <listOptionValue builtIn="false" value="$(RS_COMPILER_MISC)"/> <listOptionValue builtIn="false" value=" -fPIE"/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + <listOptionValue builtIn="false" value="--sysroot="$(SBI_SYSROOT)""/> <listOptionValue builtIn="false" value="-mthumb"/> </option> <option id="gnu.c.compiler.option.include.paths.780605633" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> @@ -342,14 +348,15 @@ <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.2077773456" 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.897709119" 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.1128706472" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/> + <listOptionValue builtIn="false" value="$(TC_LINKER_MISC)"/> + <listOptionValue builtIn="false" value="$(RS_LINKER_MISC)"/> <listOptionValue builtIn="false" value="-pie -lpthread "/> <listOptionValue builtIn="false" value="-Xlinker -rpath="/home/developer/sdk_tools/lib""/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - <listOptionValue builtIn="false" value="-Xlinker --version-script="${PROJ_PATH}/.exportMap""/> - <listOptionValue builtIn="false" value="-L"${SBI_SYSROOT}/usr/lib""/> + <listOptionValue builtIn="false" value="--sysroot="$(SBI_SYSROOT)""/> + <listOptionValue builtIn="false" value="-Xlinker --version-script="$(PROJ_PATH)/.exportMap""/> + <listOptionValue builtIn="false" value="-L"$(SBI_SYSROOT)/usr/lib""/> <listOptionValue builtIn="false" value="$(RS_LIBRARIES)"/> + <listOptionValue builtIn="false" value="-Xlinker -rpath="/opt/usr/apps/org.tizen.worldclock-efl/lib""/> </option> <option id="gnu.cpp.link.option.paths.756885880" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib""/> diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b3e3dd..24ded76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(libug-worldclock-efl C CXX) +PROJECT(worldclock-efl C CXX) SET(PACKAGE "org.tizen.${PROJECT_NAME}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/inc/worldclock_const.h b/inc/worldclock_const.h index d26c4b7..b1ebcef 100644 --- a/inc/worldclock_const.h +++ b/inc/worldclock_const.h @@ -39,7 +39,7 @@ #define FLAG_BUF_SIZE 128 #define MCC_BUF_SIZE 20 -#define PACKAGE "libug-worldclock-efl" +#define PACKAGE "worldclock-efl" /* group name */ #define GRP_ADD "ug_add_layout" diff --git a/libug-worldclock-efl.manifest b/org.tizen.worldclock-efl.manifest index c00c25b..c00c25b 100644 --- a/libug-worldclock-efl.manifest +++ b/org.tizen.worldclock-efl.manifest diff --git a/packaging/libug-worldclock-efl.spec b/packaging/org.tizen.worldclock-efl.spec index bb7ed95..4a38455 100644 --- a/packaging/libug-worldclock-efl.spec +++ b/packaging/org.tizen.worldclock-efl.spec @@ -1,4 +1,4 @@ -Name: libug-worldclock-efl +Name: org.tizen.worldclock-efl Summary: Time Zone setup UI gadget Version: 0.2 Release: 1 @@ -55,7 +55,7 @@ rm -rf %{buildroot} %files -%manifest libug-worldclock-efl.manifest +%manifest org.tizen.worldclock-efl.manifest %defattr(-,root,root,-) %{TZ_SYS_RO_APP}/%{name}/* %{TZ_SYS_RO_PACKAGES}/* diff --git a/tizen-manifest.xml b/tizen-manifest.xml index b8d63cd..bc0eea9 100644 --- a/tizen-manifest.xml +++ b/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="libug-worldclock-efl" version="1.0.0"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.worldclock-efl" version="1.0.0"> <profile name="mobile"/> - <ui-application appid="libug-worldclock-efl" exec="libug-worldclock-efl" launch_mode="single" multiple="false" nodisplay="true" splash-screen-display="true" taskmanage="false" type="capp"> + <ui-application appid="org.tizen.worldclock-efl" exec="worldclock-efl" launch_mode="single" multiple="false" nodisplay="true" splash-screen-display="true" taskmanage="false" type="capp"> <label>World clock Appcontrol</label> <label xml:lang="en-us">World clock Appcontrol</label> <icon>libug-worldclock-efl.png</icon> |