helpers/url.rb in origen-0.0.4 vs helpers/url.rb in origen-0.0.5
- old
+ new
@@ -21,10 +21,13 @@
def path(p)
p = "/#{p}" unless p =~ /^\//
if Origen.development?
"#{p}" # dev mode used for local website generation
+ # For Git deploy don't maintain versions
+ elsif Origen.app.deployer.deploy_to_git?
+ "#{root_path}#{p}"
else
"#{root_path}/#{_version}#{p}"
end
end
@@ -52,11 +55,11 @@
else
version.to_s.gsub(".", "_")
end
end
- # Returns any path attached to the domain, for example will return "/tfs"
- # for "http://origen.freescale.net/tfs"
+ # Returns any path attached to the domain, for example will return "/jtag"
+ # for "http://origen-sdk.org/jtag"
def root_path # :nodoc:
if domain =~ /\/\/[^\/]*(\/.*)/ # http://rubular.com/r/UY06Z6DXUS
$1
end
end