Fix some errors with new mamba version

FreeCAD · Dec 14, 2024 · f4733dc · f4733dc
1 parent 1d4ef38
commit f4733dc
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,11 @@
 conda/linux/AppDir/usr
 conda/linux/AppDir/*.desktop
 conda/linux/AppDir/*.svg
-**packages.txt
+conda/osx/APP
+conda/win/FreeCAD_*
 **.AppImage
+**.dmg
+**.7z
 **-SHA256.txt
+**packages.txt
 **bundle_name.txt
diff --git a/conda/osx/create_bundle.sh b/conda/osx/create_bundle.sh
@@ -2,6 +2,8 @@
 
 conda_env="APP/FreeCAD.app/Contents/Resources"
 
+mkdir -p ${conda_env}
+
 mamba create -y --copy -c freecad/label/dev -c conda-forge -p ${conda_env} \
     python=3.11 \
     freecad=*dev \
@@ -49,6 +51,9 @@ cp ${conda_env}/bin_tmp/unflatten ${conda_env}/bin/
 sed -i "" '1s|.*|#!/usr/bin/env python|' ${conda_env}/bin/pip
 rm -rf ${conda_env}/bin_tmp
 
+#copy resources
+cp resources/* ${conda_env}
+
 #copy qt.conf
 cp qt.conf ${conda_env}/bin/
 cp qt.conf ${conda_env}/libexec/

diff --git a/...D.app/Contents/Resources/freecad-doc.icns → conda/osx/resources/freecad-doc.icns b/...D.app/Contents/Resources/freecad-doc.icns → conda/osx/resources/freecad-doc.icns
diff --git a/...pp/Contents/Resources/freecad-script.icns → conda/osx/resources/freecad-script.icns b/...pp/Contents/Resources/freecad-script.icns → conda/osx/resources/freecad-script.icns
diff --git a/...eeCAD.app/Contents/Resources/freecad.icns → conda/osx/resources/freecad.icns b/...eeCAD.app/Contents/Resources/freecad.icns → conda/osx/resources/freecad.icns
diff --git a/...PP/FreeCAD.app/Contents/Resources/qt.conf → conda/osx/resources/qt.conf b/...PP/FreeCAD.app/Contents/Resources/qt.conf → conda/osx/resources/qt.conf
diff --git a/conda/win/create_bundle.bat b/conda/win/create_bundle.bat
@@ -1,4 +1,4 @@
-set conda_env="fc_env"
+set conda_env=".\FreeCAD_env"
 set copy_dir="FreeCAD_Conda_Build"
 
 mkdir %copy_dir%