build: Quick Meson

Author: hyperupcall

.vscode/c_cpp_properties.json

@@ -5,7 +5,7 @@
             "cStandard": "c89",
             "intelliSenseMode": "linux-gcc-x64",
             "compilerPath": "/usr/bin/clang",
-            "cppStandard": "c++14"
+			"includePath": ["./include"]
         }
     ],
     "version": 4

.vscode/settings.json

@@ -16,7 +16,9 @@
         "string.h": "c",
         "main.h": "c",
         "unistd.h": "c",
-        "limits.h": "c"
+        "limits.h": "c",
+        "pwd.h": "c",
+        "util.h": "c"
     },
 	"C_Cpp.files.exclude": {
 		"**/cosmopolitan": true,

bin/d.c

@@ -0,0 +1,35 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <linux/limits.h>
+#include <pwd.h>
+
+#include "util.h"
+
+int main(int argc, char *argv[]) {
+	struct Cli cli = parse_cli(argc, argv);
+	if (cli.help) {
+		show_help();
+		exit(0);
+	}
+	struct Config config = parse_config(cli.config_file);
+
+	if (STR_EQ(cli.command, "init")) {
+		command_init(cli, config);
+	} else if (STR_EQ(cli.command, "list")) {
+		command_list(cli, config);
+	} else if (STR_EQ(cli.command, "deploy")) {
+		command_deploy(cli, config);
+	} else if (STR_EQ(cli.command, "replace")) {
+		command_replace(cli, config);
+	} else if (STR_EQ(cli.command, "undeploy")) {
+		command_undeploy(cli, config);
+	} else {
+		die("Command not accounted for");
+	}
+}

include/meson.build

@@ -0,0 +1 @@
+install_headers('util.h')

meson.build

@@ -0,0 +1,55 @@
+project('d', 'c',
+  version : '0.1.0',
+  license : 'MPL-2.0')
+add_global_arguments(language : 'c')
+
+my_inc = include_directories('include')
+my_inc2 = include_directories('src')
+install_headers('./src/util.h')
+
+libsimple_proj = subproject('inih')
+inih_dep = libsimple_proj.get_variable('inih_dep')
+inih_inc = libsimple_proj.get_variable('inc_inih')
+
+
+# subdir('include')
+# subdir('src')
+my_lib = static_library('mylib',
+	'src/util.c',
+	include_directories : [my_inc2, inih_inc])
+
+#subdir('test')
+my_dep = declare_dependency(link_with : my_lib,
+  include_directories : my_inc)
+#pkg_mod = import('pkgconfig')
+#pkg_mod.generate(libraries : foolib,
+#                 version : '1.0',
+#                 name : 'libfoobar',
+#                 filebase : 'foobar',
+#                 description : 'A Library to barnicate your foos.')
+build_args = [
+]
+project_source_files = [
+  'bin/d.c'
+]
+project_dependencies = [
+	my_dep
+]
+build_args += [
+  '-DPROJECT_NAME=' + meson.project_name(),
+  '-DPROJECT_VERSION=' + meson.project_version(),
+]
+
+
+
+project_dependencies += inih_dep
+project_target = executable(
+  meson.project_name(),
+  project_source_files,
+  dependencies: project_dependencies,
+  install : false,
+	include_directories : my_inc2,
+  c_args : build_args,
+)
+
+test('basic', project_target)

src/meson.build

@@ -0,0 +1,22 @@
+sources = ['util.c']
+
+headers = ['util.h']
+
+# libmeson_example = library('meson-example-' + meson_example_api_version,
+#     sources,
+#     soversion: meson_example_soversion,
+#     version: meson_example_version,
+#     install: true,
+# )
+
+# pkg.generate(
+#     filebase: 'meson-example-' + meson_example_api_version,
+#     version: meson.project_version(),
+#     name: 'meson-example',
+#     subdirs: 'meson-example-' + meson_example_api_version,
+#     description: 'A library demostrating doing it right in meson',
+#     libraries: libmeson_example
+# )
+
+# install_headers (headers,
+#     subdir: 'meson-example-@0@'.format(meson_example_api_version))

main.c renamed to src/util.c

@@ -13,8 +13,8 @@
 #error "Unsupported platform"
 #endif
 
-#include "./inih/ini.h"
-#include "main.h"
+#include "ini.h"
+#include "util.h"
 
 /** PLUMBING UTILITY FUNCTIONS */
 char *compat_getenv(char *var) {
@@ -62,7 +62,7 @@ void show_help() {
 /** APPLICATION UTILITY FUNCTIONS */
 void deploy_symlink(struct Entry entry) {
 #ifdef __linux__
-	symlink(source, target);
+	// symlink(source, target);
 #endif
 }
 
@@ -305,7 +305,7 @@ char pwddir[PATH_MAX];
 			if (thing == NULL) {
 				thing = config->current_entry.source;
 			}
-			deploy_symlink(entry);
+			// deploy_symlink(entry);
 
 			config->current_entry_ready = false;
 			struct Entry entry = {
@@ -446,28 +446,3 @@ struct Cli parse_cli(int argc, char *argv[]) {
 
 	return cli;
 }
-
-#ifdef IS_NOT_TEST
-int main(int argc, char *argv[]) {
-	struct Cli cli = parse_cli(argc, argv);
-	if (cli.help) {
-		show_help();
-		exit(0);
-	}
-	struct Config config = parse_config(cli.config_file);
-
-	if (STR_EQ(cli.command, "init")) {
-		command_init(cli, config);
-	} else if (STR_EQ(cli.command, "list")) {
-		command_list(cli, config);
-	} else if (STR_EQ(cli.command, "deploy")) {
-		command_deploy(cli, config);
-	} else if (STR_EQ(cli.command, "replace")) {
-		command_replace(cli, config);
-	} else if (STR_EQ(cli.command, "undeploy")) {
-		command_undeploy(cli, config);
-	} else {
-		die("Command not accounted for");
-	}
-}
-#endif

main.h renamed to src/util.h

@@ -51,7 +51,11 @@ struct ExpandStringResult {
 	enum ExpandStringCode code;
 	char *str;
 };
+int parse_config_handler(void *data, const char *section, const char *key, const char *value);
+struct Cli parse_cli(int argc, char *argv[]);
+struct Config parse_config(char *config_file);
 
+void die(char *message);
 struct ExpandStringResult expand_string(char *input, struct ExpandStringVars vars);
 void command_init(struct Cli cli, struct Config config);
 void command_list(struct Cli cli, struct Config config);