netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=75e1daf45e483020923d95e3bb7d0b190bf397b1
commit 75e1daf45e483020923d95e3bb7d0b190bf397b1
Author: Alastair Poole <nets...@gmail.com>
Date: Wed Dec 4 22:55:01 2019 +0000
Changes: Restructure folder.
---
NEWS | 7 +++++++
README.md | 3 ---
src/{ => bin}/disks.c | 0
src/{ => bin}/disks.h | 0
src/{ => bin}/main.c | 0
src/{ => bin}/meson.build | 2 +-
src/{ => bin}/process.c | 0
src/{ => bin}/process.h | 0
src/{ => bin}/system.c | 0
src/{ => bin}/system.h | 0
src/{ => bin}/ui.c | 1 +
src/{ => bin}/ui.h | 0
src/meson.build | 10 +---------
13 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/NEWS b/NEWS
index 35aee65..7b04c1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+============
+Evisum 0.3.0
+============
+
+ * Move to Meson build system.
+ ...
+
============
Evisum 0.2.6
============
diff --git a/README.md b/README.md
index 0662b97..845aba3 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,3 @@ NOTES
You can press 'k', 'm', 'g' to display results in KB, MB of GB
respectively.
-The plan is to rewrite the whole program to log system information
-over time to disk so we can do nice things with E and displaying
-system information (not duplicating loads of code).
diff --git a/src/disks.c b/src/bin/disks.c
similarity index 100%
rename from src/disks.c
rename to src/bin/disks.c
diff --git a/src/disks.h b/src/bin/disks.h
similarity index 100%
rename from src/disks.h
rename to src/bin/disks.h
diff --git a/src/main.c b/src/bin/main.c
similarity index 100%
rename from src/main.c
rename to src/bin/main.c
diff --git a/src/meson.build b/src/bin/meson.build
similarity index 89%
copy from src/meson.build
copy to src/bin/meson.build
index e793f52..17df2af 100644
--- a/src/meson.build
+++ b/src/bin/meson.build
@@ -6,4 +6,4 @@ executable('evisum', [
'main.c'],
dependencies : deps,
gui_app : true,
- install : true)
+ install : true)
diff --git a/src/process.c b/src/bin/process.c
similarity index 100%
rename from src/process.c
rename to src/bin/process.c
diff --git a/src/process.h b/src/bin/process.h
similarity index 100%
rename from src/process.h
rename to src/bin/process.h
diff --git a/src/system.c b/src/bin/system.c
similarity index 100%
rename from src/system.c
rename to src/bin/system.c
diff --git a/src/system.h b/src/bin/system.h
similarity index 100%
rename from src/system.h
rename to src/bin/system.h
diff --git a/src/ui.c b/src/bin/ui.c
similarity index 99%
rename from src/ui.c
rename to src/bin/ui.c
index ef545e5..3688da8 100644
--- a/src/ui.c
+++ b/src/bin/ui.c
@@ -386,6 +386,7 @@ _tab_cpu_update(Ui *ui, results_t *results)
frame = elm_frame_add(box);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
+
if (i == 0 && results->temperature != INVALID_TEMP)
elm_object_text_set(frame, eina_slstr_printf("CPU %d (%d °C)", i,
results->temperature));
else
diff --git a/src/ui.h b/src/bin/ui.h
similarity index 100%
rename from src/ui.h
rename to src/bin/ui.h
diff --git a/src/meson.build b/src/meson.build
index e793f52..2ca5545 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,9 +1 @@
-executable('evisum', [
- 'disks.c', 'disks.h',
- 'process.c', 'process.h',
- 'system.c', 'system.h',
- 'ui.c', 'ui.h',
- 'main.c'],
- dependencies : deps,
- gui_app : true,
- install : true)
+subdir('bin')
--
