Remove emulator macro from spec file

We can handle emulator and real device with the same resolution
configuration files.

Change-Id: Ied5a8c0334806ff127c2de423c48f190687001fe
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfb5c2adc7eb3cb3520f9c960f9ff69a169cf722..852b17d17359b0d1923149aeb1ea92843c5257d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,29 +77,16 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/widget_service_internal.h DEST
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/widget_errno.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/widget_instance.h DESTINATION include/${PROJECT_NAME})
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.resolution.ini DESTINATION /usr/share/${PROJECT_NAME} RENAME "mobile.resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.wearable.resolution.ini DESTINATION /usr/share/${PROJECT_NAME} RENAME "wearable.resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-
-IF("${TARGET}" STREQUAL "emulator")
-
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.320x480.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/320x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.480x800.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/480x800 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.wearable.360x480.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/360x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.wearable.360x360.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/360x360 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/720x1280 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.wearable.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/320x320 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.540x960.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/540x960 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.1440x2560.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/1440x2560 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-
-ELSE()
-
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.480x800.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/480x800 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.wearable.360x360.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/360x360 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/720x1280 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/wayland.mobile.1440x2560.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/1440x2560 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) 
-
-ENDIF()
-
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.resolution.ini DESTINATION /usr/share/${PROJECT_NAME} RENAME "mobile.resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.wearable.resolution.ini DESTINATION /usr/share/${PROJECT_NAME} RENAME "wearable.resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.320x480.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/320x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.480x800.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/480x800 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.wearable.360x480.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/360x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.wearable.360x360.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/360x360 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/720x1280 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.wearable.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/320x320 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.540x960.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/540x960 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/wayland.mobile.1440x2560.resolution.ini DESTINATION /usr/share/${PROJECT_NAME}/1440x2560 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
 ADD_SUBDIRECTORY(parser)
 

diff --git a/data/device/wayland.mobile.1440x2560.resolution.ini b/data/device/wayland.mobile.1440x2560.resolution.ini
deleted file mode 100644 (file)
index 75b3e0c..0000000
--- a/data/device/wayland.mobile.1440x2560.resolution.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[resolution]
-1x1=350x350
-2x1=708x350
-2x2=708x708
-4x1=1424x350
-4x2=1424x708
-4x3=1424x1066
-4x4=1424x1424
-4x5=1424x1782
-4x6=1424x2140
-21x21=448x430
-23x21=1360x430
-23x23=1360x1306
-0x0=1440x2560

diff --git a/data/device/wayland.mobile.480x800.resolution.ini b/data/device/wayland.mobile.480x800.resolution.ini
deleted file mode 100644 (file)
index 4a99956..0000000
--- a/data/device/wayland.mobile.480x800.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=126x126
-2x1=0x0
-2x2=0x0
-4x1=0x0
-4x2=470x234
-4x3=0x0
-4x4=470x470
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=480x800
-base=480x800

diff --git a/data/device/wayland.mobile.resolution.ini b/data/device/wayland.mobile.resolution.ini
deleted file mode 100644 (file)
index ddc9a69..0000000
--- a/data/device/wayland.mobile.resolution.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[resolution]
-1x1=175x175
-2x1=354x175
-2x2=354x354
-4x1=712x175
-4x2=712x354
-4x3=712x533
-4x4=712x712
-4x5=712x891
-4x6=712x1070
-21x21=224x215
-23x21=680x215
-23x23=680x653
-0x0=720x1280

diff --git a/data/device/wayland.wearable.360x360.resolution.ini b/data/device/wayland.wearable.360x360.resolution.ini
deleted file mode 100644 (file)
index a86b0dd..0000000
--- a/data/device/wayland.wearable.360x360.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=170x170
-2x1=0x0
-2x2=360x360
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=0x0
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=360x360
-base=360x360

diff --git a/data/device/wayland.wearable.resolution.ini b/data/device/wayland.wearable.resolution.ini
deleted file mode 100644 (file)
index e698e60..0000000
--- a/data/device/wayland.wearable.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=320x320
-2x1=0x0
-2x2=320x320
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=0x0
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=320x320
-base=320x320

diff --git a/data/emulator/wayland.mobile.1440x2560.resolution.ini b/data/emulator/wayland.mobile.1440x2560.resolution.ini
deleted file mode 100644 (file)
index 75b3e0c..0000000
--- a/data/emulator/wayland.mobile.1440x2560.resolution.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[resolution]
-1x1=350x350
-2x1=708x350
-2x2=708x708
-4x1=1424x350
-4x2=1424x708
-4x3=1424x1066
-4x4=1424x1424
-4x5=1424x1782
-4x6=1424x2140
-21x21=448x430
-23x21=1360x430
-23x23=1360x1306
-0x0=1440x2560

