smb2 use cmake and support android

Author: debugly

.github/workflows/opus.yml

@@ -5,11 +5,11 @@ on:
   pull_request:
     branches: [master]
 
-name: Create opus Release
+name: Opus
 
 jobs:
   build:
-    name: compile opus then deploy
+    name: compile apple and android opus then deploy
     runs-on: macos-14
     env:
       GH_TOKEN: ${{ github.token }}

.github/workflows/smb2.yml

@@ -5,16 +5,22 @@ on:
   pull_request:
     branches: [master]
 
-name: Create smb2 Release
+name: Smb2
 
 jobs:
   build:
-    name: compile smb2 then deploy
+    name: compile apple and android smb2 then deploy
     runs-on: macos-14
     env:
       GH_TOKEN: ${{ github.token }}
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+    - uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      with:
+        ndk-version: r21e
+        add-to-path: false
+        local-cache: true
     - name: One Step
       run: .github/workflows/onestep.sh smb2 all

configs/libs/smb2.sh

@@ -24,7 +24,8 @@
 
 export LIB_NAME='smb2'
 export LIPO_LIBS="libsmb2"
-export LIB_DEPENDS_BIN="cmake automake autoconf libtool"
+export LIB_DEPENDS_BIN="cmake"
+export CMAKE_TARGET_NAME=smb2
 export GIT_LOCAL_REPO=extra/smb2
 export GIT_COMMIT=libsmb2-6.2
 export REPO_DIR=smb2

do-compile/android/smb2.sh

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<[email protected]>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# call common cmake build shell
+./cmake-compatible.sh "-DENABLE_LIBKRB5=0 -DENABLE_GSSAPI=0"

do-compile/apple/cmake-compatible.sh

@@ -73,5 +73,10 @@ echo "----------------------"
 echo "[*] compile $LIB_NAME"
 echo "----------------------"
 
-cmake --build . --target $CMAKE_TARGET_NAME --config Release -- CODE_SIGNING_ALLOWED=NO
+if [[ "$MR_DEBUG" == "debug" ]];then
+    cmake --build . --target $CMAKE_TARGET_NAME --config Debug -- CODE_SIGNING_ALLOWED=NO
+else
+    cmake --build . --target $CMAKE_TARGET_NAME --config Release -- CODE_SIGNING_ALLOWED=NO
+fi
+
 cmake --install .

do-compile/apple/smb2.sh

@@ -13,77 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-
-set -e
-
-THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
-cd "$THIS_DIR"
-
-echo "=== [$0] check env begin==="
-env_assert "MR_ARCH"
-env_assert "MR_BUILD_NAME"
-env_assert "MR_CC"
-env_assert "MR_BUILD_SOURCE"
-env_assert "MR_BUILD_PREFIX"
-env_assert "MR_SYS_ROOT"
-env_assert "MR_HOST_NPROC"
-echo "MR_DEBUG:$MR_DEBUG"
-echo "MR_OTHER_CFLAGS:$MR_OTHER_CFLAGS"
-echo "===check env end==="
-
-if [[ "$MR_DEBUG" == "debug" ]];then
-    export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -g"
-else
-    export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -Os"
-fi
-
-# prepare build config
-CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --enable-static --disable-shared --disable-dependency-tracking --disable-silent-rules"
-CFG_FLAGS="$CFG_FLAGS --without-libkrb5 --disable-werror"
-
-CFLAGS="-arch $MR_ARCH $MR_OTHER_CFLAGS -Wno-everything -DHAVE_SOCKADDR_LEN=1 -DHAVE_SOCKADDR_STORAGE=1"
-
-if [[ "$MR_DEBUG" == "debug" ]];then
-   CFG_FLAGS="${CFG_FLAGS} use_examples=yes --disable-optimizations"
-fi
-
-# for cross compile
-if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]];then
-    echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
-    # https://www.gnu.org/software/automake/manual/html_node/Cross_002dCompilation.html
-    CFLAGS="$CFLAGS -isysroot $MR_SYS_ROOT"
-    CFG_FLAGS="$CFG_FLAGS --host=$MR_ARCH-apple-darwin --with-sysroot=$MR_SYS_ROOT"
-fi
-
-echo "----------------------"
-echo "[*] configurate $LIB_NAME"
-echo "----------------------"
-
-cd $MR_BUILD_SOURCE
-
-if [[ -f 'configure' ]]; then
-   echo "reuse configure"
-else
-   echo "auto generate configure"
-   autoreconf -if >/dev/null
-fi
-
-echo 
-echo "CC: $MR_CC"
-echo "CFG_FLAGS: $CFG_FLAGS"
-echo "CFLAGS: $CFLAGS"
-echo 
-
-./configure $CFG_FLAGS \
-   CC="$MR_CC" \
-   CFLAGS="$CFLAGS" \
-   LDFLAGS="$CFLAGS"
-
-#----------------------
-echo "----------------------"
-echo "[*] compile $LIB_NAME"
-echo "----------------------"
 
-make -j$MR_HOST_NPROC >/dev/null
-make install
+# call common cmake build shell
+./cmake-compatible.sh "-DENABLE_LIBKRB5=0 -DENABLE_GSSAPI=0"

do-init/init-repo.sh

@@ -61,7 +61,7 @@ function pull_common() {
     fi
 
     # fix fatal: 'stable' is not a commit and a branch 'localBranch' cannot be created from it
-    git checkout ${GIT_COMMIT} -B localBranch
+    git checkout -B localBranch ${GIT_COMMIT}
     cd - >/dev/null
 }