Revert "dylib bundle"

This reverts commit 635189f0.

.gitlab-ci.yml

@@ -8,39 +8,45 @@ stages:
   - combine
   - deploy
 
-#aria2_src:
-#  stage: prepare
-#  tags:
-#    - linux
-#  script:
+aria2_src:
+  stage: prepare
+  tags:
+    - linux
+  script:
     #- apt update && apt -y install libxml2-dev libcppunit-dev autoconf automake autotools-dev autopoint libtool
     #- git clone -b release-${ARIA2_VERSION} https://github.com/aria2/aria2 aria2-src
     #- cd aria2-src
     #- autoreconf -i
     #- cd ..
-#    - mkdir aria2-src
-#    - wget -O - https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}.tar.gz | tar #--strip-components=1 -C aria2-src -zxf -
-#  artifacts:
-#    paths:
-#      - aria2-src
+    - mkdir aria2-src
+    - wget -O - https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}.tar.gz | tar --strip-components=1 -C aria2-src -zxf -
+  artifacts:
+    paths:
+      - aria2-src
 
 .macOS_bin_arch:
   stage: build
   before_script:
-    - brew install gnu-tar zstd aria2 dylibbundler libxml2
-  dependencies: []
+    - brew install automake autoconf libtool pkg-config docutils libxml2 git gnu-tar zstd
+  dependencies:
+    - aria2_src
   artifacts:
     paths:
       - arch-bin
   script:
-    - targetDir=arch-bin/${targetArch}
-    - mkdir -p ${targetDir}
-    - cd ${targetDir}
-    - cp -L -f ${homebrewRoot}/bin/gtar .
-    - cp -L -f ${homebrewRoot}/bin/zstd .
-    - cp -L -f ${homebrewRoot}/bin/aria2c .
-    - dylibbundler -od -b -x ./aria2c -d ./libs-${targetArch} -p @executable_path/libs-${targetArch}
-    - cd ../..
+    - export PATH=${PATH}:${homebrewRoot}/opt/gettext/bin
+    - export PKG_CONFIG_PATH="${homebrewRoot}/opt/libxml2/lib/pkgconfig"
+    - export LDFLAGS="-L${homebrewRoot}/opt/libxml2/lib"
+    - export CPPFLAGS="-I${homebrewRoot}/opt/libxml2/include"
+
+    - cd aria2-src
+    - mv ../aria2-makefiles/Makefile.${targetArch} ./Makefile.release
+    - make -f ./Makefile.release aria2.${targetArch}.build
+
+    - mkdir -p arch-bin/${targetArch}
+    - cp -L -f ${homebrewRoot}/bin/gtar arch-bin/${targetArch}/
+    - cp -L -f ${homebrewRoot}/bin/zstd arch-bin/${targetArch}/
+    - mv aria2.${targetArch}/aria2c arch-bin/${targetArch}/
 
 macOS_bin_x86_64:
   extends: .macOS_bin_arch
@@ -72,12 +78,12 @@ macOS_bin:
     - brew install gnu-tar zstd
     - mkdir -p bin dist
     - cd arch-bin/x86_64
-    - ls -1  | sed '/libs-/d' | xargs -I {} lipo -create -output ../../bin/{} {} ../arm64/{}
+    - ls -1 | xargs -I {} lipo -create -output ../../bin/{} {} ../arm64/{}
     - cd ../../
     - gtar zcvf ./dist/mycard-mat-macos.tar.gz bin
 
 windows_bin:
-  stage: build
+  stage: prepare
   dependencies: []
   tags:
     - linux