Skip to content

Commit f4733dc

Browse files
committed
Fix some errors with new mamba version
1 parent 1d4ef38 commit f4733dc

File tree

7 files changed

+11
-2
lines changed

7 files changed

+11
-2
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
conda/linux/AppDir/usr
22
conda/linux/AppDir/*.desktop
33
conda/linux/AppDir/*.svg
4-
**packages.txt
4+
conda/osx/APP
5+
conda/win/FreeCAD_*
56
**.AppImage
7+
**.dmg
8+
**.7z
69
**-SHA256.txt
10+
**packages.txt
711
**bundle_name.txt

conda/osx/create_bundle.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
conda_env="APP/FreeCAD.app/Contents/Resources"
44

5+
mkdir -p ${conda_env}
6+
57
mamba create -y --copy -c freecad/label/dev -c conda-forge -p ${conda_env} \
68
python=3.11 \
79
freecad=*dev \
@@ -49,6 +51,9 @@ cp ${conda_env}/bin_tmp/unflatten ${conda_env}/bin/
4951
sed -i "" '1s|.*|#!/usr/bin/env python|' ${conda_env}/bin/pip
5052
rm -rf ${conda_env}/bin_tmp
5153

54+
#copy resources
55+
cp resources/* ${conda_env}
56+
5257
#copy qt.conf
5358
cp qt.conf ${conda_env}/bin/
5459
cp qt.conf ${conda_env}/libexec/

conda/osx/APP/FreeCAD.app/Contents/Resources/freecad-doc.icns renamed to conda/osx/resources/freecad-doc.icns

File renamed without changes.

conda/osx/APP/FreeCAD.app/Contents/Resources/freecad-script.icns renamed to conda/osx/resources/freecad-script.icns

File renamed without changes.

conda/osx/APP/FreeCAD.app/Contents/Resources/freecad.icns renamed to conda/osx/resources/freecad.icns

File renamed without changes.

conda/osx/APP/FreeCAD.app/Contents/Resources/qt.conf renamed to conda/osx/resources/qt.conf

File renamed without changes.

conda/win/create_bundle.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set conda_env="fc_env"
1+
set conda_env=".\FreeCAD_env"
22
set copy_dir="FreeCAD_Conda_Build"
33

44
mkdir %copy_dir%

0 commit comments

Comments
 (0)