prepare for merge
This commit is contained in:
parent
5b01b17f0f
commit
3a6b8ba033
4 changed files with 36 additions and 10 deletions
|
@ -12,6 +12,7 @@
|
|||
1F122D49118E1DE100E83B77 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1F122D48118E1DE100E83B77 /* Icon.icns */; };
|
||||
1F1990C6117BCA960049BEA7 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1990C5117BCA960049BEA7 /* ApplicationServices.framework */; };
|
||||
1F1C80F916482A250010B409 /* WebKit in Resources */ = {isa = PBXBuildFile; fileRef = 1F1C80F816482A250010B409 /* WebKit */; };
|
||||
1F3F129E164F202000C7C983 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 1F3F129D164F202000C7C983 /* dsa_pub.pem */; };
|
||||
1F618ECA12DB5E6100E500D9 /* TweetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F618EC912DB5E6100E500D9 /* TweetModel.m */; };
|
||||
1F70619F1178FBB300C85707 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F70619E1178FBB300C85707 /* Carbon.framework */; };
|
||||
1F77DB47118C5F1C007C7F1E /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F77DB46118C5F1C007C7F1E /* Constants.m */; };
|
||||
|
@ -55,6 +56,7 @@
|
|||
1F122D48118E1DE100E83B77 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
|
||||
1F1990C5117BCA960049BEA7 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
|
||||
1F1C80F816482A250010B409 /* WebKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WebKit; path = ../WebKit; sourceTree = "<group>"; };
|
||||
1F3F129D164F202000C7C983 /* dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; name = dsa_pub.pem; path = publish/dsa_pub.pem; sourceTree = "<group>"; };
|
||||
1F618EC812DB5E6100E500D9 /* TweetModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TweetModel.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
1F618EC912DB5E6100E500D9 /* TweetModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = TweetModel.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
1F70619E1178FBB300C85707 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
|
||||
|
@ -177,6 +179,7 @@
|
|||
children = (
|
||||
1F1C80F816482A250010B409 /* WebKit */,
|
||||
1F122D48118E1DE100E83B77 /* Icon.icns */,
|
||||
1F3F129D164F202000C7C983 /* dsa_pub.pem */,
|
||||
2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */,
|
||||
8D15AC360486D014006FF6A4 /* Tentia-Info.plist */,
|
||||
089C165FFE840EACC02AAC07 /* InfoPlist.strings */,
|
||||
|
@ -250,6 +253,7 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1F3F129E164F202000C7C983 /* dsa_pub.pem in Resources */,
|
||||
1FDEF726164F094600F927F3 /* Growl Registration Ticket.growlRegDict in Resources */,
|
||||
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */,
|
||||
8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */,
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
<title>Version 0.2.1</title>
|
||||
<sparkle:minimumSystemVersion>10.5.0</sparkle:minimumSystemVersion>
|
||||
<sparkle:releaseNotesLink>http://jabs.nu/Tentia/download/ReleaseNotes.html</sparkle:releaseNotesLink>
|
||||
<pubDate>Sun, 11 Nov 2012 00:36:23 +0100</pubDate>
|
||||
<pubDate>Sun, 11 Nov 2012 01:07:18 +0100</pubDate>
|
||||
<enclosure url="http://jabs.nu/Tentia/download/Tentia.app.zip"
|
||||
sparkle:version="0.2.1"
|
||||
length="1066671"
|
||||
length="1067772"
|
||||
type="application/octet-stream"
|
||||
sparkle:dsaSignature="MCwCFBa+E/MrAwpah0f/I3s1gJzUsS2bAhQGLCQ7k5K9yVWaN5o9KXEFxCfWPQ==" />
|
||||
sparkle:dsaSignature="MCwCFEFg+7MwZ+iIdkntP4TQJ0gAB6flAhQ04hfZAwwAyqtCryW//dZ4HJLSwA==" />
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
|
|
|
@ -9,19 +9,22 @@
|
|||
h2 { font-size: 1em; margin-top: 2em; }
|
||||
hr { margin: 2em 0; }
|
||||
p { margin: 0; padding: 0; }
|
||||
strong { color: red; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1>Tentia 0.2.1</h1>
|
||||
|
||||
<p><strong>If you get "The update is improperly signed" you can download it manually from
|
||||
<a href="http://jabs.nu/Tentia/download/Tentia.app.zip">HERE</a></strong></p>
|
||||
<h2><strong>Sadly the automatic update from 0.2.0 will not work. Please download
|
||||
this version manually from
|
||||
<a href="http://jabs.nu/Tentia/download/Tentia.app.zip">HERE</a>.</strong></h2>
|
||||
<p>Working on OS X < 10.8 again</p>
|
||||
<p>Added growl support</p>
|
||||
<p>Bugfixes</p>
|
||||
<p>Moved reply icon to left so it is easier to use when the scrollbar is shown</p>
|
||||
<p>Login with the [Login] button now works</p>
|
||||
<p>Fixed automatic updates so it will work next time again.</p>
|
||||
|
||||
<hr />
|
||||
|
||||
|
|
|
@ -1,12 +1,28 @@
|
|||
#!/usr/bin/env ruby -wKU
|
||||
require 'time'
|
||||
|
||||
path = File.dirname File.expand_path(__FILE__)
|
||||
def test var message
|
||||
unless var
|
||||
puts message
|
||||
exit
|
||||
end
|
||||
end
|
||||
|
||||
# system "cd \"#{path}/build/Release/\"; zip -r Tentia.app.zip Tentia.app; cd \"#{path}\""
|
||||
version = `defaults read \"#{path}/../build/Release/Tentia.app/Contents/Info\" CFBundleVersion`.gsub(/\n/,'')
|
||||
length = `stat -f %z \"#{path}/../build/Release/Tentia.app.zip\"`.gsub(/\n/,'')
|
||||
signature = `ruby \"#{path}/../../../Sparkle\ 1.5b6/Extras/Signing Tools/sign_update.rb\" \"#{path}/../build/Release/Tentia.app.zip\" \"#{path}/dsa_priv.pem\"`.gsub(/\n/,'')
|
||||
mac_path = File.expand_path(File.dirname(File.expand_path(__FILE__)) + "/..")
|
||||
release_path = mac_path + "/build/Release/"
|
||||
|
||||
version = `defaults read \"#{release_path}/Tentia.app/Contents/Info\" CFBundleVersion`.gsub(/\n/,'')
|
||||
length = `stat -f %z \"#{release_path}/Tentia.app.zip\"`.gsub(/\n/,'')
|
||||
signature = `ruby \"#{mac_path}/../../../Sparkle\ 1.5b6/Extras/Signing Tools/sign_update.rb\" \"#{release_path}/Tentia.app.zip\" \"#{path}/public/dsa_priv.pem\"`.gsub(/\n/,'')
|
||||
|
||||
test version "Couldn't find version"
|
||||
test length "Couldn't find length"
|
||||
test signature "Couldn't find signature"
|
||||
|
||||
unless File.exists? "#{release_path}/Tentia.app/Contents/dsa_pub.pem"
|
||||
puts "dsa_pub.pem is not in place."
|
||||
exit
|
||||
end
|
||||
|
||||
xml = <<XML
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
@ -32,6 +48,9 @@ xml = <<XML
|
|||
XML
|
||||
|
||||
|
||||
puts "EXIT"
|
||||
exit
|
||||
|
||||
File.open("#{path}/Appcast.xml", 'w') {|f| f.write(xml) }
|
||||
system "scp \"#{path}/../build/Release/Tentia.app.zip\" jeena@jeena.net:~/jabs.nu/public/Tentia/download/"
|
||||
system "scp \"#{path}/ReleaseNotes.html\" jeena@jeena.net:~/jabs.nu/public/Tentia/download/"
|
||||
|
|
Reference in a new issue