Commit 7a65b0ad authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge remote branch 'nick/master'

parents 1d2f096b de50edfc

Rakefile

+6 −6
Original line number Diff line number Diff line
@@ -161,11 +161,11 @@ class JsDuckRunner 
      "--head-html", head_html,

      "--footer", "Ext JS 4.0.6 Docs - Generated with <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> rev #{revision}",

      "--welcome", "template/welcome.html",

      "--guides", "#{@sdk_dir}/guides/guides.json",

      "--videos", "#{@sdk_dir}/guides/videos.json",

      "--guides", "#{@sdk_dir}/extjs/docs/guides.json",

      "--videos", "#{@sdk_dir}/extjs/docs/videos.json",

      "--examples", "#{@sdk_dir}/extjs/examples/examples.json",

      "--inline-examples", "#{@sdk_dir}/extjs/doc-resources",

      "--categories", "#{@sdk_dir}/extjs/doc-resources/categories.json",

      "--inline-examples", "#{@sdk_dir}/extjs/docs/resources",

      "--categories", "#{@sdk_dir}/extjs/docs/categories.json",

      "--output", "#{@out_dir}",

      "#{@sdk_dir}/extjs/src",

      "#{@sdk_dir}/platform/src",
@@ -286,8 +286,8 @@ class JsDuckRunner 


  # Copy over the images that SDK documentation links to

  def copy_sdk_images

    system "cp -r #{@sdk_dir}/extjs/doc-resources #{@out_dir}/doc-resources"

    system "cp -r #{@sdk_dir}/platform/doc-resources/* #{@out_dir}/doc-resources"

    system "cp -r #{@sdk_dir}/extjs/docs/resources #{@out_dir}/doc-resources"

    system "cp -r #{@sdk_dir}/platform/docs/resources/* #{@out_dir}/doc-resources"

  end



  # Copy over the images that Ext4 documentation links to

lib/jsduck/guides.rb

+11 −2
Original line number Diff line number Diff line
@@ -29,9 +29,18 @@ module JsDuck 
    end



    def write_guide(guide, dir)

      in_dir = @path + "/" + guide["name"]

      guide_dir = @path + "/guides/" + guide["name"]

      tutorial_dir = @path + "/tutorials/" + guide["name"]

      out_dir = dir + "/" + guide["name"]

      return Logger.instance.warn("Guide #{in_dir} not found") unless File.exists?(in_dir)



      if File.exists?(guide_dir)

        in_dir = guide_dir

      elsif File.exists?(tutorial_dir)

        in_dir = tutorial_dir

      else

        return Logger.instance.warn("Guide #{guide_dir} / #{tutorial_dir} not found")

      end



      guide_file = in_dir + "/README.md"

      return Logger.instance.warn("README.md not found in #{in_dir}") unless File.exists?(guide_file)