lib/origen/boot/app.rb in origen-0.42.0 vs lib/origen/boot/app.rb in origen-0.42.1
- old
+ new
@@ -83,39 +83,10 @@
______________________________________________________________________________________
'
- if Origen.os.windows?
- PATH_WARNING = %q(
-Warning, your PATH does not contain ./lbin which is expected by Origen.
-You can correct this by editing your system's PATH environment variable via:
-
-(right-click) My Computer -> Properties -> Advanced system settings -> Environment Variables
-
-Path is under System variables and add the following value to it:
-
- .\lbin
-
-______________________________________________________________________________________
-
-)
-
- else
- PATH_WARNING = %q(
-Warning, your PATH does not contain ./lbin which is expected by Origen.
-You can correct this by adding one of the following lines to the end of your
-environment setup file:
-
- In ~/.bashrc or ~/.bashrc.user: export PATH="./lbin:$PATH"'
- In ~/.tcshrc or ~/.tcshrc.user: setenv PATH "./lbin:$PATH"'
-
-______________________________________________________________________________________
-
-)
- end
-
BINSTUB =
"#!/usr/bin/env ruby
#
# This file was generated by Origen.
#
@@ -165,15 +136,9 @@
exec_remote = ARGV.include?('--exec_remote') ? true : false
lbin_dir = File.join(origen_root, 'lbin')
origen_binstub = File.join(lbin_dir, 'origen')
unless exec_remote
- if Origen.os.windows?
- warnings << PATH_WARNING unless ENV['PATH'] =~ /\.\\lbin(;|$)/
- else
- warnings << PATH_WARNING unless ENV['PATH'] =~ /(^|:)\.\/lbin(:|$)/
- end
-
if !File.exist?(origen_binstub) ||
(File.exist?(origen_binstub) && File.read(origen_binstub) !~ /This file was generated by Origen/)
warnings << BUNDLER_WARNING
elsif File.exist?(File.join(origen_root, 'bin', 'fix_my_workspace'))
warnings << UPDATER_WARNING