diff --git a/LomoAgent.xcodeproj/xcshareddata/xcschemes/LomoAgent.xcscheme b/LomoAgent.xcodeproj/xcshareddata/xcschemes/LomoAgent.xcscheme index 228a664..8874088 100644 --- a/LomoAgent.xcodeproj/xcshareddata/xcschemes/LomoAgent.xcscheme +++ b/LomoAgent.xcodeproj/xcshareddata/xcschemes/LomoAgent.xcscheme @@ -28,7 +28,7 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "# Type a script or drag a script file from your workspace to insert its path. set -x echo $TARGET_BUILD_DIR echo $PROJECT_DIR echo $FULL_PRODUCT_NAME mkdir -p "$PROJECT_DIR/build" rm -rf "$PROJECT_DIR/build/*" cp -r "$TARGET_BUILD_DIR/$FULL_PRODUCT_NAME" "$PROJECT_DIR/build" #appdmg $PROJECT_DIR/LomoAgent/Assets.xcassets/dmg.json $PROJECT_DIR/build/LomoAgent.dmg "> CFBundlePackageType APPL CFBundleShortVersionString - 2f18641 + d944bc7 CFBundleVersion - 2022_12_21.11_24_23.0.2f18641 + 2023_02_20.12_46_05.0.d944bc7 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/dependencies/build.sh b/dependencies/build.sh index 3a6fe17..d0e7447 100755 --- a/dependencies/build.sh +++ b/dependencies/build.sh @@ -46,7 +46,7 @@ cp $LOMOC_PATH $BINARY_DIR cd $BINARY_DIR python3 ../../../matryoshka_name_tool.py -L $BREW_LIB_PATH -d ../Frameworks/lomod/ lomoc -python3 ../../../matryoshka_name_tool.py -L $BREW_LIB_PATH -d ../Frameworks/lomod/ lomod +python3 ../../../matryoshka_name_tool.py -u -L $BREW_LIB_PATH -d ../Frameworks/lomod/ lomod #python3 ../../../matryoshka_name_tool.py -L $FFMPEG_HOME_ABS -d ../Frameworks/ffmpeg/ ffmpeg #python3 ../../../matryoshka_name_tool.py -L $FFMPEG_HOME_ABS -d ../Frameworks/ffmpeg/ ffprobe diff --git a/dependencies/lomod/Contents/Frameworks/lomod/libvips.42.dylib b/dependencies/lomod/Contents/Frameworks/lomod/libvips.42.dylib index c8b94a5..2a3572e 100755 Binary files a/dependencies/lomod/Contents/Frameworks/lomod/libvips.42.dylib and b/dependencies/lomod/Contents/Frameworks/lomod/libvips.42.dylib differ diff --git a/dependencies/lomod/Contents/MacOS/lomoc b/dependencies/lomod/Contents/MacOS/lomoc index 0a48cc2..0fa7fb6 100755 Binary files a/dependencies/lomod/Contents/MacOS/lomoc and b/dependencies/lomod/Contents/MacOS/lomoc differ diff --git a/dependencies/lomod/Contents/MacOS/lomod b/dependencies/lomod/Contents/MacOS/lomod index 3c0f377..a21c44b 100755 Binary files a/dependencies/lomod/Contents/MacOS/lomod and b/dependencies/lomod/Contents/MacOS/lomod differ diff --git a/dependencies/matryoshka_name_tool.py b/dependencies/matryoshka_name_tool.py index c311a80..c05fc15 100644 --- a/dependencies/matryoshka_name_tool.py +++ b/dependencies/matryoshka_name_tool.py @@ -68,7 +68,8 @@ def install_name_tool(self,object): loader_path = line.strip().startswith('@loader_path') rpath = line.strip().startswith('@rpath') print("line: %s" % line) - print("%s, libdir_match: %s" % (self.args.libdir, libdir_match)) + install_libdir = os.path.abspath(self.args.install_libdir) + print("%s, libdir_match: %s, install_libdir: %s" % (self.args.libdir, libdir_match, install_libdir)) if libdir_match or loader_path or rpath: if libdir_match: dylib = self.dylib_pattern.sub(r'\1',line) @@ -85,18 +86,18 @@ def install_name_tool(self,object): if dylib not in self.dylibs_copied: if not self.args.update and not os.path.isfile(self.args.install_libdir + os.path.basename(dylib)): - print("copy %s to %s" % (dylib, self.args.install_libdir)) - shutil.copy(dylib, self.args.install_libdir) + print("copy %s to %s" % (dylib, install_libdir)) + shutil.copy(dylib, install_libdir) self.dylibs_copied.add(dylib) target = self.args.install_libdir + os.path.basename(object) \ if (os.path.splitext(os.path.basename(object))[1] == '.dylib') \ else object if libdir_match: - cmd = [ 'sudo', 'install_name_tool', '-change', dylib, + cmd = [ 'install_name_tool', '-change', dylib, '@executable_path/' + self.args.install_libdir + os.path.basename(dylib), target ] else: - cmd = [ 'sudo', 'install_name_tool', '-change', line.strip().split(' ')[0], + cmd = [ 'install_name_tool', '-change', line.strip().split(' ')[0], '@executable_path/' + self.args.install_libdir + os.path.basename(dylib), target ] sp.call(cmd)