Skip to content

Commit

Permalink
Fix windows archive
Browse files Browse the repository at this point in the history
  • Loading branch information
drunkbatya committed Dec 18, 2023
1 parent 59c7e3b commit 614289f
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 20 deletions.
37 changes: 19 additions & 18 deletions darwin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
#ADD scripts/build-mac-binutils.sh /toolchain/src/
#RUN bash /toolchain/src/build-mac-binutils.sh

FROM MacOSVenturaWithBrew
RUN brew install coreutils
ADD https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz /toolchain/src/src/archives/
RUN tar -xvf /toolchain/src/src/archives/Python-3.11.2.tgz -C /toolchain/src/src/
RUN mv /toolchain/src/src/Python-3.11.2 /toolchain/src/src/python
ADD https://www.openssl.org/source/openssl-1.1.1w.tar.gz /toolchain/src/src/archives/
RUN tar -xvf /toolchain/src/src/archives/openssl-1.1.1w.tar.gz -C /toolchain/src/src/
RUN mv /toolchain/src/src/openssl-1.1.1w /toolchain/src/src/openssl
ADD scripts/build-mac-python-libs.sh /toolchain/src/
ADD scripts/build-mac-python.sh /toolchain/src/
ADD scripts/relink.sh /usr/bin
RUN bash /toolchain/src/build-mac-python-libs.sh
RUN bash /toolchain/src/build-mac-python.sh
RUN relink.sh /toolchain/mac-x86_64-output-root
RUN relink.sh /toolchain/mac-arm64-output-root
#FROM MacOSVenturaWithBrew
#RUN brew install coreutils
#ADD https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz /toolchain/src/src/archives/
#RUN tar -xvf /toolchain/src/src/archives/Python-3.11.2.tgz -C /toolchain/src/src/
#RUN mv /toolchain/src/src/Python-3.11.2 /toolchain/src/src/python
#ADD https://www.openssl.org/source/openssl-1.1.1w.tar.gz /toolchain/src/src/archives/
#RUN tar -xvf /toolchain/src/src/archives/openssl-1.1.1w.tar.gz -C /toolchain/src/src/
#RUN mv /toolchain/src/src/openssl-1.1.1w /toolchain/src/src/openssl
#ADD scripts/build-mac-python-libs.sh /toolchain/src/
#ADD scripts/build-mac-python.sh /toolchain/src/
#ADD scripts/relink.sh /usr/bin
#RUN bash /toolchain/src/build-mac-python-libs.sh
#RUN bash /toolchain/src/build-mac-python.sh
#RUN relink.sh /toolchain/mac-x86_64-output-root
#RUN relink.sh /toolchain/mac-arm64-output-root

#FROM flipperzero-toolchain-binutils AS flipperzero-toolchain-gdb
#COPY --from=flipperzero-toolchain-python /toolchain/mac-x86_64-output-root /toolchain/mac-x86_64-output-root
Expand Down Expand Up @@ -73,7 +73,7 @@ RUN relink.sh /toolchain/mac-arm64-output-root
#RUN relink.sh /toolchain/mac-x86_64-output-root
#RUN relink.sh /toolchain/mac-arm64-output-root

FROM MacOSVenturaWithBrew AS flipperzero-toolchain
FROM MacOSVenturaWithBrew AS flipperzero-toolchain-mac
#RUN brew install coreutils bison
#RUN brew link bison --force
#COPY --from=flipperzero-toolchain-gdb /toolchain/mac-x86_64-output-root /toolchain/mac-x86_64-output-root
Expand All @@ -87,8 +87,9 @@ FROM MacOSVenturaWithBrew AS flipperzero-toolchain
#RUN /toolchain/mac-x86_64-output-root/bin/python3 -m pip install -r /toolchain/requirements.txt
#RUN /toolchain/mac-arm64-output-root/bin/python3 -m pip install --upgrade pip
#RUN /toolchain/mac-arm64-output-root/bin/python3 -m pip install -r /toolchain/requirements.txt
ADD scripts/strip.sh /usr/bin/
#ADD scripts/strip.sh /usr/bin/
#ADD scripts/relink.sh /usr/bin/
#RUN relink.sh /toolchain/mac-x86_64-output-root
#RUN relink.sh /toolchain/mac-arm64-output-root
RUN strip.sh
#RUN strip.sh
ADD scripts/bundle_upload.sh /usr/bin/
66 changes: 66 additions & 0 deletions darwin/scripts/bundle_upload.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#!/bin/bash

set -euo pipefail;

# external required variables:
# TOOLCHAIN_VERSION
# INDEXER_URl
# INDEXER_TOKEN
echo "Bundling toolchain version: $TOOLCHAIN_VERSION";

MAC_X86_64_OUTPUT_ROOT=/toolchain/mac-x86_64-output-root
MAC_ARM64_OUTPUT_ROOT=/toolchain/mac-arm64-output-root
GCC_VERSION="12.3";

