xCFrameworks final path for lib [osx] now [macos]

apothecary/apothecary

@@ -1269,7 +1269,7 @@ function doCommand() {
 					# does this formula support the current build type?
 					local bFormulaType=0 # bool
 					isFormulaType $TYPE bFormulaType
-					if [ $bFormulaType == 0 ] ; then
+					if [ $bFormulaType == 0 ] && [ $TYPE != "macos" ] ; then
 						echoInfo " Skipping \"$currentLib\": $cmd not needed for type \"$TYPE\""
 					else
 						# do command
@@ -1547,6 +1547,10 @@ function frameworkFormula() {
 
     if [ ! -e "$LIBS_DIR/$1" ] ; then
         echoVerbose " Nothing to create framework from to merge in lib dest dir: \"$1\""
+        exit 0;
+    elif [  $1 == "pkg-config" ] ; then
+        echoVerbose " No need to create framework for: \"$1\""
+        exit 0;
     else
         rm -rf $LIBS_DIR_REAL/$1/lib/$TYPE/*.xcframework
 
@@ -1820,6 +1824,10 @@ function xframeworkFormula() {
 
     if [ ! -e "$LIBS_DIR/$1" ] ; then
         echoVerbose " Nothing to create framework from to merge in lib dest dir: \"$1\""
+        exit 0;
+    elif [  $1 == "pkg-config" ] ; then
+        echoVerbose " No need to create framework for: \"$1\""
+        exit 0;
     else
         # rm -rf $LIBS_DIR_REAL/$1/lib/$TYPE/*.xcframework
 

scripts/osx/build_xcframework.sh

@@ -17,9 +17,10 @@ else
     export BUNDLE=$BUNDLE_NO
 fi
 
-export TARGET=osx
+export TARGET=macos
 export ARCH=arm64
 export NO_FORCE=ON
+export XFRAMEWORKALL=TRUE
 
 echo "Target: $TARGET"
 echo "Architecture: $ARCH"
@@ -38,11 +39,7 @@ for formula in "${FORMULAS[@]}" ; do
     #echo "./apothecary $ARGS framework $formula_name"
     eval "cd $APOTHECARY_PATH";
     echo "---------"
-    eval "./apothecary $ARGS framework $formula_name" 
-
+    eval "./apothecary -x $ARGS framework $formula_name"
 done
 echo "Apothecary openFrameworks Build XCFramework for $TARGET complete."
-echo "========================"
-
-
-
+echo "========================"

scripts/osx/xcframework_all.sh

@@ -15,7 +15,6 @@ fi
 OF_LIBS=${OF_ROOT}/libs
 OF_ADDONS=${OF_ROOT}/addons
 
-# control 
 if [ -z "${BUILD_LIBRARIES+x}" ]; then
     BUILD_LIBRARIES=1
 fi
@@ -25,7 +24,7 @@ if [ -z "${MOVE_LIBRARIES+x}" ]; then
 fi
 
 if [ -z "${PLATFORM+x}" ]; then
-    PLATFORM=osx
+    PLATFORM=macos
 fi
 
 # if [ -z "${ARCH+x}" ]; then
@@ -112,7 +111,7 @@ sort_libraries() {
                 rm -rf ${addon_path}
             fi
             mkdir -p $addon_path
-            if ! command -v rsync &> /dev/null; then      
+            if ! command -v rsync &> /dev/null; then
                 cp -av ${OF_LIBS}/${addonslibs[i]}/* ${addon_path}
             else
                 rsync -av ${OF_LIBS}/${addonslibs[i]}/ ${addon_path}/
@@ -144,5 +143,4 @@ if [ ${MOVE_LIBRARIES} == 1 ]; then
    echo "========================"
 fi
 
-echo "Apothecary openFrameworks Build and installation complete."
-
+echo "Apothecary openFrameworks Build and installation complete."