diff options
author | Matthew Newhook <matthew@zeroc.com> | 2015-04-22 16:35:33 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2015-04-22 16:35:33 -0230 |
commit | cf1254cb87d99f2c4af21528bf190aed8ab700a4 (patch) | |
tree | c72544ce7fd475a272bb929a3b8e9048c78504e3 /ruby | |
parent | ICE-6455 - remove slice2py and slice2rb C++ exe (diff) | |
download | ice-cf1254cb87d99f2c4af21528bf190aed8ab700a4.tar.bz2 ice-cf1254cb87d99f2c4af21528bf190aed8ab700a4.tar.xz ice-cf1254cb87d99f2c4af21528bf190aed8ab700a4.zip |
ICE-6455 - remove slice2py and slice2rb C++ exe
Renamed ruby/config/slice2rb.rb to ruby/config/s2rb.rb
Renamed python/config/slice2py.py to python/config/s2py.py
Moved slice2rb and slice2py.py from dist-utils into the scripts
directory for python and ruby.
Diffstat (limited to 'ruby')
-rwxr-xr-x | ruby/config/s2rb.rb (renamed from ruby/config/slice2rb.rb) | 0 | ||||
-rw-r--r-- | ruby/ruby/Makefile | 2 | ||||
-rwxr-xr-x | ruby/scripts/slice2rb | 17 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ruby/config/slice2rb.rb b/ruby/config/s2rb.rb index 2744db07692..2744db07692 100755 --- a/ruby/config/slice2rb.rb +++ b/ruby/config/s2rb.rb diff --git a/ruby/ruby/Makefile b/ruby/ruby/Makefile index f04307cd04a..deebfa22b08 100644 --- a/ruby/ruby/Makefile +++ b/ruby/ruby/Makefile @@ -115,7 +115,7 @@ MODULES = Glacier2 Ice IceBox IceGrid IcePatch2 IceStorm all:: $(ALL_SRCS) -SLICE2RB = ../config/slice2rb.rb +SLICE2RB = $(top_srcdir)/config/s2rb.rb SLICE2RBFLAGS += --ice Ice/%.rb: $(slicedir)/Ice/%.ice $(SLICE2RB) $(SLICEPARSERLIB) diff --git a/ruby/scripts/slice2rb b/ruby/scripts/slice2rb new file mode 100755 index 00000000000..c56fc02575f --- /dev/null +++ b/ruby/scripts/slice2rb @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby +# ********************************************************************** +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +require 'Ice' +sliceDir = Ice.getSliceDir() +if sliceDir != nil + ARGV << "-I" + sliceDir +end +rc = Ice::compile(ARGV) +exit(rc) |