Add support for general MakeMSI files to make-msi script and firefox header

file.  Work supports bug 231062. (cmp)
This commit is contained in:
cltbld 2005-01-06 20:25:30 +00:00
Родитель 96d73ea68d
Коммит 02e1e2494e
3 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -196,7 +196,7 @@
;----------------------------------------------------------------------------
;--- Include MAKEMSI support ------------------------------------------------
;----------------------------------------------------------------------------
#include "dept.mmh"
#include "mozilla-dept.mmh"

Просмотреть файл

@ -48,6 +48,7 @@ if ($inConfigFiles eq "") {
$DIST = "$inObjDir/dist";
$MSRC = "$inSrcDir/browser/installer/windows/msi";
$MMH = "$inSrcDir/toolkit/mozapps/installer/windows/msi";
$MDIST = "$DIST/msi";
$STAGE = "$DIST/install";
@ -96,8 +97,8 @@ Print("Placing MSI files in $MDIST/...\n");
system("cp \"$MSRC/firefox.mm\" \"$MDIST/\"");
system("cp \"$MSRC/firefox.mmh\" \"$MDIST/\"");
system("cp \"$MSRC/firefox.ver\" \"$MDIST/\"");
system("cp \"$MSRC/dept.mmh\" \"$MDIST/\"");
system("cp \"$MSRC/mozilla.mmh\" \"$MDIST/\"");
system("cp \"$MMH/mozilla-dept.mmh\" \"$MDIST/\"");
system("cp \"$MMH/mozilla-company.mmh\" \"$MDIST/\"");
#--------------------------------------------------------------------------
# Generate MSI file.

Просмотреть файл

@ -48,6 +48,7 @@ if ($inConfigFiles eq "") {
$DIST = "$inObjDir/dist";
$MSRC = "$inSrcDir/browser/installer/windows/msi";
$MMH = "$inSrcDir/toolkit/mozapps/installer/windows/msi";
$MDIST = "$DIST/msi";
$STAGE = "$DIST/install";
@ -96,8 +97,8 @@ Print("Placing MSI files in $MDIST/...\n");
system("cp \"$MSRC/firefox.mm\" \"$MDIST/\"");
system("cp \"$MSRC/firefox.mmh\" \"$MDIST/\"");
system("cp \"$MSRC/firefox.ver\" \"$MDIST/\"");
system("cp \"$MSRC/dept.mmh\" \"$MDIST/\"");
system("cp \"$MSRC/mozilla.mmh\" \"$MDIST/\"");
system("cp \"$MMH/mozilla-dept.mmh\" \"$MDIST/\"");
system("cp \"$MMH/mozilla-company.mmh\" \"$MDIST/\"");
#--------------------------------------------------------------------------
# Generate MSI file.