diff --git a/meson.build b/meson.build index e61cf64..d1e7c65 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,16 @@ project('addtax', 'c', - version : '1.0.0', + version : '1.0.2', license : 'BSD-3', - default_options : [ 'b_ofast=if-release', 'b_march_native=if-release', 'b_ndebug=if-release' ] + default_options : [ 'b_ofast=if-release', + 'b_march_native=if-release', + 'b_ndebug=if-release', + 'warning_level=3', + 'c_std=c11' + ] ) add_global_arguments('-DGETTEXT_PACKAGE="addtax"', language: 'c') subdir('po') subdir('glade') +subdir('src/include') subdir('src') diff --git a/po/addtax.pot b/po/addtax.pot index 861e11f..a46d1f8 100644 --- a/po/addtax.pot +++ b/po/addtax.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: addtax\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-24 16:16-0300\n" +"POT-Creation-Date: 2018-09-25 16:35-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/addtax.c:51 src/addtax.c:65 +#: src/addtax.c:48 src/addtax.c:62 #, c-format msgid "Usage: %s [prices...]\n" msgstr "" diff --git a/po/es.po b/po/es.po index a214a64..a65db4c 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: addtax\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-24 16:16-0300\n" +"POT-Creation-Date: 2018-09-25 16:35-0300\n" "PO-Revision-Date: 2018-09-13 10:10-0300\n" "Last-Translator: Chris Cromer \n" "Language-Team: none\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" -#: src/addtax.c:51 src/addtax.c:65 +#: src/addtax.c:48 src/addtax.c:62 #, c-format msgid "Usage: %s [prices...]\n" msgstr "Uso: %s [precios...]\n" diff --git a/src/addtax.c b/src/addtax.c index 1160243..ccf2bb4 100644 --- a/src/addtax.c +++ b/src/addtax.c @@ -4,11 +4,8 @@ #include #include #include -#include "misc.h" - -#define _(STRING) gettext(STRING) -#define TAX 1.111111111 -#define VERSION "1.0.1" +#include "include/addtax.h" +#include "include/misc.h" GtkLabel *calculated_value = NULL; @@ -18,7 +15,7 @@ void calculate_tax(GtkWidget *entry) { const gchar *label_text; entry_text = (char*) gtk_entry_get_text(GTK_ENTRY(entry)); money = atof(entry_text); - if (is_float(entry_text, money)) { + if (is_float(entry_text)) { g_print("$%d * %f = ", (int) round(money), TAX); money = money * TAX; g_print("$%d\n", (int) round(money)); @@ -56,7 +53,7 @@ int main(int argc, char *argv[]) { // Process arguments that are not options while (optind < argc) { money = atof(argv[optind]); - if (is_float(argv[optind++], money)) { + if (is_float(argv[optind++])) { printf("$%d * %f = ", (int) round(money), TAX); money = money * TAX; printf("$%d\n", (int) round(money)); @@ -96,7 +93,7 @@ int main(int argc, char *argv[]) { } // Called when calculate is clicked -void on_button_calculate_clicked(GtkWidget *button, GtkWidget *entry) { +void on_button_calculate_clicked(__attribute__((unused)) GtkWidget *button, GtkWidget *entry) { calculate_tax(entry); } diff --git a/src/include/addtax.h.in b/src/include/addtax.h.in new file mode 100644 index 0000000..bea1cf0 --- /dev/null +++ b/src/include/addtax.h.in @@ -0,0 +1,3 @@ +#define _(STRING) gettext(STRING) +#define TAX 1.111111111 +#define VERSION "@version@" diff --git a/src/include/meson.build b/src/include/meson.build new file mode 100644 index 0000000..ed023e4 --- /dev/null +++ b/src/include/meson.build @@ -0,0 +1,5 @@ +conf_data = configuration_data() +conf_data.set('version', meson.project_version()) +configure_file(input : 'addtax.h.in', + output : 'addtax.h', + configuration : conf_data) diff --git a/src/include/misc.h b/src/include/misc.h new file mode 100644 index 0000000..e118b09 --- /dev/null +++ b/src/include/misc.h @@ -0,0 +1 @@ +bool is_float(const char *string); diff --git a/src/meson.build b/src/meson.build index b707d0e..4919ebd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -6,18 +6,25 @@ gmodule_dep = dependency('gmodule-export-2.0', version : '>=2.0') cc = meson.get_compiler('c') m_dep = cc.find_library('m', required : false) -# -no-pie so that the executable is double clickable in gui -c_args = ['-no-pie'] -link_args = ['-no-pie'] - sources = ['addtax.c'] sources += ['misc.c'] -sources += ['misc.h'] sources += [main_resource_c] +# -no-pie so that the executable is double clickable in gui +if cc.get_id() == 'gcc' + c_args = ['-no-pie'] + link_args = ['-no-pie'] +else + c_args = '' + link_args = '' +endif + +inc = include_directories('include') + executable('addtax', sources, - c_args : c_args, - link_args : link_args, + include_directories : inc, + c_args: c_args, + link_args: link_args, dependencies : [gtk_dep, m_dep, gmodule_dep], install : true) diff --git a/src/misc.c b/src/misc.c index a9a8243..eb296c5 100644 --- a/src/misc.c +++ b/src/misc.c @@ -3,13 +3,13 @@ #include #include -bool is_float(const char *s, float dest) { - if (s == NULL) { +bool is_float(const char *string) { + if (string == NULL) { return false; } char *endptr; - dest = (float) strtod(s, &endptr); - if (s == endptr) { + strtod(string, &endptr); + if (string == endptr) { return false; } while (isspace((unsigned char ) *endptr)) { diff --git a/src/misc.h b/src/misc.h deleted file mode 100644 index cf81e48..0000000 --- a/src/misc.h +++ /dev/null @@ -1 +0,0 @@ -bool is_float(const char *s, float dest);