Skip to content
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.

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

Update Build Pipeline #62

Open
10 of 16 tasks
fundamental opened this issue Jul 19, 2020 · 5 comments
Open
10 of 16 tasks

Update Build Pipeline #62

fundamental opened this issue Jul 19, 2020 · 5 comments

Comments

@fundamental
Copy link
Member

fundamental commented Jul 19, 2020

  • alpine docker for mingw zynaddsubfx
  • alpine docker for mingw zest
  • alpine docker for zynaddsubfx
  • alpine docker for zest
  • ubuntu docker for zynaddsubfx
  • ubuntu docker for zest
  • arch docker for zynaddsubfx
  • arch docker for zest
  • no network arch docker for zynaddsubfx
  • no network arch docker for zest
  • full pipeline to produce demo image for windows via docker
  • full pipeline to produce demo image for linux via docker
  • virtualbox setup for testing windows
  • unknown-platform ardour docker test image
  • nightly build setup
  • new macOS build/testing setup TBD
@fundamental
Copy link
Member Author

Status at the end of today is the alpine mingw build is at the stage of applying the patches for building mruby-zest.
It's building from a local checkout, so I should be able to modify and resume the build. After the patching succeeds I'll likely close out the relevant PRs on that topic and try to get the newer scripts to run to completion.

@fundamental
Copy link
Member Author

Alpine mingw build is almost working. Once it is, then modifications in the githubaction branch of mruby-zest-build ought to be merged.

@fundamental
Copy link
Member Author

Removing the semi-vendored copy of libuv should be an overall improvement (TODO). Right now it's sort-of hacked in to use one outside of mruby-zest-build.

@fundamental
Copy link
Member Author

The basic build completes for arch/ubuntu/alpine/alpine-mingw. Some changes need to be checked in to finish the alpine-mingw build in a clean manner. No network builds need some sort of base image first with dependencies installed before running make/cmake/ninja/etc.

@fundamental
Copy link
Member Author

No net build setup for arch, modifications are still needed for zest to avoid the old libuv setup. It seems zest should likely not have the builtin libuv build process.

diff --git a/Makefile b/Makefile
index f3e3be2..6409068 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 UV_DIR    = libuv-v1.9.1
 UV_FILE   = $(UV_DIR).tar.gz
 UV_URL    = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE)
-	 
+
 
 all:
 	ruby ./rebuild-fcache.rb
@@ -15,7 +15,7 @@ all:
 	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
 		./deps/libnanovg.a \
 		src/osc-bridge/libosc-bridge.a \
-		./deps/$(UV_DIR)/.libs/libuv.a  -lm -lX11 -lGL -lpthread
+		-luv -lm -lX11 -lGL -lpthread
 	$(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99
 
 osx:
@@ -30,7 +30,7 @@ osx:
 	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
 		./deps/libnanovg.a \
 		src/osc-bridge/libosc-bridge.a \
-		./deps/$(UV_DIR)/.libs/libuv.a  -lm -framework OpenGL -lpthread
+		-luv -lm -framework OpenGL -lpthread
 	$(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99
 
 windows:
diff --git a/build_config.rb b/build_config.rb
index 00f1f69..8ac34fb 100644
--- a/build_config.rb
+++ b/build_config.rb
@@ -96,7 +96,7 @@ build_type.new(build_name) do |conf|
   conf.cc do |cc|
       cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src"
       cc.include_paths << "#{`pwd`.strip}/../deps/pugl/"
-      cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/"
+      #cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/"
       cc.include_paths << "/usr/share/mingw-w64/include/" if windows
       cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows
       cc.flags << "-DLDBL_EPSILON=1e-6" if windows
@@ -117,7 +117,8 @@ build_type.new(build_name) do |conf|
       linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a"
       linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libnanovg.a"
       if(!windows)
-        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libuv.a"
+        #linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libuv.a"
+        linker.libraries << 'uv'
         if(ENV['OS'] != "Mac")
           linker.libraries << 'GL'
           linker.libraries << 'X11'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant