summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2015-04-22 16:35:33 -0230
committerMatthew Newhook <matthew@zeroc.com>2015-04-22 16:35:33 -0230
commitcf1254cb87d99f2c4af21528bf190aed8ab700a4 (patch)
treec72544ce7fd475a272bb929a3b8e9048c78504e3 /python/test
parentICE-6455 - remove slice2py and slice2rb C++ exe (diff)
downloadice-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/test')
-rw-r--r--python/test/Slice/import/Makefile2
-rw-r--r--python/test/Slice/import/Makefile.mak2
2 files changed, 2 insertions, 2 deletions
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)