diff --git a/data/emulator/wayland.mobile.320x480.resolution.ini b/data/emulator/wayland.mobile.320x480.resolution.ini
deleted file mode 100644 (file)
index b3a3c24..0000000
--- a/data/emulator/wayland.mobile.320x480.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=0x0
-2x1=0x0
-2x2=0x0
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=302x302
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=320x480
-base=320x480

diff --git a/data/emulator/wayland.mobile.360x360.resolution.ini b/data/emulator/wayland.mobile.360x360.resolution.ini
deleted file mode 100644 (file)
index 2eea5c6..0000000
--- a/data/emulator/wayland.mobile.360x360.resolution.ini
+++ /dev/null
@@ -1 +0,0 @@
-[resolution]
\ No newline at end of file

diff --git a/data/emulator/wayland.mobile.360x480.resolution.ini b/data/emulator/wayland.mobile.360x480.resolution.ini
deleted file mode 100644 (file)
index 2eea5c6..0000000
--- a/data/emulator/wayland.mobile.360x480.resolution.ini
+++ /dev/null
@@ -1 +0,0 @@
-[resolution]
\ No newline at end of file

diff --git a/data/emulator/wayland.mobile.480x800.resolution.ini b/data/emulator/wayland.mobile.480x800.resolution.ini
deleted file mode 100644 (file)
index 4a99956..0000000
--- a/data/emulator/wayland.mobile.480x800.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=126x126
-2x1=0x0
-2x2=0x0
-4x1=0x0
-4x2=470x234
-4x3=0x0
-4x4=470x470
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=480x800
-base=480x800

diff --git a/data/emulator/wayland.mobile.540x960.resolution.ini b/data/emulator/wayland.mobile.540x960.resolution.ini
deleted file mode 100644 (file)
index c548e6c..0000000
--- a/data/emulator/wayland.mobile.540x960.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=130x150
-2x1=264x150
-2x2=264x304
-4x1=534x150
-4x2=534x304
-4x3=534x458
-4x4=534x612
-4x5=534x766
-4x6=534x920
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=540x960
-base=540x960

diff --git a/data/emulator/wayland.mobile.resolution.ini b/data/emulator/wayland.mobile.resolution.ini
deleted file mode 100644 (file)
index ddc9a69..0000000
--- a/data/emulator/wayland.mobile.resolution.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[resolution]
-1x1=175x175
-2x1=354x175
-2x2=354x354
-4x1=712x175
-4x2=712x354
-4x3=712x533
-4x4=712x712
-4x5=712x891
-4x6=712x1070
-21x21=224x215
-23x21=680x215
-23x23=680x653
-0x0=720x1280

diff --git a/data/emulator/wayland.wearable.360x360.resolution.ini b/data/emulator/wayland.wearable.360x360.resolution.ini
deleted file mode 100644 (file)
index a86b0dd..0000000
--- a/data/emulator/wayland.wearable.360x360.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=170x170
-2x1=0x0
-2x2=360x360
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=0x0
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=360x360
-base=360x360

diff --git a/data/emulator/wayland.wearable.360x480.resolution.ini b/data/emulator/wayland.wearable.360x480.resolution.ini
deleted file mode 100644 (file)
index dca0ab4..0000000
--- a/data/emulator/wayland.wearable.360x480.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=170x170
-2x1=0x0
-2x2=360x480
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=0x0
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=360x480
-base=360x480

diff --git a/data/emulator/wayland.wearable.resolution.ini b/data/emulator/wayland.wearable.resolution.ini
deleted file mode 100644 (file)
index e698e60..0000000
--- a/data/emulator/wayland.wearable.resolution.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[resolution]
-1x1=320x320
-2x1=0x0
-2x2=320x320
-4x1=0x0
-4x2=0x0
-4x3=0x0
-4x4=0x0
-4x5=0x0
-4x6=0x0
-21x21=0x0
-23x21=0x0
-23x23=0x0
-0x0=320x320
-base=320x320

diff --git a/data/wayland.mobile.1440x2560.resolution.ini b/data/wayland.mobile.1440x2560.resolution.ini
new file mode 100644 (file)
index 0000000..75b3e0c
--- /dev/null
+++ b/data/wayland.mobile.1440x2560.resolution.ini
@@ -0,0 +1,14 @@
+[resolution]
+1x1=350x350
+2x1=708x350
+2x2=708x708
+4x1=1424x350
+4x2=1424x708
+4x3=1424x1066
+4x4=1424x1424
+4x5=1424x1782
+4x6=1424x2140
+21x21=448x430
+23x21=1360x430
+23x23=1360x1306
+0x0=1440x2560

