From 36345612d7f5bd03dfbc63fbc38933109486ecc4 Mon Sep 17 00:00:00 2001 From: OmniTroid Date: Mon, 1 Jul 2024 18:00:23 +0200 Subject: Readme and script cleanup (#995) * Ignore .idea * Ignore build dir too * Remove unused Windows Docker files * Remove somewhat cryptic launch.sh script * Remove kebab (javascript) * Remove outdated release_macos script and rename the most up-to-date one to macos_release * Clean up README.md and delete the other ones * Add preliminary configure script * Add hint in dependencies * Remove obsolete CONTRIBUTING.md * let's write the configure script later * Adding this is so supremely ironic that I can't even * Update QtApng repo * Actually we needed that * Add comment * Contact should be h2 --- scripts/windows/Dockerfile | 26 ------------------------- scripts/windows/Dockerfile-mxe | 44 ------------------------------------------ scripts/windows/how-to-push.md | 19 ------------------ 3 files changed, 89 deletions(-) delete mode 100644 scripts/windows/Dockerfile delete mode 100644 scripts/windows/Dockerfile-mxe delete mode 100644 scripts/windows/how-to-push.md (limited to 'scripts/windows') diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile deleted file mode 100644 index 9d3cca0..0000000 --- a/scripts/windows/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM oldmud0/mxe-qt:5.13.0-win32-static-posix -#FROM fffaraz/qt:windows - -ENV TARGET_SPEC i686-w64-mingw32.static.posix - -# Build libarchive statically -WORKDIR /opt/mxe -RUN make -j4 MXE_TARGETS=${TARGET_SPEC} libarchive bzip2 xz lz4 zstd nettle expat libxml2 -WORKDIR / - -# Build Discord RPC statically -RUN git clone https://github.com/discordapp/discord-rpc -WORKDIR discord-rpc/build -RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake .. -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr/${TARGET_SPEC} -RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake --build . --config Release --target install -WORKDIR ../.. - -# Build QtApng statically -RUN git clone https://github.com/Skycoder42/QtApng -WORKDIR QtApng -# libpng contains a self-test entry point that takes precedence for some reason -# over the final build's entry point. -RUN sed -i "s/^main(/libpng_main(/g" src/3rdparty/libpng/src/pngtest.c -RUN /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake -RUN make && make install -WORKDIR .. \ No newline at end of file diff --git a/scripts/windows/Dockerfile-mxe b/scripts/windows/Dockerfile-mxe deleted file mode 100644 index 873e144..0000000 --- a/scripts/windows/Dockerfile-mxe +++ /dev/null @@ -1,44 +0,0 @@ -FROM ubuntu:18.04 - -RUN apt-get update -RUN apt-get install -y \ - autoconf \ - automake \ - autopoint \ - bash \ - bison \ - bzip2 \ - flex \ - g++ \ - g++-multilib \ - gettext \ - git \ - gperf \ - intltool \ - libc6-dev-i386 \ - libgdk-pixbuf2.0-dev \ - libltdl-dev \ - libssl-dev \ - libtool-bin \ - libxml-parser-perl \ - lzip \ - make \ - openssl \ - p7zip-full \ - patch \ - perl \ - pkg-config \ - python \ - ruby \ - sed \ - unzip \ - wget \ - xz-utils - -RUN git clone https://github.com/mxe/mxe.git -RUN mv mxe /opt/mxe -WORKDIR /opt/mxe -RUN make -j4 MXE_TARGETS="i686-w64-mingw32.static.posix" qtbase qtmultimedia libarchive -ENV PATH=/opt/mxe/usr/bin:$PATH - -WORKDIR / diff --git a/scripts/windows/how-to-push.md b/scripts/windows/how-to-push.md deleted file mode 100644 index 8c1c18d..0000000 --- a/scripts/windows/how-to-push.md +++ /dev/null @@ -1,19 +0,0 @@ -When you want to build a new version of Qt: -```docker -docker build -t mxe-windows-static . -f Dockerfile-mxe -docker tag mxe-windows-static oldmud0/mxe-qt:5.12.1-win32-static-posix -docker push oldmud0/mxe-qt:5.12.1-win32-static-posix -``` - -Remember to log into Docker Hub before attempting to push. - -When you want to build a new version of any dependency required for building AO: -```docker -docker build -t mxe-windows-static-ao . -f Dockerfile -docker tag mxe-windows-static-ao registry.gitlab.com/attorneyonline/ao2-client/builder-windows-i686 -docker push registry.gitlab.com/attorneyonline/ao2-client/builder-windows-i686 -``` - -Remember to create an access token in GitLab before attempting to push. - -GitLab CI depends on `builder-windows-i686` image to be present in the repository's registry in order for the Windows build to succeed. -- cgit