MAC_X86_64_OUTPUT_ROOT_BASE_DIR="$(dirname "$MAC_X86_64_OUTPUT_ROOT")";
MAC_X86_64_TOOLCHAIN_DIR_NAME="gcc-arm-none-eabi-$GCC_VERSION-x86_64-darwin-flipper";
MAC_X86_64_OUTPUT_ROOT_NEW="$MAC_X86_64_OUTPUT_ROOT_BASE_DIR/$MAC_X86_64_TOOLCHAIN_DIR_NAME";
MAC_X86_64_OUTPUT_FILE="$MAC_X86_64_OUTPUT_ROOT_NEW-$TOOLCHAIN_VERSION.tar.gz";

MAC_ARM64_OUTPUT_ROOT_BASE_DIR="$(dirname "$MAC_ARM64_OUTPUT_ROOT")";
MAC_ARM64_TOOLCHAIN_DIR_NAME="gcc-arm-none-eabi-$GCC_VERSION-arm64-darwin-flipper";
MAC_ARM64_OUTPUT_ROOT_NEW="$MAC_ARM64_OUTPUT_ROOT_BASE_DIR/$MAC_ARM64_TOOLCHAIN_DIR_NAME";
MAC_ARM64_OUTPUT_FILE="$MAC_ARM64_OUTPUT_ROOT_NEW-$TOOLCHAIN_VERSION.tar.gz";

function prepare_dir_x86_64() {
mv "$MAC_X86_64_OUTPUT_ROOT" "$MAC_X86_64_OUTPUT_ROOT_NEW";
printf "$TOOLCHAIN_VERSION" > "$MAC_X86_64_OUTPUT_ROOT_NEW/VERSION";
}
function prepare_dir_arm64() {
mv "$MAC_ARM64_OUTPUT_ROOT" "$MAC_ARM64_OUTPUT_ROOT_NEW";
printf "$TOOLCHAIN_VERSION" > "$MAC_ARM64_OUTPUT_ROOT_NEW/VERSION";
}

function make_bundle_x86_64() {
pushd "$MAC_X86_64_OUTPUT_ROOT_BASE_DIR";
tar -czvf \
"$MAC_X86_64_OUTPUT_FILE" \
"$MAC_X86_64_TOOLCHAIN_DIR_NAME";
popd;
}
function make_bundle_arm64() {
pushd "$MAC_ARM64_OUTPUT_ROOT_BASE_DIR";
tar -czvf \
"$MAC_ARM64_OUTPUT_FILE" \
"$MAC_ARM64_TOOLCHAIN_DIR_NAME";
popd;
}

function upload_bundle_x86_64() {
curl --fail -L -H "Token: $INDEXER_TOKEN" \
-F "files=@$MAC_X86_64_OUTPUT_FILE" \
"$INDEXER_URL"/toolchain/uploadfilesraw;
}
function upload_bundle_arm64() {
curl --fail -L -H "Token: $INDEXER_TOKEN" \
-F "files=@$MAC_ARM64_OUTPUT_FILE" \
"$INDEXER_URL"/toolchain/uploadfilesraw;
}

prepare_dir_x86_64;
make_bundle_x86_64;
upload_bundle_x86_64;
prepare_dir_arm64;
make_bundle_arm64;
upload_bundle_arm64;

4 changes: 2 additions & 2 deletions windows/scripts/bundle_upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARCH="x86_64";
WINDOWS_OUTPUT_ROOT_BASE_DIR="$(dirname "$WINDOWS_OUTPUT_ROOT")";
WINDOWS_TOOLCHAIN_DIR_NAME="gcc-arm-none-eabi-$GCC_VERSION-$ARCH-windows-flipper";
WINDOWS_OUTPUT_ROOT_NEW="$WINDOWS_OUTPUT_ROOT_BASE_DIR/$WINDOWS_TOOLCHAIN_DIR_NAME";
WINDOWS_OUTPUT_FILE="$WINDOWS_OUTPUT_ROOT_NEW-$TOOLCHAIN_VERSION.tar.gz";
WINDOWS_OUTPUT_FILE="$WINDOWS_OUTPUT_ROOT_NEW-$TOOLCHAIN_VERSION.zip";

function prepare_dir() {
mv "$WINDOWS_OUTPUT_ROOT" "$WINDOWS_OUTPUT_ROOT_NEW";
Expand All @@ -24,7 +24,7 @@ function prepare_dir() {

function make_bundle() {
pushd "$WINDOWS_OUTPUT_ROOT_BASE_DIR";
tar -czvf \
zip \
"$WINDOWS_OUTPUT_FILE" \
"$WINDOWS_TOOLCHAIN_DIR_NAME";
popd;
Expand Down

0 comments on commit 614289f

Please sign in to comment.