Port build to nmake

2 files changed, 15 insertions, 102 deletions

diff --git a/py/python/generate.mak b/py/python/Makefile.mak
index a901dc1783b..0b5f7317433 100644..100755
--- a/py/python/generate.mak
+++ b/py/python/Makefile.mak
@@ -1,27 +1,15 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2006 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.
 #
 # **********************************************************************
 
-.SUFFIXES:	.py
+top_srcdir	= ..
 
-!IF EXIST (../slice)
-slicedir	= ../slice
-!ELSE IFDEF ICE_HOME
-slicedir	= $(ICE_HOME)/slice
-!ELSE
-!ERROR "Slice directory not found - set ICE_HOME!"
-!ENDIF
-
-!IFDEF ICE_HOME
-SLICE2PY	= $(ICE_HOME)\bin\slice2py
-!ELSE
-SLICE2PY	= slice2py
-!ENDIF
+!include $(top_srcdir)\config\Make.rules.mak
 
 ICE_SRCS	= Ice_LocalException_ice.py \
 		  Ice_Communicator_ice.py \
@@ -89,7 +77,7 @@ ALL_SRCS	= $(ICE_SRCS) \
 
 PACKAGES	= Glacier2 IceBox IceGrid IcePatch2 IceStorm
 
-SLICE2PYFLAGS	= -I$(slicedir) --ice
+SLICE2PYFLAGS   = $(SLICE2PYFLAGS) --ice
 
 all:: $(ALL_SRCS)
 
@@ -251,7 +239,15 @@ IcePatch2_FileServer_ice.py: $(slicedir)/IcePatch2/FileServer.ice
 IceStorm_IceStorm_ice.py: $(slicedir)/IceStorm/IceStorm.ice
 	$(SLICE2PY) $(SLICE2PYFLAGS) --prefix IceStorm_ $(slicedir)/IceStorm/IceStorm.ice
 
+
+install:: $(ALL_SRCS)
+	@echo "Installing generated code"
+	copy *.py $(install_pythondir)
+	@for %i in ( $(PACKAGES) ) do \
+	    @if not exist $(install_pythondir)\%i \
+	        mkdir $(install_pythondir)\%i
+	@for %i in ( $(PACKAGES) ) do \
+	    copy %i\* $(install_pythondir)\%i
+
 clean::
-	-del /Q *.pyc
-	-del /Q *_ice.py
-	-rmdir /S /Q $(PACKAGES)
+	del /q $(PACKAGES) *_ice.py
diff --git a/py/python/Python.dsp b/py/python/Python.dsp
deleted file mode 100644
index 080240b5821..00000000000
--- a/py/python/Python.dsp
+++ /dev/null
@@ -1,83 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Python" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) External Target" 0x0106

-

-CFG=Python - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Python.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Python.mak" CFG="Python - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Python - Win32 Release" (based on "Win32 (x86) External Target")

-!MESSAGE "Python - Win32 Debug" (based on "Win32 (x86) External Target")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Python - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Cmd_Line "NMAKE /f generate.mak"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ""

-# PROP Cmd_Line "NMAKE /f generate.mak"

-# PROP Rebuild_Opt "clean all"

-# PROP Target_File "sources"

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "Python - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Cmd_Line "NMAKE /f generate.mak"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ""

-# PROP Cmd_Line "NMAKE /f generate.mak"

-# PROP Rebuild_Opt "clean all"

-# PROP Target_File "sources"

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Python - Win32 Release"

-# Name "Python - Win32 Debug"

-

-!IF  "$(CFG)" == "Python - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "Python - Win32 Debug"

-

-!ENDIF 

-

-# Begin Source File

-

-SOURCE=.\generate.mak

-# End Source File

-# End Target

-# End Project