incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject docs commit: Fix building docs when CWD has a space in it.
Date Tue, 16 Oct 2012 13:29:48 GMT
Updated Branches:
  refs/heads/master 8220d81b5 -> 174e6ddbe


Fix building docs when CWD has a space in it.

And revert change to file_helpers that avoided resolving symlinks since
it is no longer necessary.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/commit/174e6ddb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/tree/174e6ddb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/diff/174e6ddb

Branch: refs/heads/master
Commit: 174e6ddbe4884c17d68c3639b8c65242cc80d8cf
Parents: 8220d81
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Oct 16 09:28:52 2012 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Oct 16 09:28:52 2012 -0400

----------------------------------------------------------------------
 lib/cordova/jodoc.rb |    2 +-
 lib/file_helpers.rb  |    8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/174e6ddb/lib/cordova/jodoc.rb
----------------------------------------------------------------------
diff --git a/lib/cordova/jodoc.rb b/lib/cordova/jodoc.rb
index f2fae50..6fe0fd0 100644
--- a/lib/cordova/jodoc.rb
+++ b/lib/cordova/jodoc.rb
@@ -44,7 +44,7 @@ class JoDoc
 
     # Run joDoc
     FileUtils.cd @input_directory do
-        `jodoc --output #{@output_directory} --title "Cordova API Documentation" --template
#{@output_directory}/index.html ./`
+        `jodoc --output "#{@output_directory}" --title "Cordova API Documentation" --template
"#{@output_directory}/index.html" ./`
     end
   end
   

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/174e6ddb/lib/file_helpers.rb
----------------------------------------------------------------------
diff --git a/lib/file_helpers.rb b/lib/file_helpers.rb
index a703466..e3eb481 100644
--- a/lib/file_helpers.rb
+++ b/lib/file_helpers.rb
@@ -16,7 +16,6 @@
 # under the License.
 
 require 'fileutils'
-require 'pathname'
 
 module FileHelpers
   #
@@ -74,11 +73,6 @@ module FileHelpers
   private
   
   def root_directory
-    if Pathname.new(__FILE__).absolute?
-      return File.join(File.dirname(__FILE__), '..')
-    end
-    # Pathname.pwd resolves symlinks, which can introduce spaces in paths.
-    # Use CWD instead.
-    File.join(ENV['PWD'], File.dirname(__FILE__), '..')
+    File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end
 end


Mime
View raw message