fixes

9 files changed, 43 insertions, 32 deletions

diff --git a/cpp/install/common/components.py b/cpp/install/common/components.py
index d9fa98535dc..2160e4aac18 100755
--- a/cpp/install/common/components.py
+++ b/cpp/install/common/components.py
@@ -80,7 +80,7 @@ class FileSpecWorker:
 	else:
 	    raise FileSpecError("Line \'%s\' does not match filespec schema." % filename)
 
-    def execute(self, fake = False):
+    def execute(self, defaults, fake = False):
 	"""Copy all of the specified files."""
 	recursiveIncludes = []
 	recursiveExcludes = []
@@ -206,6 +206,7 @@ class FileSpecWorker:
 	    if f.startswith('f,'):
 		flatten = True
 		current = current[2:]
+	    current = current % defaults
 		
 	    targetDirectory = self.dest 
 	    targetFile = os.path.basename(current)
@@ -294,7 +295,12 @@ def stage(filename, componentdir, stageDirectory, group, defaults):
 				continue
 			    if not template == None:
 				mapping['name'] = current
-				computedName = template % mapping
+				try:
+				    computedName = template % mapping
+				except:
+				    print "Mapping exception occurred with " + template + " and " + current  
+				    raise
+				    
 				logging.log(logging.DEBUG, 'Adding templatized name %s' % computedName)
 				worker.add(computedName)
 			    else:
@@ -312,7 +318,7 @@ def stage(filename, componentdir, stageDirectory, group, defaults):
 			    # XXX- fake is set to true while we are
 			    # debugging.
 			    #
-			    worker.execute(False)
+			    worker.execute(defaults, False)
 
 		    finally:
 			componentFile.close()
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index e1a745ea5e4..abcd3e81b8f 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -126,7 +126,7 @@ elements=10
 active=1
 source1=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist1=ice.dev.exes
-filetemplate1=f,%(name)s/%(OutDir)sRelease/%(name).exe
+filetemplate1=f,%(name)s/%(OutDir)sRelease/%(name)s.exe
 dest1=bin
 ;;
 ;; Header files.
@@ -166,12 +166,12 @@ dest8=bin
 
 source9=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist9=ice.dev.exes.debug
-filetemplate9=f,%(name)s/%(OutDir)sDebug/%(name).exe
+filetemplate9=f,%(name)s/%(OutDir)sDebug/%(name)sd.exe
 dest9=bin
 
 source10=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist10=ice.dev.exes.debug
-filetemplate10=f,%(name)s/%(OutDir)sDebug/%(name).pdb
+filetemplate10=f,%(name)s/%(OutDir)sDebug/%(name)sd.pdb
 dest10=bin
 
 [java runtime]
@@ -192,7 +192,7 @@ dest1=ant
 
 source2=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist2=ice.java.exes
-filetemplate2=f,%(name)s/%(OutDir)sRelease/%(name).exe
+filetemplate2=f,%(name)s/%(OutDir)sRelease/%(name)s.exe
 dest2=bin
 
 source3=%(BUILD_DIR)s/IceJ-%(version)s/config
diff --git a/cpp/install/common/components/ice.demo.vc80_x64 b/cpp/install/common/components/ice.demo.vc80_x64
index 8bde118a34f..62915d983a8 100755
--- a/cpp/install/common/components/ice.demo.vc80_x64
+++ b/cpp/install/common/components/ice.demo.vc80_x64
@@ -178,11 +178,11 @@ Ice/converter/config.client
 Ice/converter/config.server
 Ice/converter/converterC.vcproj
 Ice/converter/converterS.vcproj
-Ice/converter/Hello.cpp
-Ice/converter/Hello.h
-Ice/converter/Hello.ice
-Ice/converter/HelloI.cpp
-Ice/converter/HelloI.h
+Ice/converter/Echo.cpp
+Ice/converter/Echo.h
+Ice/converter/Echo.ice
+Ice/converter/EchoI.cpp
+Ice/converter/EchoI.h
 Ice/converter/README
 Ice/converter/Server.cpp
 Ice/converter/StringConverterI.cpp
