Permalink
Browse files

EM and TM MADs not copied (issue #72).

Rubygems versioning disable.


git-svn-id: http://svn.gridway.org/gridway/trunk@200 9b4b2aa8-92f0-458a-8103-c3834d721760
  • Loading branch information...
1 parent e037753 commit ef08a1e9d1ae606ea0b93305dda5ac2154aa3da9 alorca committed Dec 11, 2009
Showing with 13 additions and 8 deletions.
  1. +3 −3 configure
  2. +3 −3 configure.in
  3. +3 −1 src/Makefile.am
  4. +4 −1 src/Makefile.in
View
@@ -3256,9 +3256,9 @@ $as_echo_n "checking whether $RUBY installation includes the openssl package...
cat >> conftest.rb << EOF
#!/usr/bin/env ruby
begin
- require 'rubygems'
- gem 'net-ssh', '< 2.0.0'
- gem 'net-sftp', '< 2.0.0'
+# require 'rubygems'
+# gem 'net-ssh', '< 2.0.0'
+# gem 'net-sftp', '< 2.0.0'
require 'net/ssh'
require 'net/sftp'
exit 0
View
@@ -375,9 +375,9 @@ if test "x$ssh" = "xssh"; then
cat >> conftest.rb << EOF
#!/usr/bin/env ruby
begin
- require 'rubygems'
- gem 'net-ssh', '< 2.0.0'
- gem 'net-sftp', '< 2.0.0'
+# require 'rubygems'
+# gem 'net-ssh', '< 2.0.0'
+# gem 'net-sftp', '< 2.0.0'
require 'net/ssh'
require 'net/sftp'
exit 0
View
@@ -267,7 +267,9 @@ TM_MAD_RFT_SRC = $(TM_MAD)/GWRftClient.java \
$(TM_MAD)/GWRftResource.java \
$(TM_MAD)/GWRftUtil.java
-SSH_SRC = $(SSH)/ssh_wrapper.sh \
+SSH_SRC = $(EM_MAD)/gw_em_mad_ssh.sh \
+ $(TM_MAD)/gw_tm_mad_ssh.sh \
+ $(SSH)/ssh_wrapper.sh \
$(SSH)/ruby/gw_em_mad_ssh.rb \
$(SSH)/ruby/gwmad.rb \
$(SSH)/ruby/gw_tm_mad_ssh.rb \
View
@@ -514,6 +514,7 @@ am__dist_bin_SCRIPTS_DIST = $(CMDS)/gw_dagman.rb \
$(EM_MAD)/gw_em_mad_nordugrid.py $(EM_MAD)/em_nordugrid.py \
$(TM_MAD)/gw_tm_mad_nordugrid.sh \
$(TM_MAD)/gw_tm_mad_nordugrid.py $(TM_MAD)/tm_nordugrid.py \
+ $(EM_MAD)/gw_em_mad_ssh.sh $(TM_MAD)/gw_tm_mad_ssh.sh \
$(SSH)/ssh_wrapper.sh $(SSH)/ruby/gw_em_mad_ssh.rb \
$(SSH)/ruby/gwmad.rb $(SSH)/ruby/gw_tm_mad_ssh.rb \
$(SSH)/ruby/rslparser.rb $(SSH)/ruby/sshjob.rb \
@@ -926,7 +927,9 @@ TM_MAD_RFT_SRC = $(TM_MAD)/GWRftClient.java \
$(TM_MAD)/GWRftResource.java \
$(TM_MAD)/GWRftUtil.java
-SSH_SRC = $(SSH)/ssh_wrapper.sh \
+SSH_SRC = $(EM_MAD)/gw_em_mad_ssh.sh \
+ $(TM_MAD)/gw_tm_mad_ssh.sh \
+ $(SSH)/ssh_wrapper.sh \
$(SSH)/ruby/gw_em_mad_ssh.rb \
$(SSH)/ruby/gwmad.rb \
$(SSH)/ruby/gw_tm_mad_ssh.rb \

0 comments on commit ef08a1e

Please sign in to comment.