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 /python | |
| 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 'python')
| -rwxr-xr-x | python/config/s2py.py (renamed from python/config/slice2py.py) | 0 | ||||
| -rw-r--r-- | python/python/Makefile | 2 | ||||
| -rw-r--r-- | python/python/Makefile.mak | 2 | ||||
| -rwxr-xr-x | python/scripts/slice2py.py | 18 | ||||
| -rw-r--r-- | python/test/Slice/import/Makefile | 2 | ||||
| -rw-r--r-- | python/test/Slice/import/Makefile.mak | 2 |
6 files changed, 22 insertions, 4 deletions
diff --git a/python/config/slice2py.py b/python/config/s2py.py index 64d73120ace..64d73120ace 100755 --- a/python/config/slice2py.py +++ b/python/config/s2py.py diff --git a/python/python/Makefile b/python/python/Makefile index 2ab5e3b897c..a415521d4f0 100644 --- a/python/python/Makefile +++ b/python/python/Makefile @@ -101,7 +101,7 @@ PACKAGES = IceBox IceGrid IcePatch2 IceStorm IceMX all:: $(ALL_SRCS) -SLICE2PY = ../config/slice2py.py +SLICE2PY = $(top_srcdir)/config/s2py.py SLICE2PYFLAGS += --ice Ice_%_ice.py: $(slicedir)/Ice/%.ice $(SLICE2PY) $(SLICEPARSERLIB) diff --git a/python/python/Makefile.mak b/python/python/Makefile.mak index 8f6562d65af..13e4df20f60 100644 --- a/python/python/Makefile.mak +++ b/python/python/Makefile.mak @@ -122,7 +122,7 @@ ALL_SRCS = $(ICE_SRCS) \ PACKAGES = IceBox IceGrid IcePatch2 IceStorm IceMX -SLICE2PY = $(PYTHON_HOME)\python $(top_srcdir)\config\slice2py.py +SLICE2PY = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py SLICE2PYFLAGS = $(SLICE2PYFLAGS) --ice all:: $(ALL_SRCS) diff --git a/python/scripts/slice2py.py b/python/scripts/slice2py.py new file mode 100755 index 00000000000..7f2aca37164 --- /dev/null +++ b/python/scripts/slice2py.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +import sys, Ice, IcePy +def main(): + sliceDir = Ice.getSliceDir() + # Automatically add the slice dir. + if not sliceDir is None: + sys.argv.append('-I' + sliceDir) + val = IcePy.compile(sys.argv) + sys.exit(int(val)) diff --git a/python/test/Slice/import/Makefile b/python/test/Slice/import/Makefile index 3e5464309dd..69b5a2015b3 100644 --- a/python/test/Slice/import/Makefile +++ b/python/test/Slice/import/Makefile @@ -20,7 +20,7 @@ include $(top_srcdir)/config/Make.rules SRCS = Test1_ice.py \ Test2_ice.py -SLICE2PY = ../../../config/slice2py.py +SLICE2PY = $(top_srcdir)/config/s2py.py all:: $(SRCS) Test1_ice.py: Test1.ice $(SLICE2PY) $(SLICEPARSERLIB) diff --git a/python/test/Slice/import/Makefile.mak b/python/test/Slice/import/Makefile.mak index a017b57afea..a9c5fad1b74 100644 --- a/python/test/Slice/import/Makefile.mak +++ b/python/test/Slice/import/Makefile.mak @@ -15,7 +15,7 @@ SRCS = Test1_ice.py \ Test2_ice.py !if "$(ice_src_dist)" != "" -SLICE2PY = $(PYTHON_HOME)\python $(top_srcdir)\config\slice2py.py +SLICE2PY = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py !endif all:: $(SRCS) |