From 6c6c3e68c66c88bef2f388ec4776a47bc13ebb5c Mon Sep 17 00:00:00 2001 From: Jan Gerber Date: Sat, 6 Feb 2016 14:26:32 +0100 Subject: [PATCH] update oml to 10.10 version --- .../Contents/Info.plist | 12 +++---- .../Contents/MacOS/Open Media Library | Bin 36320 -> 36320 bytes .../Contents/Resources/Assets.car | Bin 34934 -> 35205 bytes .../Contents/Resources/install.py | 31 +++++++++++++----- .../Contents/_CodeSignature/CodeResources | 8 ++--- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Applications/Open Media Library.app/Contents/Info.plist b/Applications/Open Media Library.app/Contents/Info.plist index 288d200..f468dbf 100644 --- a/Applications/Open Media Library.app/Contents/Info.plist +++ b/Applications/Open Media Library.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 15D21 + 15C50 CFBundleDevelopmentRegion en CFBundleExecutable @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6 + 0.7 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -31,7 +31,7 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 7C68 + 7C1002 DTPlatformVersion GM DTSDKBuild @@ -39,11 +39,11 @@ DTSDKName macosx10.11 DTXcode - 0720 + 0721 DTXcodeBuild - 7C68 + 7C1002 LSMinimumSystemVersion - 10.11 + 10.10 LSUIElement NSHumanReadableCopyright diff --git a/Applications/Open Media Library.app/Contents/MacOS/Open Media Library b/Applications/Open Media Library.app/Contents/MacOS/Open Media Library index c579dd88b60390cc201fe4ecf5f041bf0bd5cd61..35cb6e2c08bc2998126f2839e2e5be667080f5d2 100755 GIT binary patch delta 112 zcmV-$0FVFRn*!jQ0`b0Y8Ym)=-nP3|= delta 112 zcmV-$0FVFRn*!jQ0d*00{i_)e?8NUW)Ooh SKf~Ojk2HHl4T`fYYP2JhsWqMe diff --git a/Applications/Open Media Library.app/Contents/Resources/Assets.car b/Applications/Open Media Library.app/Contents/Resources/Assets.car index 950959d597c808cb458ecb27e9de7250b3cdf2a4..fa157ae48f4583cbe32f16efb2f07fedaacc5858 100644 GIT binary patch delta 2785 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 Yf&c&j8~^|)o&W#}GqaI2^i+{B2z0=MbN~PV diff --git a/Applications/Open Media Library.app/Contents/Resources/install.py b/Applications/Open Media Library.app/Contents/Resources/install.py index 1d5b7cc..57926c5 100755 --- a/Applications/Open Media Library.app/Contents/Resources/install.py +++ b/Applications/Open Media Library.app/Contents/Resources/install.py @@ -20,6 +20,18 @@ def makedirs(dirname): if not os.path.exists(dirname): os.makedirs(dirname) +def get_platform(): + name = sys.platform + if name.startswith('darwin'): + name = 'darwin64' + elif name.startswith('linux'): + import platform + if platform.architecture()[0] == '64bit': + name = 'linux64' + else: + name = 'linux32' + return name + class Handler(SimpleHTTPServer.SimpleHTTPRequestHandler): def do_OPTIONS(self): self.send_response(200, 'OK') @@ -79,17 +91,20 @@ class Install(Thread): release = self.get_release() self.status["release"] = release self.status["progress"] = 0 + platform = get_platform() for module in sorted(release['modules']): - package_tar = release['modules'][module]['name'] - url = self.release_url.replace('release.json', package_tar) - self.download(url, package_tar) + if release['modules'][module].get('platform', platform) == platform: + package_tar = release['modules'][module]['name'] + url = self.release_url.replace('release.json', package_tar) + self.download(url, package_tar) self.status["step"] = 'Installing...' for module in sorted(release['modules']): - package_tar = release['modules'][module]['name'] - tar = tarfile.open(package_tar) - tar.extractall() - tar.close() - os.unlink(package_tar) + if release['modules'][module].get('platform', platform) == platform: + package_tar = release['modules'][module]['name'] + tar = tarfile.open(package_tar) + tar.extractall() + tar.close() + os.unlink(package_tar) os.symlink('openmedialibrary/ctl', 'ctl') makedirs('data') with open('data/release.json', 'w') as fd: diff --git a/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources b/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources index e8b84ef..7c09313 100644 --- a/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources +++ b/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ Resources/Assets.car - J0bcbd6bu3teEBZKNEEQTcykNSI= + /nndfnnD+E4e+8Ei7vZtKg7drFI= Resources/Base.lproj/MainMenu.nib @@ -31,7 +31,7 @@ Resources/install.py - 8P8EjUEoWuHCRIRvQTi7vbDhGoM= + O7T+CZEr88aRYb4+kN3/DnjlfN0= Resources/js/install.js @@ -135,7 +135,7 @@ Resources/Assets.car - J0bcbd6bu3teEBZKNEEQTcykNSI= + /nndfnnD+E4e+8Ei7vZtKg7drFI= Resources/Base.lproj/MainMenu.nib @@ -156,7 +156,7 @@ Resources/install.py - 8P8EjUEoWuHCRIRvQTi7vbDhGoM= + O7T+CZEr88aRYb4+kN3/DnjlfN0= Resources/js/install.js