diff options
Diffstat (limited to 'cpp/install/common')
-rwxr-xr-x | cpp/install/common/makewindist.py | 3 | ||||
-rwxr-xr-x | cpp/install/common/stage.xml | 23 |
2 files changed, 19 insertions, 7 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index c936df96a9f..9174d4cea78 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -205,6 +205,7 @@ def buildMergeModules(startDir, stageDir, sourcesVersion, installVersion): ("BerkeleyDBRuntime", "BERKELEYDB_RUNTIME"),
("BerkeleyDBJava", "BERKELEYDB_JAVA"),
("BZip2DevKit", "BZIP2_DEV_KIT"),
+ ("BZip2Runtime", "BZIP2_RUNTIME"),
("ExpatDevKit", "EXPAT_DEV_KIT"),
("ExpatRuntime", "EXPAT_RUNTIME"),
("OpenSSLDevKit", "OPENSSL_DEV_KIT"),
@@ -307,7 +308,7 @@ def main(): print('You have indicated you want to ''clean'' files, starting from scratch.')
confirm = ''
while not confirm in ['y', 'n']:
- confirm = input('Are you sure? [y/N]')
+ confirm = raw_input('Are you sure? [y/N]')
if confirm == '':
confirm = 'n'
if confirm == 'n':
diff --git a/cpp/install/common/stage.xml b/cpp/install/common/stage.xml index a0d421b58fb..5cc3988fea4 100755 --- a/cpp/install/common/stage.xml +++ b/cpp/install/common/stage.xml @@ -119,19 +119,24 @@ <include name="icegrid30.dll"/> </fileset> <fileset dir="${ice.dir}/src"> + + <include name="Ice/Release/ice30.pdb"/> + <include name="Freeze/Release/freeze30.pdb"/> + <include name="IceSSL/Release/icessl30.pdb"/> + <include name="IceUtil/Release/iceutil30.pdb"/> + <include name="FreezeScript/Release/dumpdb.exe"/> <include name="FreezeScript/Release/TransformDB.exe"/> <include name="Glacier2/Release/glacier2router.exe"/> + <include name="Glacier2/Release/glacier300.pdb"/> <include name="IceBox/Release/icebox.exe"/> <include name="IceBox/Release/iceboxadmin.exe"/> <include name="icecpp/Release/icecpp.exe"/> - <include name="IcePack/Release/icepackadmin.exe"/> - <include name="IcePack/Release/icepacknode.exe"/> - <include name="IcePack/Release/icepackRegistry.exe"/> <include name="IcePatch2/Release/icepatch2calc.exe"/> <include name="IcePatch2/Release/icepatch2client.exe"/> <include name="IcePatch2/Release/icepatch2server.exe"/> <include name="IceStorm/Release/icestormadmin.exe"/> + <include name="IceStorm/Release/icestorm30.pdb"/> <include name="slice2docbook/Release/slice2docbook.exe"/> <include name="IceGrid/Release/icegridadmin.exe"/> <include name="IceGrid/Release/icegridnode.exe"/> @@ -565,16 +570,20 @@ </target> + <!-- bZip2 runtime --> + <target name="bzip2-runtime" depends="setup"> + <mkdir dir="${stage.dir}/bzip2/runtime/bin"/> + <copy file="${env.BZIP2_HOME}/bzip2d.dll" todir="${stage.dir}/bzip2/runtime/bin"/> + <copy file="${env.BZIP2_HOME}/bzip2.dll" todir="${stage.dir}/bzip2/runtime/bin"/> + </target> + <!-- bZip2 Dev Kit --> <target name="bzip2-dev" depends="setup"> - <mkdir dir="${stage.dir}/bzip2/dev/lib"/> <copy file="${env.BZIP2_HOME}/libbz2d.lib" todir="${stage.dir}/bzip2/dev/lib"/> <copy file="${env.BZIP2_HOME}/libbz2.lib" todir="${stage.dir}/bzip2/dev/lib"/> - <mkdir dir="${stage.dir}/bzip2/dev/include"/> <copy file="${env.BZIP2_HOME}/bzlib.h" todir="${stage.dir}/bzip2/dev/include"/> - </target> <!-- eXpat Dev Kit --> @@ -709,6 +718,7 @@ berkeley-dev, berkeley-runtime, berkeley-java, + bzip2-runtime, bzip2-dev, expat-dev, expat-runtime, @@ -727,6 +737,7 @@ berkeley-dev, berkeley-runtime, berkeley-java, + bzip2-runtime, bzip2-dev, expat-dev, expat-runtime, |