search

jprider63 / vrdt

5 stars 0 forks source link

Rename and split crdtoa into kyowon-*, merge to master #2

Closed plredmond closed 4 years ago

plredmond commented 4 years ago

I redid the merge manually by splitting up crdtoa into the packages kyowon-{core,client,server} with narrow dependencies. I also split out kyowon-reflex from kyowon-client so that kyowon-client doesn't depend on vrdt.

~I can't get kyowon-reflex or vrdt to build. I tried pulling master and building kyowon-client (containing Reflexi.hs) and vrdt. Neither worked on the master branch either! Therefore I think the problem isn't in this branch.~

The rough dependencies are:

plredmond commented 4 years ago

This PR is pretty long. Sorry about that. Future PRs will be smaller and more targeted.

jprider63 commented 4 years ago

master builds for me. You might need an external dependency. What error are you getting?

This doesn't build, and it's sort of hard to follow what's changed. I might pull in da18ca4454fce5f25dcb862fd7964265cd95561f to a separate branch to see what happens.

plredmond commented 4 years ago

I'm able to build vrdt on both master and this branch now. I think the problem was with some cache file that cabal had placed on disk.

Working on building kyowon-reflex and then the examples dir now.

jprider63 commented 4 years ago

I think I have everything building. I'll push soon.

jprider63 commented 4 years ago

I've pushed to the merging branch. Everything builds and the examples run. kyowon-reflex still should be pulled out and there's a bunch of cleanup to do, but I'm not too worried about this for now. I'll probably merge that to master after you have time to look over it.

plredmond commented 4 years ago

I've looked your merging branch and it basically undoes much of the careful work I've done to split the latest crdtoa into your preferred package structure. It also duplicates some things? I'm not comfortable with this unilateral approach that you're taking and I hope you'll consider giving feedback on this PR so we can merge it, instead of your merging branch.

plredmond commented 4 years ago

Everything works now on this branch.

jprider63 commented 4 years ago

Maybe we had a misunderstanding? I previously split up crdtoa based on what was committed at the time. I was expecting you to merge into that.

plredmond commented 4 years ago

I re-split-up the crdtoa package by generating new packages per discussion in our text messages.

plredmond commented 4 years ago

I'm able to build this branch with both cabal and stack now.

Though, for stack to work I had to create dummy files for some things that weren't committed. Since these things are likely on your harddisk, I don't want to add them to this branch. Doing so might break your environment.

diff --git a/examples/event/LICENSE b/examples/event/LICENSE
new file mode 100644
index 0000000..e69de29
diff --git a/examples/event/test/Spec.hs b/examples/event/test/Spec.hs
new file mode 100644
index 0000000..6ca9a1f
--- /dev/null
+++ b/examples/event/test/Spec.hs
@@ -0,0 +1 @@
+module Main where
diff --git a/examples/max/LICENSE b/examples/max/LICENSE
new file mode 100644
index 0000000..e69de29
diff --git a/examples/max/test/Spec.hs b/examples/max/test/Spec.hs
new file mode 100644
index 0000000..6ca9a1f
--- /dev/null
+++ b/examples/max/test/Spec.hs
@@ -0,0 +1 @@
+module Main where
diff --git a/vrdt/LICENSE b/vrdt/LICENSE
new file mode 100644
index 0000000..e69de29
diff --git a/vrdt/test/Spec.hs b/vrdt/test/Spec.hs
new file mode 100644
index 0000000..6ca9a1f
--- /dev/null
+++ b/vrdt/test/Spec.hs
@@ -0,0 +1 @@
+module Main where
plredmond commented 4 years ago

Thanks. I've created #6 to resolve #5, as well as a few followup issues.