diff --git a/cpp/install/common/components/ice.dev.exes.Debug b/cpp/install/common/components/ice.dev.exes.Debug
index 0d071a2e7e8..0266b2986d7 100644
--- a/cpp/install/common/components/ice.dev.exes.Debug
+++ b/cpp/install/common/components/ice.dev.exes.Debug
@@ -1 +1 @@
-iceboxd
+icebox
diff --git a/cpp/install/common/components/ice.dev.icestormservice.dll b/cpp/install/common/components/ice.dev.icestormservice.dll
index b53c4ed477d..dea0ab9b4d4 100755
--- a/cpp/install/common/components/ice.dev.icestormservice.dll
+++ b/cpp/install/common/components/ice.dev.icestormservice.dll
@@ -1,2 +1,2 @@
-f,IceStorm/Debug/icestormservice31d.dll

-f,IceStorm/Debug/icestormservice31d.pdb

+f,IceStorm/%(OutDir)sDebug/icestormservice31d.dll

+f,IceStorm/%(OutDir)sDebug/icestormservice31d.pdb

diff --git a/cpp/install/common/components/ice.dev.icestormservice.lib b/cpp/install/common/components/ice.dev.icestormservice.lib
index c3872d2a6ac..9d2e3cb9475 100755
--- a/cpp/install/common/components/ice.dev.icestormservice.lib
+++ b/cpp/install/common/components/ice.dev.icestormservice.lib
@@ -1,2 +1,2 @@
-f,IceStorm/Debug/icestormserviced.lib

-f,IceStorm/Release/icestormservice.lib

+f,IceStorm/%(OutDir)sDebug/icestormserviced.lib

+f,IceStorm/%(OutDir)sRelease/icestormservice.lib

diff --git a/cpp/install/common/components/ice.runtime.exes b/cpp/install/common/components/ice.runtime.exes
index 99640bb3871..47cd3481a0f 100755
--- a/cpp/install/common/components/ice.runtime.exes
+++ b/cpp/install/common/components/ice.runtime.exes
@@ -1,14 +1,14 @@
-f,FreezeScript/Release/dumpdb		 
-f,FreezeScript/Release/transformdb
-f,Glacier2/Release/glacier2router
-f,IceBox/Release/icebox
-f,IceBox/Release/iceboxadmin
-f,icecpp/Release/icecpp
-f,IcePatch2/Release/icepatch2calc
-f,IcePatch2/Release/icepatch2client
-f,IcePatch2/Release/icepatch2server
-f,IceStorm/Release/icestormadmin
-f,slice2docbook/Release/slice2docbook
-f,IceGrid/Release/icegridadmin
-f,IceGrid/Release/icegridnode
-f,IceGrid/Release/icegridregistry
+f,FreezeScript/%(OutDir)sRelease/dumpdb		 
+f,FreezeScript/%(OutDir)sRelease/transformdb
+f,Glacier2/%(OutDir)sRelease/glacier2router
+f,IceBox/%(OutDir)sRelease/icebox
+f,IceBox/%(OutDir)sRelease/iceboxadmin
+f,icecpp/%(OutDir)sRelease/icecpp
+f,IcePatch2/%(OutDir)sRelease/icepatch2calc
+f,IcePatch2/%(OutDir)sRelease/icepatch2client
+f,IcePatch2/%(OutDir)sRelease/icepatch2server
+f,IceStorm/%(OutDir)sRelease/icestormadmin
+f,slice2docbook/%(OutDir)sRelease/slice2docbook
+f,IceGrid/%(OutDir)sRelease/icegridadmin
+f,IceGrid/%(OutDir)sRelease/icegridnode
+f,IceGrid/%(OutDir)sRelease/icegridregistry
diff --git a/cpp/install/common/components/ice.runtime.icestormservice b/cpp/install/common/components/ice.runtime.icestormservice
index 22e280d61fe..528aea767a5 100755
--- a/cpp/install/common/components/ice.runtime.icestormservice
+++ b/cpp/install/common/components/ice.runtime.icestormservice
@@ -1 +1 @@
-f,IceStorm/Release/icestormservice31.dll

+f,IceStorm/%(OutDir)sRelease/icestormservice31.dll

diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py
index 2cdbac7ea20..599368f9dfb 100755
--- a/cpp/install/common/makewindist.py
+++ b/cpp/install/common/makewindist.py
@@ -645,6 +645,11 @@ def main():
 	defaults['dbver'] = '43'
 	defaults['version'] = sourcesVersion
 	defaults['dllversion'] = sourcesVersion.replace('.', '')[:2]
+	
+	if target == "vc80_x64":
+	    defaults['OutDir'] = "x64/"
+	else:
+	    defaults['OutDir'] = ''
 
 	if os.path.exists(stageDir):
 	    try: