diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-01-26 19:10:25 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-01-26 19:10:25 +0000 |
| commit | 13277c5ad5e641afb81dd6549eb21c2649ebbc8c (patch) | |
| tree | c506a4157f12d6cfa752d0e3e5155e5701608fcc /cpp | |
| parent | Fixed test scripts to use the icebox executable matching the build (diff) | |
| download | ice-13277c5ad5e641afb81dd6549eb21c2649ebbc8c.tar.bz2 ice-13277c5ad5e641afb81dd6549eb21c2649ebbc8c.tar.xz ice-13277c5ad5e641afb81dd6549eb21c2649ebbc8c.zip | |
adding scripts to help touching up Ice versions in InstallShield projects
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/install/common/iceismedit.sh | 19 | ||||
| -rwxr-xr-x | cpp/install/common/makewindist.py | 9 | ||||
| -rwxr-xr-x | cpp/install/common/thirdparty_ismedit.sh | 19 |
3 files changed, 43 insertions, 4 deletions
diff --git a/cpp/install/common/iceismedit.sh b/cpp/install/common/iceismedit.sh new file mode 100755 index 00000000000..5b983973c94 --- /dev/null +++ b/cpp/install/common/iceismedit.sh @@ -0,0 +1,19 @@ +#!/bin/bash
+
+ICEVER=$1
+
+PRODUCTCODE="{`uuidgen`}"
+UPGRADECODE="{`uuidgen`}"
+PACKAGECODE="{`uuidgen`}"
+
+VERARRAY=(`echo "$ICEVER" | sed -e 's/\./ /g'`)
+
+sed "
+s/\(<row><td>ProductName<\/td><td>Ice \)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ProductVersion<\/td><td>\)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ProductCode<\/td><td>\).[-0-9A-Za-z]\+.\(.*\)/\1$PRODUCTCODE\2/
+s/\(<row><td>UpgradeCode<\/td><td>\).[-0-9A-Za-z]\+.\(.*\)/\1$UPGRADECODE\2/
+s/\(<subject>Ice \)[0-9]\+.[0-9]\+[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ICE_INSTALL_DIR.*WindowsVolume<\/td><td>ICE-\)[0-9]\+..[0-9]\+.Ice-[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1${VERARRAY[0]}_~${VERARRAY[2]}\|Ice-$ICEVER\2/
+s/\(<row><td>ZEROC.*MSIPackageFileName<\/td><td>Ice-\)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+"
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index bb14a33b63b..974f2b0ca91 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -649,6 +649,11 @@ libraries.""" os.mkdir(stageDir)
#
+ # Gather and generate license files.
+ #
+ convertLicensesToRTF(os.path.dirname(__file__), target)
+
+ #
# The third party packages need to be staged before building the
# distributions. This ordering is important because it adds an
# additional check that the third party packages that are
@@ -657,10 +662,6 @@ libraries.""" components.stage(os.path.join(os.path.dirname(components.__file__), "components", "components.ini"),
os.path.join(os.path.dirname(components.__file__), "components"), stageDir, "packages", defaults)
- #
- # Gather and generate license files.
- #
- convertLicensesToRTF(os.path.dirname(__file__), target)
#
# Build the merge module projects.
diff --git a/cpp/install/common/thirdparty_ismedit.sh b/cpp/install/common/thirdparty_ismedit.sh new file mode 100755 index 00000000000..a5b8274ae8e --- /dev/null +++ b/cpp/install/common/thirdparty_ismedit.sh @@ -0,0 +1,19 @@ +#!/bin/bash
+
+ICEVER=$1
+
+PRODUCTCODE="{`uuidgen`}"
+UPGRADECODE="{`uuidgen`}"
+PACKAGECODE="{`uuidgen`}"
+
+VERARRAY=(`echo "$ICEVER" | sed -e 's/\./ /g'`)
+
+sed "
+s/\(<row><td>ProductName<\/td><td>Ice \)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ProductVersion<\/td><td>\)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ProductCode<\/td><td>\).[-0-9A-Za-z]\+.\(.*\)/\1$PRODUCTCODE\2/
+s/\(<row><td>UpgradeCode<\/td><td>\).[-0-9A-Za-z]\+.\(.*\)/\1$UPGRADECODE\2/
+s/\(<subject>Ice \)[0-9]\+.[0-9]\+[0-9]\+\(.*\)/\1$ICEVER\2/
+s/\(<row><td>ICE_TP_INSTALL_DIR.*WindowsVolume<\/td><td>ICE-\)[0-9]\+..[0-9]\+.Ice-[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1${VERARRAY[0]}_~${VERARRAY[2]}\|Ice-$ICEVER\2/
+s/\(<row><td>ZEROC.*MSIPackageFileName<\/td><td>ThirdParty-\)[0-9]\+.[0-9]\+.[0-9]\+\(.*\)/\1$ICEVER\2/
+"
|