From 0ef78b22c49436f33a11dddc04aec0b8ae8d770c Mon Sep 17 00:00:00 2001
From: Laurent Sansonetti <lrz@chopine.be>
Date: Sun, 12 Feb 2012 20:18:18 +0100
Subject: [PATCH] remove docset

---
 NEWS         |  6 ++++++
 Rakefile     | 28 ++++++++++++----------------
 doc/Rakefile |  3 ++-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 0feb8730..e698f584 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+= RubyMotion 0.46 =
+
+  * Removed the docset from the main distribution (will be online).
+  * Fixed the `rake device' task to only depend on
+    `rake archive:development' (thanks Hugues).
+
 = RubyMotion 0.45 =
 
   * The `rake archive' is now a shortcut to `rake archive:development'
diff --git a/Rakefile b/Rakefile
index 328b0c75..931a93ea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 PLATFORMS_DIR = '/Developer/Platforms'
-PROJECT_VERSION = '0.45'
+PROJECT_VERSION = '0.46'
 
 sim_sdks = Dir.glob(File.join(PLATFORMS_DIR, 'iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator*.sdk')).map do |path|
   File.basename(path).scan(/^iPhoneSimulator(.+)\.sdk$/)[0][0]
@@ -77,7 +77,7 @@ task :install do
     data.concat(Dir.glob("./data/#{sdk_version}/iPhoneSimulator/*"))
   end
   data.concat(Dir.glob('./doc/*.html'))
-  data.concat(Dir.glob('./doc/docset/**/*'))
+  #data.concat(Dir.glob('./doc/docset/**/*'))
   data.concat(Dir.glob('./sample/**/*').reject { |path| path =~ /build/ })
   data.reject! { |path| /^\./.match(File.basename(path)) }
   data.reject! { |path| File.directory?(path) }
@@ -109,18 +109,17 @@ desc "Generate .pkg"
 task :package do
   destdir = '/tmp/Motion'
   pkg = "pkg/RubyMotion #{PROJECT_VERSION}.pkg"
-  if !File.exist?(destdir) or !File.exist?(pkg) or File.mtime(destdir) > File.mtime(pkg)
+  #if !File.exist?(destdir) or !File.exist?(pkg) or File.mtime(destdir) > File.mtime(pkg)
     ENV['DESTDIR'] = destdir
     rm_rf destdir
     Rake::Task[:install].invoke
 
     sh "/Developer/usr/bin/packagemaker --doc pkg/RubyMotion.pmdoc --out \"pkg/RubyMotion #{PROJECT_VERSION}.pkg\" --version #{PROJECT_VERSION}"
-    open("pkg/Latest", 'w') { |io| io.write PROJECT_VERSION }
-  end
+  #end
 end
 
 desc "Push on Amazon S3"
-task :upload => :package do
+task :upload do
   require 'rubygems'
   require 'aws/s3'
 
@@ -134,15 +133,12 @@ task :upload => :package do
   # Will raise an error if bucket doesn't exist
   AWS::S3::Bucket.find WEBSITE_BUCKET_NAME
 
-  Dir.chdir('pkg') do
-    file = "Latest"
-    puts "Uploading #{file}.."
-    AWS::S3::S3Object.store('rubymotion/'+file, open(file), WEBSITE_BUCKET_NAME)
-    puts "Done!"
+  puts "Uploading Latest.."
+  AWS::S3::S3Object.store('rubymotion/releases/Latest', PROJECT_VERSION, WEBSITE_BUCKET_NAME)
+  puts "Done!"
 
-    #file = "RubyMotion #{PROJECT_VERSION}.pkg"
-    #puts "Uploading #{file}.."
-    #AWS::S3::S3Object.store("rubymotion/" + file, open(file), WEBSITE_BUCKET_NAME)
-    #puts "Done!"
-  end
+  file = "pkg/RubyMotion #{PROJECT_VERSION}.pkg"
+  puts "Uploading #{file}.."
+  AWS::S3::S3Object.store("rubymotion/releases/#{PROJECT_VERSION}.pkg", File.read(file), WEBSITE_BUCKET_NAME)
+  puts "Done!"
 end
diff --git a/doc/Rakefile b/doc/Rakefile
index b44a80e1..80532a49 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -389,7 +389,8 @@ EOS
 end
 
 task :default => :all
-task :all => [:guides, :docset]
+#task :all => [:guides, :docset]
+task :all => [:guides] # no docset in the main distribution...
 
 task :guides do
   Dir.glob('*.textile').each do |src|