Permalink
Browse files

Merge branch 'master' into release

Conflicts:
	samples/project_samples.rb
  • Loading branch information...
ingo committed Jan 10, 2012
2 parents 7d8b91e + a78cc44 commit 9d7841fa3e5f8b836dd804e52e6af4058d34ce78
View
@@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>com.aptana.ide.core.unifiedBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
View
@@ -13,7 +13,3 @@ How to install
* The name of the folder doesn't really matter, just so long as it has the `ruble` extension
4. Enjoy!
-Building template projects
-----
-
-Run `rake` with no arguments to generate the .zip files for local project templates
View
@@ -1,33 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'zip/zip'
-require 'fileutils'
-
-rake = Rake::Application.new
-
-task :default => [:build] do
-end
-
-desc "Build all Titanium template projects"
-task :build do
- #clear out old .zip files
- FileUtils.mkdir 'staging' unless File.exists? 'staging'
- FileUtils.rm_rf Dir.glob('staging/*')
-
- # Package up a .zip file for each of the project templates
- Dir.foreach('templates') do |template|
- next if template == '.' or template == '..'
-
- puts "Packaging #{template}..."
-
- # Grab all files/subfolders and throw them in a zip that Studio can use
- Zip::ZipFile.open("staging/#{template}.zip", Zip::ZipFile::CREATE) do |zipfile|
- Dir["templates/#{template}/**/*"].each do |file|
- next if File.directory? file
- zipfile.add(file.sub("templates/#{template}/",''),file)
- end
- end
- end
-
- puts "done!"
-end
View
@@ -46,27 +46,27 @@
main_menu.command 'vibrate'
end
- # project_template "Single Window Application" do |t|
- # t.type = :titanium_mobile
- # t.location = "staging/SingleWindow.zip"
- # t.description = "A single window application with a single view - a mostly blank canvas. Requires Titanium Mobile SDK 1.7.5+ or 1.8.0+"
- # t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_single_window.png"
- # puts t
- # end
+ project_template "Single Window Application" do |t|
+ t.type = :titanium_mobile
+ t.location = "git://github.com/appcelerator-developer-relations/Template.SingleWindow.git"
+ t.description = "A single window application with a single view - a mostly blank canvas. Requires Titanium Mobile SDK 1.8.0+."
+ t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_single_window.png"
+ puts t
+ end
- # project_template "Master/Detail Application" do |t|
- # t.type = :titanium_mobile
- # t.location = "staging/MasterDetail.zip"
- # t.description = "A master detail view, utilizing a native table view component and platform-specific UI and navigation. A starting point for a navigation-based application with hierarchical data, or a stack of windows. Requires Titanium Mobile SDK 1.7.5+ or 1.8.0+."
- # t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_detail.png"
- # puts t
- # end
+ project_template "Master/Detail Application" do |t|
+ t.type = :titanium_mobile
+ t.location = "git://github.com/appcelerator-developer-relations/Template.MasterDetail.git"
+ t.description = "A master detail view, utilizing a native table view component and platform-specific UI and navigation. A starting point for a navigation-based application with hierarchical data, or a stack of windows. Requires Titanium Mobile SDK 1.8.0+."
+ t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_detail.png"
+ puts t
+ end
- # project_template "Tabbed Application" do |t|
- # t.type = :titanium_mobile
- # t.location = "staging/Tabbed.zip"
- # t.description = "A tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 1.7.5+ or 1.8.0+."
- # t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_tabbed.png"
- # puts t
- # end
+ project_template "Tabbed Application" do |t|
+ t.type = :titanium_mobile
+ t.location = "git://github.com/appcelerator-developer-relations/Template.Tabbed.git"
+ t.description = "A tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 1.8.0+."
+ t.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_tabbed.png"
+ puts t
+ end
end
View
@@ -1,31 +1,31 @@
require 'ruble'
-# project_sample "Geocoder" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.mapping"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.Mapping.git"
- # s.description = "A sample Master/Detail app that uses native maps to plot locations. With it you can forward geocode addresses and add them as annotations to the map."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_geo.png"
-# end
-
-# project_sample "RSS Reader" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.rss"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.RSS.git"
- # s.description = "A sample Master/Detail app that creates a RSS reader. With it you can pull live RSS feeds from the internet, list them along with thumbnails, then drill down to the article itself."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_rss.png"
-# end
+project_sample "Geocoder" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.mapping"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.Mapping.git"
+ s.description = "A sample Master/Detail app that uses native maps to plot locations. With it you can forward geocode addresses and add them as annotations to the map."
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_geo.png"
+end
-# project_sample "Todo List" do |s|
- # s.id = "com.appcelerator.titanium.mobile.samples.todo"
- # s.category = "com.appcelerator.titanium.mobile.samples.category"
- # s.location = "git://github.com/appcelerator-developer-relations/Sample.Todo.git"
- # s.description = "A sample tabbed application that creates a basic todo list. With this app you can maintain a listing of tasks to be completed, add to that list, and mark tasks as done."
- # s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
- # s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_to_do_list.png"
-# end
+project_sample "RSS Reader" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.rss"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.RSS.git"
+ s.description = "A sample Master/Detail app that creates a RSS reader. With it you can pull live RSS feeds from the internet, list them along with thumbnails, then drill down to the article itself."
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_rss.png"
+end
+
+project_sample "Todo List" do |s|
+ s.id = "com.appcelerator.titanium.mobile.samples.todo"
+ s.category = "com.appcelerator.titanium.mobile.samples.category"
+ s.location = "git://github.com/appcelerator-developer-relations/Sample.Todo.git"
+ s.description = "A sample tabbed application that creates a basic todo list. With this app you can maintain a listing of tasks to be completed, add to that list, and mark tasks as done."
+ s.natures = ["com.appcelerator.titanium.mobile.nature", "com.aptana.projects.webnature"]
+ s.icon = "http://preview.appcelerator.com/dashboard/img/icons/icon_to_do_list.png"
+end
project_sample "Kitchen Sink" do |s|
s.id = "com.appcelerator.titanium.mobile.samples.kitchensink"
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.

0 comments on commit 9d7841f

Please sign in to comment.