quickjs-tart

commit 45ec80fa11d29a4a016aa1f2f8e025d95b36ead9
parent dced980f91b8c68fae2f23e4e5e9f2f1562b5b10
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 24 Jan 2023 23:57:39 -0600

File cleanup and replaced build-essential with clang

Diffstat:
D
Dockerfile
 | 
31
-------------------------------
A
Dockerfile.android
 | 
32
++++++++++++++++++++++++++++++++
R
build.sh -> docker-android/build.sh
 | 
0

A
docker-android/install.sh
 | 
41
+++++++++++++++++++++++++++++++++++++++++
R
prepare.sh -> docker-android/prepare.sh
 | 
0

D
install.sh
 | 
41
-----------------------------------------

6 files changed, 73 insertions(+), 72 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -1,31 +0,0 @@
-FROM debian:bullseye-slim
-
-ENV LANG=C.UTF-8
-ENV DEBIAN_FRONTEND=noninteractive
-ENV ANDROID_HOME=/opt/android-sdk
-ENV REPO_URL=https://git.taler.net/quickjs-tart.git
-
-WORKDIR /opt/quickjs-build
-
-ADD prepare.sh ./
-ADD install.sh ./
-
-RUN ./prepare.sh
-RUN ./install.sh
-
-# Cleanup
-RUN apt-get -y autoremove --purge && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ADD *.sh ./
-ADD quickjs ./quickjs
-ADD subprojects ./subprojects
-ADD QuickJS-android ./QuickJS-android
-ADD meson.build ./
-ADD cross/build-android.sh ./cross/
-ADD *.js ./
-ADD *.c ./
-ADD *.h ./
-
-CMD ./build.sh
diff --git a/Dockerfile.android b/Dockerfile.android
@@ -0,0 +1,32 @@
+FROM debian:bullseye-slim
+
+ENV LANG=C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+ENV ANDROID_HOME=/opt/android-sdk
+ENV REPO_URL=https://git.taler.net/quickjs-tart.git
+
+WORKDIR /opt/quickjs-build
+
+ADD ./docker-android/prepare.sh ./
+ADD ./docker-android/install.sh ./
+
+RUN ./prepare.sh
+RUN ./install.sh
+
+# Cleanup
+RUN apt-get -y autoremove --purge && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD ./docker-android/build.sh ./
+ADD ./download_wallet_core_js.sh ./
+ADD ./quickjs ./quickjs
+ADD ./subprojects ./subprojects
+ADD ./QuickJS-android ./QuickJS-android
+ADD ./meson.build ./
+ADD ./cross/build-android.sh ./cross/
+ADD ./*.c ./
+ADD ./*.h ./
+ADD ./*.js ./
+
+CMD ./build.sh
diff --git a/build.sh b/docker-android/build.sh
diff --git a/docker-android/install.sh b/docker-android/install.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -e
+set -x
+
+# Install dependencies
+apt-get install -y --no-install-recommends \
+        clang \
+        curl \
+        default-jdk-headless \
+        git \
+	    unzip \
+	    wget
+
+apt-get install -y --no-install-recommends \
+        meson -t bullseye-backports
+
+# Install Android SDK Manager
+wget --no-verbose -O cmdline-tools.zip \
+     https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip
+unzip cmdline-tools.zip
+rm cmdline-tools.zip
+mkdir -p ${ANDROID_HOME}/cmdline-tools
+mv cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
+
+# Accept all those nasty EULAs
+mkdir -p ${ANDROID_HOME}/licenses/
+printf "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > ${ANDROID_HOME}/licenses/android-sdk-license
+
+# Install platform-tools and ndk-bundle (for stripping libraries)
+mkdir /root/.android
+touch /root/.android/repositories.cfg
+echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "ndk-bundle"
+
+# Add $ANDROID_HOME and $ANDROID_SDK_ROOT to PATH
+# printf 'export PATH=$PATH:%s' $ANDROID_HOME/cmdline-tools/latest/bin > ~/.bashrc
+printf 'export ANDROID_SDK_ROOT=%s' $ANDROID_HOME >> /etc/environment
+
+# clean up for smaller image size
+apt-get -y autoremove --purge
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/prepare.sh b/docker-android/prepare.sh
diff --git a/install.sh b/install.sh
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -e
-set -x
-
-# Install dependencies
-apt-get install -y --no-install-recommends \
-        build-essential \
-        curl \
-        default-jdk-headless \
-        git \
-	    unzip \
-	    wget
-
-apt-get install -y --no-install-recommends \
-        meson -t bullseye-backports
-
-# Install Android SDK Manager
-wget --no-verbose -O cmdline-tools.zip \
-     https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip
-unzip cmdline-tools.zip
-rm cmdline-tools.zip
-mkdir -p ${ANDROID_HOME}/cmdline-tools
-mv cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
-
-# Accept all those nasty EULAs
-mkdir -p ${ANDROID_HOME}/licenses/
-printf "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > ${ANDROID_HOME}/licenses/android-sdk-license
-
-# Install platform-tools and ndk-bundle (for stripping libraries)
-mkdir /root/.android
-touch /root/.android/repositories.cfg
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "ndk-bundle"
-
-# Add $ANDROID_HOME and $ANDROID_SDK_ROOT to PATH
-# printf 'export PATH=$PATH:%s' $ANDROID_HOME/cmdline-tools/latest/bin > ~/.bashrc
-printf 'export ANDROID_SDK_ROOT=%s' $ANDROID_HOME >> /etc/environment
-
-# clean up for smaller image size
-apt-get -y autoremove --purge
-apt-get clean
-rm -rf /var/lib/apt/lists/*