Fixed Python and Ruby build systems to allow running tests against binary distribution

6 files changed, 8 insertions, 28 deletions

diff --git a/python/config/Make.rules b/python/config/Make.rules
index 718e634b5d8..b1e223ca456 100644
--- a/python/config/Make.rules
+++ b/python/config/Make.rules
@@ -84,7 +84,6 @@ PYTHON_LIBS	    ?= -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME)
 #
 ice_language     = python
 ice_require_cpp  = yes
-slice_translator = slice2py
 
 ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0)
     include $(top_srcdir)/config/Make.common.rules
@@ -139,21 +138,18 @@ ICE_LIBS = $(ICE_LIB_DIR) -lIceSSL -lIce -lSlice -lIceUtil
 
 CPPFLAGS		=
 ICECPPFLAGS		= -I$(slicedir)
-SLICE2PYFLAGS		= $(ICECPPFLAGS)
+SLICE2PYFLAGS	= $(ICECPPFLAGS)
 LDFLAGS			= $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
 
 ifdef ice_src_dist
-    SLICE2PY 	= $(ice_cpp_dir)/bin/slice2py
+	SLICE2PY    = $(top_srcdir)/config/s2py.py
     SLICEPARSERLIB	= $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION))
     ifeq ($(wildcard $(SLICEPARSERLIB)),)
-	SLICEPARSERLIB  = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION))
+		SLICEPARSERLIB  = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION))
     endif
 else
-    SLICE2PY 		= $(ice_dir)/$(binsubdir)/slice2py
-    SLICEPARSERLIB	= $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION))
-    ifeq ($(wildcard $(SLICEPARSERLIB)),)
-	SLICEPARSERLIB  = $(ice_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION))
-    endif
+    SLICE2PY 		= $(ice_dir)/bin/slice2py
+    SLICEPARSERLIB	=
 endif
 
 #
diff --git a/python/config/Make.rules.mak b/python/config/Make.rules.mak
index b77531bf014..b7b8d875678 100644
--- a/python/config/Make.rules.mak
+++ b/python/config/Make.rules.mak
@@ -47,7 +47,6 @@ PYTHON_HOME		= C:\Python34
 #
 ice_language     = python
 ice_require_cpp  = yes
-slice_translator = slice2py
 
 !if exist ($(top_srcdir)\..\config\Make.common.rules.mak)
 !include $(top_srcdir)\..\config\Make.common.rules.mak
@@ -95,22 +94,14 @@ ICECPPFLAGS		= -I"$(slicedir)"
 SLICE2PYFLAGS		= $(ICECPPFLAGS)
 
 !if "$(ice_src_dist)" != ""
-!if "$(ice_cpp_dir)" == "$(ice_dir)\cpp"
-SLICE2PY                = $(ice_cpp_dir)\bin\slice2py.exe
+SLICE2PY                = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py
 SLICEPARSERLIB          = $(ice_cpp_dir)\lib\slice.lib
 !if !exist ("$(SLICEPARSERLIB)")
 SLICEPARSERLIB          = $(ice_cpp_dir)\lib\sliced.lib
 !endif
 !else
-SLICE2PY                = $(ice_cpp_dir)\bin$(x64suffix)\slice2py.exe
-SLICEPARSERLIB          = $(ice_cpp_dir)\lib$(x64suffix)\slice.lib
-!if !exist ("$(SLICEPARSERLIB)")
-SLICEPARSERLIB          = $(ice_cpp_dir)\lib$(x64suffix)\sliced.lib
-!endif
-!endif
-!else
-SLICE2PY                = $(ice_dir)\bin\slice2py.exe
-SLICEPARSERLIB          = $(ice_dir)\lib\slice.lib
+SLICE2PY                = $(PYTHON_HOME)\Scripts\slice2py.exe
+SLICEPARSERLIB          = $(PYTHON_HOME)\Scripts\slice2py.exe
 !endif
 
 MT			= mt.exe
diff --git a/python/python/Makefile b/python/python/Makefile
index a415521d4f0..523aa4e9240 100644
--- a/python/python/Makefile
+++ b/python/python/Makefile
@@ -101,7 +101,6 @@ PACKAGES	= IceBox IceGrid IcePatch2 IceStorm IceMX
 
 all:: $(ALL_SRCS)
 
-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 8ed64078b9a..3ae8fe9f40c 100644
--- a/python/python/Makefile.mak
+++ b/python/python/Makefile.mak
@@ -122,7 +122,6 @@ ALL_SRCS	= $(ICE_SRCS) \
 
 PACKAGES	= IceBox IceGrid IcePatch2 IceStorm IceMX
 
-SLICE2PY        = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py
 SLICE2PYFLAGS   = $(SLICE2PYFLAGS) --ice
 
 all:: $(ALL_SRCS)
diff --git a/python/test/Slice/import/Makefile b/python/test/Slice/import/Makefile
index 69b5a2015b3..91581b604f5 100644
--- a/python/test/Slice/import/Makefile
+++ b/python/test/Slice/import/Makefile
@@ -20,7 +20,6 @@ include $(top_srcdir)/config/Make.rules
 SRCS	= Test1_ice.py \
           Test2_ice.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 a9c5fad1b74..e3935c60083 100644
--- a/python/test/Slice/import/Makefile.mak
+++ b/python/test/Slice/import/Makefile.mak
@@ -14,10 +14,6 @@ top_srcdir	= ..\..\..
 SRCS		= Test1_ice.py \
                   Test2_ice.py
 
-!if "$(ice_src_dist)" != ""
-SLICE2PY        = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py
-!endif
-
 all:: $(SRCS)
 
 Test1_ice.py: "Test1.ice" "$(SLICEPARSERLIB)"