fix: repair universal build again. python on mac is now 3.11.4

lukso-network · Aug 12, 2023 · 1cb9fa7 · 1cb9fa7
1 parent aab1777
commit 1cb9fa7
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/scripts/bundle_proxy_mac.sh b/src/scripts/bundle_proxy_mac.sh
@@ -17,7 +17,7 @@ TARGETPACKAGESMACPATH=$SCRIPTPATH/../../dist/packages.mac
 ETH2DEPOSITCLIPATH=$SCRIPTPATH/../vendors/$EDCDIR
 ETH2REQUIREMENTSPATH=$ETH2DEPOSITCLIPATH/requirements.txt
 
-export PYTHONPATH=$TARGETPACKAGESMACPATH:$TARGETPACKAGESPATH:$ETH2DEPOSITCLIPATH:$(python3 -c "import sys;print(':'.join(sys.path))")
+PYTHONPATH=$TARGETPACKAGESMACPATH:$TARGETPACKAGESPATH:$ETH2DEPOSITCLIPATH:$(python3 -c "import sys;print(':'.join(sys.path))")
 echo $PYTHONPATH
 export PATH=$TARGETPACKAGESMACPATH/bin:$PATH
 DISTBINPATH=$SCRIPTPATH/../../build/bin
@@ -47,27 +47,28 @@ echo $VERSION
 
 python3 -m pip install pip -U
 
-python3 -m pip install -U cython==0.29.33 --no-binary :all: --target $TARGETPACKAGESMACPATH
+python3 -m pip install -U cython==0.29.33 --no-binary :all:
 python3 -m pip install $VERSION --no-binary :all: --target $TARGETPACKAGESMACPATH
-python3 -m pip install cytoolz==0.12.1 --no-binary :all: --target $TARGETPACKAGESMACPATH
+python3 -m pip install cytoolz==0.12.2 --no-binary :all: --target $TARGETPACKAGESMACPATH
 python3 -m pip install -r ./src/vendors/tools-key-gen-cli/build_configs/macos/requirements.txt --target $TARGETPACKAGESMACPATH
-python3 -m pip install -r ./src/vendors/tools-key-gen-cli/build_configs/macos/requirements.pyinstaller.txt --target $TARGETPACKAGESMACPATH
-python3 -m pip install -r $ETH2REQUIREMENTSPATH --target $TARGETPACKAGESPATH --no-deps
-python3 -m pip install -U pyinstaller==5.9.0 --target $TARGETPACKAGESPATH
+python3 -m pip install -U pyinstaller==5.9.0
+python3 -m pip install -U -r ./src/vendors/tools-key-gen-cli/build_configs/macos/requirements.pyinstaller.txt
 
 # Bundling Python stakingdeposit_proxy
-pyinstaller \
+PYTHONPATH="$PYTHONPATH" pyinstaller \
     --distpath $DISTX64PATH \
     --target-arch x86_64 \
     --add-data "$SRCINTLPATH:staking_deposit/intl" \
     -p $PYTHONPATH \
     $SCRIPTPATH/stakingdeposit_proxy.py
-pyinstaller \
+find $DISTX64PATH -print
+PYTHONPATH="$PYTHONPATH" pyinstaller \
     --distpath $DISTARMPATH \
     --target-arch arm64 \
     --add-data "$SRCINTLPATH:staking_deposit/intl" \
     -p $PYTHONPATH \
     $SCRIPTPATH/stakingdeposit_proxy.py
+find $DISTX64PATH -print
 
 # Adding word list
 cp $SRCWORDSPATH/* $DISTWORDSPATH