From c321acefafe0677846518c723d3bd6b4551c6f10 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 4 Mar 2016 11:15:32 +0900 Subject: [PATCH] Fix hardcoded path Change-Id: I79097f2deb3a3e6d7923391761c8981591d7fc18 --- Makefile.am | 2 +- configure.ac | 13 +++++++++++++ ism/data/isf.sh | 2 -- ism/dump/isf_log_dump.sh | 4 ++-- ism/extras/kbd_mode_changer/Makefile.am | 2 +- ism/src/Makefile.am | 8 ++++---- ism/src/isf_pkg.cpp | 3 ++- org.tizen.isf-kbd-mode-changer.xml | 2 +- packaging/isf.spec | 24 +++++++++--------------- 9 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index 67a028a..b42307d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,7 +57,7 @@ pkgconfig_DATA = isf.pc scim.pc \ $(GTK_UTILS_PKGCONFIG) if ISF_BUILD_KBD_MODE_CHANGER -kbdmodechangerxmldir = /usr/share/packages/ +kbdmodechangerxmldir = @RO_PACKAGES_DIR@ kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml endif diff --git a/configure.ac b/configure.ac index c647934..761a74d 100644 --- a/configure.ac +++ b/configure.ac @@ -421,6 +421,16 @@ AC_ARG_WITH(efl-im-module-dir, [Select efl immodule dir]), EFL_IM_MODULEDIR=$with_efl_im_module_dir) +AC_ARG_WITH(ro-app-dir, + AS_HELP_STRING([--with-ro-app-dir=dir], + [Select Read only application dir]), + RO_APP_DIR=$with_ro_app_dir) + +AC_ARG_WITH(ro-packages-dir, + AS_HELP_STRING([--with-ro-app-dir=dir], + [Select Read only packages dir]), + RO_PACKAGES_DIR=$with_ro_packages_dir) + AC_ARG_ENABLE(ld-version-script, [ --enable-ld-version-script Use ld version script to limit exported symbols], enable_ld_version_script=yes, @@ -761,6 +771,9 @@ AC_SUBST(SCIM_LIBEXECDIR) AC_SUBST(SCIM_LOCALEDIR) AC_SUBST(SCIM_TEMPDIR) +AC_SUBST(RO_APP_DIR) +AC_SUBST(RO_PACKAGES_DIR) + ########################################################### ## Output files. ## ########################################################### diff --git a/ism/data/isf.sh b/ism/data/isf.sh index 34cee20..2863417 100755 --- a/ism/data/isf.sh +++ b/ism/data/isf.sh @@ -1,5 +1,3 @@ -export SCIM_MODULE_PATH=/opt/apps/scim/lib/scim-1.0 export XMODIFIERS=@im=SCIM -export GTK_IM_MODULE_FILE=/opt/etc/gtk-2.0/gtk.immodules export GTK_IM_MODULE=scim export ECORE_IMF_MODULE=isf diff --git a/ism/dump/isf_log_dump.sh b/ism/dump/isf_log_dump.sh index 275067c..e42e7bf 100755 --- a/ism/dump/isf_log_dump.sh +++ b/ism/dump/isf_log_dump.sh @@ -5,9 +5,9 @@ #-------------------------------------- export DISPLAY=:0.0 ISF_DEBUG=$1/isf -ISF_HOME=~/.scim +ISF_HOME=~/.config/.scim ISF_SCIM_HOME=/root/.scim -ISF_DB=/opt/usr/dbspace +ISF_DB=~/.applications/dbspace /bin/mkdir -p ${ISF_DEBUG} /bin/cat ${ISF_HOME}/isf.log > ${ISF_DEBUG}/isf.log /bin/cat ${ISF_HOME}/config > ${ISF_DEBUG}/config diff --git a/ism/extras/kbd_mode_changer/Makefile.am b/ism/extras/kbd_mode_changer/Makefile.am index 0e82699..fab678c 100644 --- a/ism/extras/kbd_mode_changer/Makefile.am +++ b/ism/extras/kbd_mode_changer/Makefile.am @@ -25,7 +25,7 @@ if ISF_BUILD_KBD_MODE_CHANGER ISF_KBD_MODE_CHANGER = isf-kbd-mode-changer endif -appexecdir = /usr/apps/org.tizen.isf-kbd-mode-changer/bin/ +appexecdir = @RO_APP_DIR@/org.tizen.isf-kbd-mode-changer/bin/ appexec_PROGRAMS = $(ISF_KBD_MODE_CHANGER) isf_kbd_mode_changer_SOURCES = main.cpp diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am index c703532..4d265d8 100644 --- a/ism/src/Makefile.am +++ b/ism/src/Makefile.am @@ -172,9 +172,9 @@ libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la bin_PROGRAMS = scim isf-log scim_SOURCES = scim.cpp isf_pkg.cpp -scim_CXXFLAGS = @ECORE_CFLAGS@ @ECORE_IPC_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ -fPIE +scim_CXXFLAGS = @ECORE_CFLAGS@ @ECORE_IPC_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE scim_LDADD = libscim@SCIM_EPOCH@.la -scim_LDFLAGS = @LTLIBINTL@ @ECORE_LIBS@ @ECORE_IPC_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ -pie +scim_LDFLAGS = @LTLIBINTL@ @ECORE_LIBS@ @ECORE_IPC_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie isf_log_SOURCES = isf_log.cpp isf_log_LDADD = libscim@SCIM_EPOCH@.la @@ -191,8 +191,8 @@ libexec_PROGRAMS = scim-launcher scim-helper-launcher scim_launcher_SOURCES = scim_launcher.cpp isf_pkg.cpp scim_launcher_LDADD = libscim@SCIM_EPOCH@.la -scim_launcher_CXXFLAGS = @VCONF_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ -fPIE -scim_launcher_LDFLAGS = @LTLIBINTL@ @VCONF_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ -pie +scim_launcher_CXXFLAGS = @VCONF_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE +scim_launcher_LDFLAGS = @LTLIBINTL@ @VCONF_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie scim_helper_launcher_SOURCES = scim_helper_launcher.cpp scim_helper_launcher_CXXFLAGS = -fPIE diff --git a/ism/src/isf_pkg.cpp b/ism/src/isf_pkg.cpp index b212806..c38d05d 100644 --- a/ism/src/isf_pkg.cpp +++ b/ism/src/isf_pkg.cpp @@ -35,6 +35,7 @@ #include "isf_query_utility.h" #include "isf_pkg.h" #include +#include #ifdef LOG_TAG # undef LOG_TAG @@ -177,7 +178,7 @@ int isf_pkg_ime_app_list_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) if (path) ime_db.module_path = String (path) + String ("/lib"); else - ime_db.module_path = String ("/opt/usr/apps/") + ime_db.pkgid + String ("/lib"); + ime_db.module_path = String (tzplatform_getenv(TZ_SYS_RW_APP)) + ime_db.pkgid + String ("/lib"); ime_db.module_name = String ("lib") + ime_db.exec.substr (ime_db.exec.find_last_of (SCIM_PATH_DELIM) + 1); if (ime_db.exec.compare (0, 5, "/usr/") == 0) { ime_db.is_enabled = 1; diff --git a/org.tizen.isf-kbd-mode-changer.xml b/org.tizen.isf-kbd-mode-changer.xml index 513da07..be3f243 100644 --- a/org.tizen.isf-kbd-mode-changer.xml +++ b/org.tizen.isf-kbd-mode-changer.xml @@ -3,7 +3,7 @@ Jihoon Kim isf-kbd-mode-changer - + diff --git a/packaging/isf.spec b/packaging/isf.spec index 22cb11e..de22844 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -49,7 +49,7 @@ Requires: org.tizen.isf-kbd-mode-changer %endif %define _optexecdir /opt/usr/devel/usr/bin/ -%define APP_PREFIX %{_prefix}/apps/org.tizen.isf-kbd-mode-changer/bin/ +%define APP_PREFIX %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer/bin/ %description Input Service Framewok (ISF) is an input method (IM) platform, and it has been derived from SCIM. @@ -116,20 +116,18 @@ CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} %endif --disable-frontend-x11 \ --disable-multiwindow-support \ - --disable-ime-embed-app + --disable-ime-embed-app \ + --with-ro-app-dir=%{TZ_SYS_RO_APP} \ + --with-ro-packages-dir=%{TZ_SYS_RO_PACKAGES} make %{?_smp_mflags} %install rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/opt/etc/dump.d/module.d -cp -af ism/dump/isf_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d +mkdir -p %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d +cp -af ism/dump/isf_log_dump.sh %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d mkdir -p %{buildroot}/etc/scim/conf -mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/Helper -mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI -mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine -mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/PanelAgent %find_lang scim cat scim.lang > isf.lang @@ -148,10 +146,6 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im %files -f isf.lang %manifest %{name}.manifest %defattr(-,root,root,-) -%dir /opt/apps/scim/lib/scim-1.0/1.4.0/Helper -%dir /opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI -%dir /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine -%dir /opt/apps/scim/lib/scim-1.0/1.4.0/PanelAgent %dir /etc/scim/conf %{_prefix}/lib/systemd/user/default.target.wants/scim.path %{_prefix}/lib/systemd/user/scim.service @@ -179,7 +173,7 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im %{_libdir}/scim-1.0/scim-helper-launcher %{_libdir}/libscim-*.so* %license COPYING -/opt/etc/dump.d/module.d/* +%{TZ_SYS_ETC}/dump.d/module.d/* %files devel %defattr(-,root,root,-) @@ -190,10 +184,10 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im %if %{without wayland} %post -n org.tizen.isf-kbd-mode-changer -mkdir -p /usr/apps/org.tizen.isf-kbd-mode-changer +mkdir -p %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer %files -n org.tizen.isf-kbd-mode-changer %manifest org.tizen.isf-kbd-mode-changer.manifest -/usr/share/packages/org.tizen.isf-kbd-mode-changer.xml +%{TZ_SYS_RO_PACKAGES}/org.tizen.isf-kbd-mode-changer.xml %{APP_PREFIX}/* %endif -- 2.7.4