mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
8abe8320d2
Motiviation:
* Reproducing issues in CI is currently difficult
* Predicting issues in CI is currently difficult if you are not on
ubuntu 18.04
* Reproducing issues submitted from other distros is currently done by
creating a VM of that distro and building qtox for it locally
* Documentation for how to build on different distros is out of date
* Issues on non-ubuntu distributions are not caught by CI
* Cross compiling for windows locally is not trivial
* Iterating when working with custom build scripts is slow, scripts
don't necessarily support re-running without re-starting the docker
container and re-building qtox again
* Updating dependencies is a pain
Changes:
* docker-compose file has been added to the root of our repo.
After `docker compose run --rm ubuntu` (or other supported distros),
you are ready to compile and run qtox
* Dependencies are owned by dependency install scripts in buildscripts/.
This allows us to use the same exact dependencies in our
OSX/windows/linux scripts
* New docker images have been added for a variety of distributions.
These are now run in CI in a variety of configurations
* Docker images are cached in CI so rebuild time for the majority of
jobs is quite quick
* Build scripts have been trimmed to leverage state of docker
containers.
* Windows build script no longer installs anything, dependencies are
now managed by the windows_builder docker images
* Build scripts should now be easily re-runnable. Usage is now `docker
compose run --rm <image>` and then run the scripts
* All artifacts are now uploaded to github after build, this means we
can take an appimage/flatpak/exe/dmg for any given PR and try it out
without having to build it ourselves
Notes:
* Docker image size is quite important. We have a maximum of 5GB cache
space on github actions. The majority of the linux distro docker
images cache at ~300-400MB, which gives us room to test ~6 distros
after accounting for the sizes of flatpak/windows docker images
* Docker layer ordering is relatively intentional. Approximate order
should be that large dependencies that change infrequently should be
farther up. This lowers the amount of rebuilding we have to do when
dependencies are updated
* download_xxx.sh scripts are the cleanest way I could find to implement
a shared dependency map between osx scripts and docker containers.
Although it would be nice to have a single dependency mapping file,
splitting it into individual scripts allows us to only rebuild some
docker layers when dependencies are updated.
* Github actions are split between docker image building and docker
image use. This allows us to re-use the same docker images for
multiple jobs, but only build it once
* Unfortunately I could not find a way to de-duplicate the stitching
between jobs, so we have a lot of copy pasta in that area
120 lines
4.6 KiB
Diff
120 lines
4.6 KiB
Diff
diff -ruN libvpx/build/make/configure.sh patched/build/make/configure.sh
|
|
--- libvpx/build/make/configure.sh 2019-02-13 16:56:48.972857636 +0100
|
|
+++ patched/build/make/configure.sh 2019-02-13 16:50:37.995967583 +0100
|
|
@@ -1426,11 +1426,13 @@
|
|
win32)
|
|
add_asflags -f win32
|
|
enabled debug && add_asflags -g cv8
|
|
+ add_ldflags "-Wl,-no-undefined"
|
|
EXE_SFX=.exe
|
|
;;
|
|
win64)
|
|
add_asflags -f win64
|
|
enabled debug && add_asflags -g cv8
|
|
+ add_ldflags "-Wl,-no-undefined"
|
|
EXE_SFX=.exe
|
|
;;
|
|
linux*|solaris*|android*)
|
|
diff -ruN libvpx/build/make/Makefile patched/build/make/Makefile
|
|
--- libvpx/build/make/Makefile 2019-02-13 16:56:48.972857636 +0100
|
|
+++ patched/build/make/Makefile 2019-02-13 16:50:37.995967583 +0100
|
|
@@ -304,6 +304,7 @@
|
|
$(if $(quiet),@echo " [LD] $$@")
|
|
$(qexec)$$(LD) -shared $$(LDFLAGS) \
|
|
-Wl,--no-undefined -Wl,-soname,$$(SONAME) \
|
|
+ -Wl,-out-implib,libvpx.dll.a \
|
|
-Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
|
|
$$(filter %.o,$$^) $$(extralibs)
|
|
endef
|
|
@@ -388,7 +389,7 @@
|
|
.libs: $(LIBS)
|
|
@touch $@
|
|
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
|
|
-$(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
|
|
+$(foreach lib,$(filter %dll,$(LIBS)),$(eval $(call so_template,$(lib))))
|
|
$(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
|
|
$(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib))))
|
|
|
|
diff -ruN libvpx/configure patched/configure
|
|
--- libvpx/configure 2019-02-13 16:56:49.162860897 +0100
|
|
+++ patched/configure 2019-02-13 16:53:03.328719607 +0100
|
|
@@ -513,23 +513,23 @@
|
|
}
|
|
|
|
process_detect() {
|
|
- if enabled shared; then
|
|
+ #if enabled shared; then
|
|
# Can only build shared libs on a subset of platforms. Doing this check
|
|
# here rather than at option parse time because the target auto-detect
|
|
# magic happens after the command line has been parsed.
|
|
- case "${tgt_os}" in
|
|
- linux|os2|solaris|darwin*|iphonesimulator*)
|
|
+ # case "${tgt_os}" in
|
|
+ # linux|os2|solaris|darwin*|iphonesimulator*)
|
|
# Supported platforms
|
|
- ;;
|
|
- *)
|
|
- if enabled gnu; then
|
|
- echo "--enable-shared is only supported on ELF; assuming this is OK"
|
|
- else
|
|
- die "--enable-shared only supported on ELF, OS/2, and Darwin for now"
|
|
- fi
|
|
- ;;
|
|
- esac
|
|
- fi
|
|
+ # ;;
|
|
+ # *)
|
|
+ # if enabled gnu; then
|
|
+ # echo "--enable-shared is only supported on ELF; assuming this is OK"
|
|
+ # else
|
|
+ # die "--enable-shared only supported on ELF, OS/2, and Darwin for now"
|
|
+ # fi
|
|
+ # ;;
|
|
+ # esac
|
|
+ #fi
|
|
if [ -z "$CC" ] || enabled external_build; then
|
|
echo "Bypassing toolchain for environment detection."
|
|
enable_feature external_build
|
|
diff -ruN libvpx/examples.mk patched/examples.mk
|
|
--- libvpx/examples.mk 2019-02-13 16:56:49.162860897 +0100
|
|
+++ patched/examples.mk 2019-02-13 16:50:37.995967583 +0100
|
|
@@ -315,7 +315,7 @@
|
|
ifneq ($(filter os2%,$(TGT_OS)),)
|
|
SHARED_LIB_SUF=_dll.a
|
|
else
|
|
-SHARED_LIB_SUF=.so
|
|
+SHARED_LIB_SUF=.dll.a
|
|
endif
|
|
endif
|
|
CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF),.a)
|
|
diff -ruN libvpx/libs.mk patched/libs.mk
|
|
--- libvpx/libs.mk 2019-02-13 16:56:48.972857636 +0100
|
|
+++ patched/libs.mk 2019-02-13 16:50:37.995967583 +0100
|
|
@@ -256,12 +256,12 @@
|
|
LIBVPX_SO_SYMLINKS :=
|
|
LIBVPX_SO_IMPLIB := libvpx_dll.a
|
|
else
|
|
-LIBVPX_SO := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH)
|
|
-SHARED_LIB_SUF := .so
|
|
+LIBVPX_SO := libvpx.dll
|
|
+SHARED_LIB_SUF := .dll
|
|
EXPORT_FILE := libvpx.ver
|
|
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
|
|
- libvpx.so libvpx.so.$(SO_VERSION_MAJOR) \
|
|
- libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
|
|
+LIBVPX_SO_SYMLINKS :=
|
|
+
|
|
+
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -271,7 +271,7 @@
|
|
$(if $(LIBVPX_SO_IMPLIB), $(BUILD_PFX)$(LIBVPX_SO_IMPLIB))
|
|
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
|
|
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
|
|
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
|
|
+$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.dll
|
|
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
|
|
|
|
libvpx.def: $(call enabled,CODEC_EXPORTS)
|