Skip to content

sync mkn.kul #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PhilipDeegan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sync mkn.kul #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build_nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ jobs:

- env:
MKN_LIB_LINK_LIB: 1
KUL_GIT_CO: --depth 1
MKN_KUL_GIT_CO: --depth 1
run: |
sudo apt update && sudo apt install -y llvm
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
chmod +x mkn
KLOG=2 ./mkn clean build run -dtOa "-std=c++17 -fPIC"
Expand Down
2 changes: 1 addition & 1 deletion .sublime-project.sublime-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"project": ".sublime-project"
"project": ".sublime-project"
}
2 changes: 1 addition & 1 deletion mkn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ src: mod.cpp
mode: shared
if_arg:
win_shared: -DYAML_CPP_DLL
shared: -DKUL_SHARED
shared: -DMKN_KUL_SHARED

profile:
- name: base
Expand Down
10 changes: 4 additions & 6 deletions mod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string_view>
#include <unordered_set>

#include "maiken/module/init.hpp"

Expand Down Expand Up @@ -73,8 +72,7 @@ class LLVM_OptRec_Module : public maiken::Module {

public:
void init(maiken::Application &a, YAML::Node const &node)
KTHROW(std::exception) override {
}
KTHROW(std::exception) override {}

void compile(maiken::Application &a, YAML::Node const &node)
KTHROW(std::exception) override {
Expand All @@ -89,7 +87,7 @@ class LLVM_OptRec_Module : public maiken::Module {
mkn::kul::Dir hmtl{"res_html", a.buildDir()};
hmtl.mk();

mkn::kul::Process p{"/usr/lib/llvm-14/share/opt-viewer/opt-viewer.py"};
mkn::kul::Process p{"/usr/share/opt-viewer/opt-viewer.py"};
p << res.mini() << "--output-dir" << hmtl.mini();
KLOG(DBG) << p;
p.start();
Expand All @@ -98,10 +96,10 @@ class LLVM_OptRec_Module : public maiken::Module {

} // namespace mkn::clang

extern "C" KUL_PUBLISH maiken::Module *maiken_module_construct() {
extern "C" MKN_KUL_PUBLISH maiken::Module *maiken_module_construct() {
return new mkn ::clang ::LLVM_OptRec_Module;
}

extern "C" KUL_PUBLISH void maiken_module_destruct(maiken::Module *p) {
extern "C" MKN_KUL_PUBLISH void maiken_module_destruct(maiken::Module *p) {
delete p;
}
Loading