aboutsummaryrefslogtreecommitdiff
path: root/tools/darwin
diff options
context:
space:
mode:
Diffstat (limited to 'tools/darwin')
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-ios.command2
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-osx.command2
-rwxr-xr-xtools/darwin/Support/copyframeworks-ios.command85
3 files changed, 41 insertions, 48 deletions
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command
index 7d50847e89..1b6e548a51 100755
--- a/tools/darwin/Support/CopyRootFiles-ios.command
+++ b/tools/darwin/Support/CopyRootFiles-ios.command
@@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *
SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat"
# rsync command for including everything but the skins
-ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched --exclude visualization.*"
+ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched"
# binary name is Kodi but we build Kodi.bin so to get a clean binary each time
mv $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME.bin $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME
diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index 236601ed83..7ec3d296d3 100755
--- a/tools/darwin/Support/CopyRootFiles-osx.command
+++ b/tools/darwin/Support/CopyRootFiles-osx.command
@@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *
SYNCSKIN="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat"
# rsync command for including everything but the skins
-ADDONSYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched"
+ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched"
mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
diff --git a/tools/darwin/Support/copyframeworks-ios.command b/tools/darwin/Support/copyframeworks-ios.command
index 9d39986ae6..11a5404982 100755
--- a/tools/darwin/Support/copyframeworks-ios.command
+++ b/tools/darwin/Support/copyframeworks-ios.command
@@ -4,48 +4,47 @@
function check_dyloaded_depends
{
- b=$(find "$EXTERNAL_LIBS" -name $1 -print)
- if [ -f "$b" ]; then
+ b=$(find "$EXTERNAL_LIBS" -name $1 -print)
+ if [ -f "$b" ]; then
#echo "Processing $b"
if [ ! -f "$TARGET_FRAMEWORKS/$(basename $b)" ]; then
- echo " Packaging $b"
- cp -f "$b" "$TARGET_FRAMEWORKS/"
- chmod u+w "$TARGET_FRAMEWORKS/$(basename $b)"
+ echo " Packaging $b"
+ cp -f "$b" "$TARGET_FRAMEWORKS/"
+ chmod u+w "$TARGET_FRAMEWORKS/$(basename $b)"
fi
for a in $(otool -L "$b" | grep "$EXTERNAL_LIBS" | awk ' { print $1 } ') ; do
- if [ -f "$a" ]; then
- if [ ! -f "$TARGET_FRAMEWORKS/$(basename $a)" ]; then
- echo " Packaging $a"
- cp -f "$a" "$TARGET_FRAMEWORKS/"
- chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
- install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$TARGET_FRAMEWORKS/$(basename $b)"
- fi
- fi
+ if [ -f "$a" ]; then
+ if [ ! -f "$TARGET_FRAMEWORKS/$(basename $a)" ]; then
+ echo " Packaging $a"
+ cp -f "$a" "$TARGET_FRAMEWORKS/"
+ chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
+ install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$TARGET_FRAMEWORKS/$(basename $b)"
+ fi
+ fi
done
- fi
+ fi
}
function check_xbmc_dylib_depends
{
- REWIND="1"
- while [ $REWIND = "1" ]
- do
+ REWIND="1"
+ while [ $REWIND = "1" ] ; do
let REWIND="0"
for b in $(find "$1" -type f -name "$2" -print) ; do
- #echo "Processing $b"
- install_name_tool -id "$(basename $b)" "$b"
- for a in $(otool -L "$b" | grep "$EXTERNAL_LIBS" | awk ' { print $1 } ') ; do
- #echo " Packaging $a"
- if [ ! -f "$TARGET_FRAMEWORKS/$(basename $a)" ]; then
- echo " Packaging $a"
- cp -f "$a" "$TARGET_FRAMEWORKS/"
- chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
- let REWIND="1"
- fi
- install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$b"
- done
- done
+ #echo "Processing $b"
+ install_name_tool -id "$(basename $b)" "$b"
+ for a in $(otool -L "$b" | grep "$EXTERNAL_LIBS" | awk ' { print $1 } ') ; do
+ #echo " Packaging $a"
+ if [ ! -f "$TARGET_FRAMEWORKS/$(basename $a)" ]; then
+ echo " Packaging $a"
+ cp -f "$a" "$TARGET_FRAMEWORKS/"
+ chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
+ let REWIND="1"
+ fi
+ install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$b"
+ done
done
+ done
}
EXTERNAL_LIBS=$XBMC_DEPENDS
@@ -64,15 +63,15 @@ mkdir -p "$TARGET_CONTENTS/AppData/AppHome"
rm -rf "$TARGET_CONTENTS/Frameworks"
mkdir -p "$TARGET_CONTENTS/Frameworks"
-echo "Package $TARGET_BUILD_DIR/$APP_NAME"
+echo "Package $TARGET_NAME"
# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework
-echo "Checking $TARGET_BINARY dylib dependencies"
+echo "Checking $TARGET_NAME for dylib dependencies"
for a in $(otool -L "$TARGET_BINARY" | grep "$EXTERNAL_LIBS" | awk ' { print $1 } ') ; do
-echo " Packaging $a"
-cp -f "$a" "$TARGET_FRAMEWORKS/"
-chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
-install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$TARGET_BINARY"
+ echo " Packaging $a"
+ cp -f "$a" "$TARGET_FRAMEWORKS/"
+ chmod u+w "$TARGET_FRAMEWORKS/$(basename $a)"
+ install_name_tool -change "$a" "$DYLIB_NAMEPATH/$(basename $a)" "$TARGET_BINARY"
done
echo "Package $EXTERNAL_LIBS/lib/python2.7"
@@ -81,27 +80,21 @@ PYTHONSYNC="rsync -aq --exclude .DS_Store --exclude *.a --exclude *.exe --exclud
${PYTHONSYNC} "$EXTERNAL_LIBS/lib/python2.7" "$TARGET_FRAMEWORKS/lib/"
rm -rf "$TARGET_FRAMEWORKS/lib/python2.7/config"
-echo "Checking $TARGET_FRAMEWORKS/lib/python2.7 *.so for dylib dependencies"
+echo "Checking python *.so for dylib dependencies"
check_xbmc_dylib_depends "$TARGET_FRAMEWORKS"/lib/python2.7 "*.so"
-echo "Checking $XBMC_HOME/system *.so for dylib dependencies"
+echo "Checking system *.so for dylib dependencies"
check_xbmc_dylib_depends "$XBMC_HOME"/system "*.so"
-echo "Checking $XBMC_HOME/addons *.so for dylib dependencies"
+echo "Checking addons *.so for dylib dependencies"
check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.so"
-echo "Checking $XBMC_HOME/addons *.pvr for dylib dependencies"
-check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr"
-
-echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies"
-check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs"
-
echo "Checking xbmc/DllPaths_generated.h for dylib dependencies"
for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
check_dyloaded_depends $a
done
-echo "Checking $TARGET_FRAMEWORKS for missing dylib dependencies"
+echo "Checking $TARGET_NAME/Frameworks for missing dylib dependencies"
REWIND="1"
while [ $REWIND = "1" ]
do
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-20 08:35:50 +0000