diff --git a/data/wayland.mobile.320x480.resolution.ini b/data/wayland.mobile.320x480.resolution.ini
new file mode 100644 (file)
index 0000000..b3a3c24
--- /dev/null
+++ b/data/wayland.mobile.320x480.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=0x0
+2x1=0x0
+2x2=0x0
+4x1=0x0
+4x2=0x0
+4x3=0x0
+4x4=302x302
+4x5=0x0
+4x6=0x0
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=320x480
+base=320x480

diff --git a/data/wayland.mobile.360x360.resolution.ini b/data/wayland.mobile.360x360.resolution.ini
new file mode 100644 (file)
index 0000000..2eea5c6
--- /dev/null
+++ b/data/wayland.mobile.360x360.resolution.ini
@@ -0,0 +1 @@
+[resolution]
\ No newline at end of file

diff --git a/data/wayland.mobile.360x480.resolution.ini b/data/wayland.mobile.360x480.resolution.ini
new file mode 100644 (file)
index 0000000..2eea5c6
--- /dev/null
+++ b/data/wayland.mobile.360x480.resolution.ini
@@ -0,0 +1 @@
+[resolution]
\ No newline at end of file

diff --git a/data/wayland.mobile.480x800.resolution.ini b/data/wayland.mobile.480x800.resolution.ini
new file mode 100644 (file)
index 0000000..4a99956
--- /dev/null
+++ b/data/wayland.mobile.480x800.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=126x126
+2x1=0x0
+2x2=0x0
+4x1=0x0
+4x2=470x234
+4x3=0x0
+4x4=470x470
+4x5=0x0
+4x6=0x0
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=480x800
+base=480x800

diff --git a/data/wayland.mobile.540x960.resolution.ini b/data/wayland.mobile.540x960.resolution.ini
new file mode 100644 (file)
index 0000000..c548e6c
--- /dev/null
+++ b/data/wayland.mobile.540x960.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=130x150
+2x1=264x150
+2x2=264x304
+4x1=534x150
+4x2=534x304
+4x3=534x458
+4x4=534x612
+4x5=534x766
+4x6=534x920
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=540x960
+base=540x960

diff --git a/data/wayland.mobile.resolution.ini b/data/wayland.mobile.resolution.ini
new file mode 100644 (file)
index 0000000..ddc9a69
--- /dev/null
+++ b/data/wayland.mobile.resolution.ini
@@ -0,0 +1,14 @@
+[resolution]
+1x1=175x175
+2x1=354x175
+2x2=354x354
+4x1=712x175
+4x2=712x354
+4x3=712x533
+4x4=712x712
+4x5=712x891
+4x6=712x1070
+21x21=224x215
+23x21=680x215
+23x23=680x653
+0x0=720x1280

diff --git a/data/wayland.wearable.360x360.resolution.ini b/data/wayland.wearable.360x360.resolution.ini
new file mode 100644 (file)
index 0000000..a86b0dd
--- /dev/null
+++ b/data/wayland.wearable.360x360.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=170x170
+2x1=0x0
+2x2=360x360
+4x1=0x0
+4x2=0x0
+4x3=0x0
+4x4=0x0
+4x5=0x0
+4x6=0x0
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=360x360
+base=360x360

diff --git a/data/wayland.wearable.360x480.resolution.ini b/data/wayland.wearable.360x480.resolution.ini
new file mode 100644 (file)
index 0000000..dca0ab4
--- /dev/null
+++ b/data/wayland.wearable.360x480.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=170x170
+2x1=0x0
+2x2=360x480
+4x1=0x0
+4x2=0x0
+4x3=0x0
+4x4=0x0
+4x5=0x0
+4x6=0x0
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=360x480
+base=360x480

diff --git a/data/wayland.wearable.resolution.ini b/data/wayland.wearable.resolution.ini
new file mode 100644 (file)
index 0000000..e698e60
--- /dev/null
+++ b/data/wayland.wearable.resolution.ini
@@ -0,0 +1,15 @@
+[resolution]
+1x1=320x320
+2x1=0x0
+2x2=320x320
+4x1=0x0
+4x2=0x0
+4x3=0x0
+4x4=0x0
+4x5=0x0
+4x6=0x0
+21x21=0x0
+23x21=0x0
+23x23=0x0
+0x0=320x320
+base=320x320

diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec
index 2404d7f67760e0ac568e8351bd367baf6b109d4c..1a6ca84f7dfef82576930a5ce4f8b1a71e4ebba1 100644 (file)
--- a/packaging/libwidget_service.spec
+++ b/packaging/libwidget_service.spec
@@ -52,16 +52,10 @@ cp %{SOURCE1001} .
 
 %build
 
-%if %{with emulator}
-export TARGET=emulator
-%else
-export TARGET=device
-%endif
-
 sqlite3 .widget.db < ./parser/widget.sql
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTARGET=${TARGET}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 make %{?jobs:-j%jobs}
 
 %install