|
@@ -1,9 +1,246 @@
|
|
|
# HG changeset patch
|
|
|
# User Ian Neal <iann_cvs@blueyonder.co.uk>
|
|
|
# Date 1611530270 0
|
|
|
-# Parent 5088f0b55162b9d6f51ea20e459b2a7beccdc1a3
|
|
|
+# Parent 6af958c2922d525f3b0618eab2e5eeb86b455b1f
|
|
|
Bug 1687385 - Update SeaMonkey mozconfigs - mozconfigs part. r=frg a=frg
|
|
|
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/make-release.sh b/suite/config/mozconfigs/common-win/make-release.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/make-release.sh
|
|
|
+@@ -0,0 +1,85 @@
|
|
|
++pushd $SOURCEDIR
|
|
|
++
|
|
|
++mach build
|
|
|
++# read -p "Press any key to resume ..."
|
|
|
++mach buildsymbols
|
|
|
++
|
|
|
++pushd $MOZ_OBJDIR/dist/bin
|
|
|
++
|
|
|
++find ./ -type f -name "*.exe" -exec signwinbinary.sh {} \;
|
|
|
++find ./ -type f \( -iname "*.dll" ! -iname "api-ms-*.dll" ! -iname "d3dcompiler*.dll" ! -iname "msvcp*.dll" ! -iname "vcrun*.dll" \) -exec signwinbinary.sh {} \;
|
|
|
++
|
|
|
++popd
|
|
|
++
|
|
|
++mach build full-package
|
|
|
++
|
|
|
++signwinbinary.sh "$MOZ_OBJDIR/comm/suite/installer/windows/instgen/setup.exe"
|
|
|
++
|
|
|
++rm -f $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.en-US.$ARCH.installer.exe
|
|
|
++
|
|
|
++mach repackage installer --package-name seamonkey \
|
|
|
++ --package $MOZ_OBJDIR/dist/seamonkey-$PACKAGE.en-US.$ARCH.zip \
|
|
|
++ --tag $SOURCEDIR/comm/suite/installer/windows/app.tag \
|
|
|
++ --setupexe $MOZ_OBJDIR/comm/suite/installer/windows/instgen/setup.exe \
|
|
|
++ --o $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.en-US.$ARCH.installer.exe \
|
|
|
++ --sfx-stub $SOURCEDIR/comm/other-licenses/7zstub/seamonkey/7zSD.sfx
|
|
|
++
|
|
|
++signwinbinary.sh "$MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.en-US.$ARCH.installer.exe"
|
|
|
++
|
|
|
++while read -r line || [[ -n "$line" ]]; do
|
|
|
++ # Skip linux and macOS entries.
|
|
|
++ if [[ "$line" == ja*linux ]] || [[ "$line" == ja-JP-mac* ]] ;
|
|
|
++ then
|
|
|
++ echo "l10n $line skipped"
|
|
|
++ else
|
|
|
++ # Fix up Windows entry.
|
|
|
++ if [[ "$line" == ja*win32 ]] ;
|
|
|
++ then
|
|
|
++ L10N=ja
|
|
|
++ else
|
|
|
++ L10N=$line
|
|
|
++ fi
|
|
|
++ echo $L10N
|
|
|
++
|
|
|
++ mach build installers-$L10N
|
|
|
++
|
|
|
++ # urgkkkk no way to sign helper.exe properly
|
|
|
++ # unpack sign and update
|
|
|
++ signwinbinary.sh "$MOZ_OBJDIR/dist/l10n-stage/seamonkey/uninstall/helper.exe"
|
|
|
++
|
|
|
++ pushd $MOZ_OBJDIR/dist/l10n-stage
|
|
|
++ 7z a $MOZ_OBJDIR/dist/seamonkey-$PACKAGE.$L10N.$ARCH.zip seamonkey/uninstall/helper.exe
|
|
|
++ # 7z a $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.$L10N.$ARCH.installer.exe seamonkey/uninstall/helper.exe
|
|
|
++ popd
|
|
|
++
|
|
|
++ rm -f $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.$L10N.$ARCH.installer.exe
|
|
|
++
|
|
|
++ signwinbinary.sh "$MOZ_OBJDIR/comm/suite/installer/windows/l10ngen/setup.exe"
|
|
|
++
|
|
|
++ # Instead of doing an installer repack helper.exe and setup.exe could be updated directly but compression suffers.
|
|
|
++ # pushd $MOZ_OBJDIR/comm/suite/installer/windows/l10ngen
|
|
|
++ # 7z a $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.$L10N.$ARCH.installer.exe setup.exe
|
|
|
++ # popd
|
|
|
++
|
|
|
++ mach repackage installer --package-name seamonkey \
|
|
|
++ --package $MOZ_OBJDIR/dist/seamonkey-$PACKAGE.$L10N.$ARCH.zip \
|
|
|
++ --tag $SOURCEDIR/comm/suite/installer/windows/app.tag \
|
|
|
++ --setupexe $MOZ_OBJDIR/comm/suite/installer/windows/l10ngen/setup.exe \
|
|
|
++ --o $MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.$L10N.$ARCH.installer.exe \
|
|
|
++ --sfx-stub $SOURCEDIR/comm/other-licenses/7zstub/seamonkey/7zSD.sfx
|
|
|
++
|
|
|
++ signwinbinary.sh "$MOZ_OBJDIR/dist/install/sea/seamonkey-$PACKAGE.$L10N.$ARCH.installer.exe"
|
|
|
++
|
|
|
++ mach build createmar-$L10N
|
|
|
++
|
|
|
++ # if [ $? -eq 0 ]
|
|
|
++ # then
|
|
|
++ # echo "ok"
|
|
|
++ # else
|
|
|
++ # echo "error"
|
|
|
++ # exit 1
|
|
|
++ # fi
|
|
|
++ fi
|
|
|
++done < "$L10NSHIPPED"
|
|
|
++
|
|
|
++popd
|
|
|
+\ No newline at end of file
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-beta b/suite/config/mozconfigs/common-win/mozconfig.build-all-beta
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-beta
|
|
|
+@@ -0,0 +1,6 @@
|
|
|
++ac_add_options --enable-release
|
|
|
++ac_add_options --enable-update-channel=beta
|
|
|
++ac_add_options --enable-debug-symbols
|
|
|
++# tests are known broken and result in long compile times.
|
|
|
++ac_add_options --disable-tests
|
|
|
++ac_add_options --enable-optimize=-O2
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-common b/suite/config/mozconfigs/common-win/mozconfig.build-all-common
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-common
|
|
|
+@@ -0,0 +1,24 @@
|
|
|
++ac_add_options --enable-application=comm/suite
|
|
|
++
|
|
|
++ac_add_options --enable-calendar
|
|
|
++ac_add_options --enable-irc
|
|
|
++ac_add_options --enable-dominspector
|
|
|
++
|
|
|
++ac_add_options --with-google-location-service-api-keyfile=e:/builds/data/google-api.key
|
|
|
++ac_add_options --with-google-safebrowsing-api-keyfile=e:/builds/data/google-api.key
|
|
|
++
|
|
|
++mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=e:/builds/data/crash-stats-api.token"
|
|
|
++
|
|
|
++# Needed to enable breakpad in application.ini
|
|
|
++export MOZILLA_OFFICIAL=1
|
|
|
++# Disable checking that add-ons are signed by the trusted root
|
|
|
++MOZ_ADDON_SIGNING=0
|
|
|
++# Disable enforcing that add-ons are signed by the trusted root
|
|
|
++MOZ_REQUIRE_SIGNING=0
|
|
|
++# Package js shell
|
|
|
++export MOZ_PACKAGE_JSSHELL=1
|
|
|
++
|
|
|
++export GECKO_HEAD_REPOSITORY=https://gitlab.com/seamonkey-project/seamonkey-2.53-mozilla
|
|
|
++# export GECKO_HEAD_REV=`git log | grep '^commit ' | head -1 | sed -e 's@commit @@'`
|
|
|
++export COMM_HEAD_REPOSITORY=https://gitlab.com/seamonkey-project/seamonkey-2.53-comm
|
|
|
++export MOZ_INCLUDE_SOURCE_INFO=1
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-common-beta b/suite/config/mozconfigs/common-win/mozconfig.build-all-common-beta
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-common-beta
|
|
|
+@@ -0,0 +1,3 @@
|
|
|
++ac_add_options --enable-debugqa
|
|
|
++# ac_add_options --with-crashreporter-url=https://crash-uploads-test.seamonkey-project.org/crashreports
|
|
|
++ac_add_options --with-crashreporter-url=https://seamonkey_project.bugsplat.com/post/bp/crash/postBP.php
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-common-release b/suite/config/mozconfigs/common-win/mozconfig.build-all-common-release
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-common-release
|
|
|
+@@ -0,0 +1,2 @@
|
|
|
++# ac_add_options --with-crashreporter-url=https://crash-uploads-test.seamonkey-project.org/crashreports
|
|
|
++ac_add_options --with-crashreporter-url=https://seamonkey_project.bugsplat.com/post/bp/crash/postBP.php
|
|
|
+\ No newline at end of file
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-compile b/suite/config/mozconfigs/common-win/mozconfig.build-all-compile
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-compile
|
|
|
+@@ -0,0 +1,3 @@
|
|
|
++mk_add_options MOZ_MAKE_FLAGS=-j4
|
|
|
++ac_add_options --enable-jemalloc
|
|
|
++ac_add_options --enable-js-shell
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-all-release b/suite/config/mozconfigs/common-win/mozconfig.build-all-release
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-all-release
|
|
|
+@@ -0,0 +1,6 @@
|
|
|
++ac_add_options --enable-release
|
|
|
++ac_add_options --enable-update-channel=release
|
|
|
++ac_add_options --enable-debug-symbols
|
|
|
++# tests are known broken and result in long compile times.
|
|
|
++ac_add_options --disable-tests
|
|
|
++ac_add_options --enable-optimize=-O2
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-x64-common b/suite/config/mozconfigs/common-win/mozconfig.build-x64-common
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-x64-common
|
|
|
+@@ -0,0 +1,2 @@
|
|
|
++ac_add_options --target=x86_64-pc-mingw32
|
|
|
++ac_add_options --host=x86_64-pc-mingw32
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-x64-redist b/suite/config/mozconfigs/common-win/mozconfig.build-x64-redist
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-x64-redist
|
|
|
+@@ -0,0 +1,2 @@
|
|
|
++export WIN32_REDIST_DIR=/e/builds/vs2019runtime/vc/redist/x64/Microsoft.VC142.CRT
|
|
|
++export WIN_UCRT_REDIST_DIR=/e/builds/vs2019runtime/ucrt/DLLs/x64
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-x86-common b/suite/config/mozconfigs/common-win/mozconfig.build-x86-common
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-x86-common
|
|
|
+@@ -0,0 +1,1 @@
|
|
|
++ac_add_options --target=i686-pc-mingw32
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.build-x86-redist b/suite/config/mozconfigs/common-win/mozconfig.build-x86-redist
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.build-x86-redist
|
|
|
+@@ -0,0 +1,2 @@
|
|
|
++export WIN32_REDIST_DIR=/e/builds/vs2019runtime/vc/redist/x86/Microsoft.VC142.CRT
|
|
|
++export WIN_UCRT_REDIST_DIR=/e/builds/vs2019runtime/ucrt/DLLs/x86
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.clang-all-compile b/suite/config/mozconfigs/common-win/mozconfig.clang-all-compile
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.clang-all-compile
|
|
|
+@@ -0,0 +1,6 @@
|
|
|
++CLANG_DIR=`cd "/e/builds/tools/clang/bin" ; pwd`
|
|
|
++export PATH="${CLANG_DIR}:${PATH}"
|
|
|
++
|
|
|
++export CC="clang-cl $FLAGS"
|
|
|
++export CXX="clang-cl $FLAGS"
|
|
|
++export LINKER="lld-link.exe"
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/mozconfig.vs2019-all-compile b/suite/config/mozconfigs/common-win/mozconfig.vs2019-all-compile
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/mozconfig.vs2019-all-compile
|
|
|
+@@ -0,0 +1,3 @@
|
|
|
++ac_add_options --with-visual-studio-version=2019
|
|
|
++
|
|
|
++export CC=cl
|
|
|
+diff --git a/suite/config/mozconfigs/common-win/signwinbinary.sh b/suite/config/mozconfigs/common-win/signwinbinary.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/common-win/signwinbinary.sh
|
|
|
+@@ -0,0 +1,19 @@
|
|
|
++# signwinbinary.sh
|
|
|
++
|
|
|
++# signtool sign with SHA256 command
|
|
|
++export SIGNTOOL="signtool.exe sign -tr http://timestamp.digicert.com -f $SIGNKEY -p $SIGNPSWD -fd sha256 -td sha256"
|
|
|
++
|
|
|
++signbinary() {
|
|
|
++ $SIGNTOOL $1
|
|
|
++
|
|
|
++ retVal=$?
|
|
|
++ if [ $retVal -ne 0 ]; then
|
|
|
++ echo "Signing error"
|
|
|
++ read -p "Press any key to continue ..."
|
|
|
++ exit $retVal
|
|
|
++ fi
|
|
|
++
|
|
|
++ sleep 4
|
|
|
++}
|
|
|
++
|
|
|
++signbinary "$1"
|
|
|
+\ No newline at end of file
|
|
|
diff --git a/suite/config/mozconfigs/linux32/beta b/suite/config/mozconfigs/linux32/beta
|
|
|
new file mode 100644
|
|
|
--- /dev/null
|
|
@@ -501,6 +738,13 @@ deleted file mode 100644
|
|
|
-
|
|
|
-ac_add_options --enable-application=suite
|
|
|
-ac_add_options --enable-calendar
|
|
|
+diff --git a/suite/config/mozconfigs/macosx64-aarch64/dummy.txt b/suite/config/mozconfigs/macosx64-aarch64/dummy.txt
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/macosx64-aarch64/dummy.txt
|
|
|
+@@ -0,0 +1,1 @@
|
|
|
++this config intentionally left blank
|
|
|
+\ No newline at end of file
|
|
|
diff --git a/suite/config/mozconfigs/macosx64/release b/suite/config/mozconfigs/macosx64/beta
|
|
|
copy from suite/config/mozconfigs/macosx64/release
|
|
|
copy to suite/config/mozconfigs/macosx64/beta
|
|
@@ -927,34 +1171,12 @@ new file mode 100644
|
|
|
+export MOZ_COMM_SOURCE_CHANGESET=2_53_6_final
|
|
|
+export MOZ_COMM_SOURCE_REPO=https://gitlab.com/seamonkey-project/seamonkey-2.53-comm
|
|
|
+export MOZ_INCLUDE_SOURCE_INFO=1
|
|
|
-diff --git a/suite/config/mozconfigs/mozconfig.win.common b/suite/config/mozconfigs/mozconfig.win.builder
|
|
|
-copy from suite/config/mozconfigs/mozconfig.win.common
|
|
|
-copy to suite/config/mozconfigs/mozconfig.win.builder
|
|
|
---- a/suite/config/mozconfigs/mozconfig.win.common
|
|
|
-+++ b/suite/config/mozconfigs/mozconfig.win.builder
|
|
|
-@@ -1,8 +1,14 @@
|
|
|
--# Common statements that are applicable to Windows x86 and x64.
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.common"
|
|
|
-+
|
|
|
-+# Common statements that are applicable to Windows x86 and x64 releases.
|
|
|
-
|
|
|
--ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
|
|
|
--ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
|
|
|
-+export INCLUDE="c:\builds\Outlook 2010 MAPI Headers"
|
|
|
-+
|
|
|
-+ac_add_options --with-google-location-service-api-keyfile=c:/data/google-api.key
|
|
|
-+ac_add_options --with-google-safebrowsing-api-keyfile=c:/data/google-api.key
|
|
|
-
|
|
|
- # SeaMonkey uses the google api key for Geolocation services
|
|
|
- # See Bug 1352850 - Switch to Google for Geolocation services
|
|
|
- # ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
|
|
|
-+
|
|
|
-+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/data/crash-stats-api.token"
|
|
|
diff --git a/suite/config/mozconfigs/mozconfig.win.common b/suite/config/mozconfigs/mozconfig.win.common
|
|
|
+deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/mozconfig.win.common
|
|
|
-+++ b/suite/config/mozconfigs/mozconfig.win.common
|
|
|
-@@ -1,8 +1,1 @@
|
|
|
- # Common statements that are applicable to Windows x86 and x64.
|
|
|
++++ /dev/null
|
|
|
+@@ -1,8 +0,0 @@
|
|
|
+-# Common statements that are applicable to Windows x86 and x64.
|
|
|
-
|
|
|
-ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
|
|
|
-ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
|
|
@@ -962,65 +1184,11 @@ diff --git a/suite/config/mozconfigs/mozconfig.win.common b/suite/config/mozconf
|
|
|
-# SeaMonkey uses the google api key for Geolocation services
|
|
|
-# See Bug 1352850 - Switch to Google for Geolocation services
|
|
|
-# ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
|
|
|
-diff --git a/suite/config/mozconfigs/win32/release b/suite/config/mozconfigs/win32/beta
|
|
|
-copy from suite/config/mozconfigs/win32/release
|
|
|
-copy to suite/config/mozconfigs/win32/beta
|
|
|
---- a/suite/config/mozconfigs/win32/release
|
|
|
-+++ b/suite/config/mozconfigs/win32/beta
|
|
|
-@@ -1,27 +1,6 @@
|
|
|
--. "$topsrcdir/build/mozconfig.win-common"
|
|
|
--. "$topsrcdir/build/mozconfig.common"
|
|
|
--. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
|
|
|
--. "$topsrcdir/build/mozconfig.stylo"
|
|
|
--
|
|
|
--ac_add_options --enable-application=suite
|
|
|
--ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
|
|
--ac_add_options --enable-official-branding
|
|
|
--ac_add_options --enable-jemalloc
|
|
|
--ac_add_options --enable-calendar
|
|
|
--
|
|
|
--# Needed to enable breakpad in application.ini
|
|
|
--export MOZILLA_OFFICIAL=1
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win32/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.release"
|
|
|
-
|
|
|
--# Disable checking that add-ons are signed by the trusted root
|
|
|
--MOZ_ADDON_SIGNING=0
|
|
|
--# Disable enforcing that add-ons are signed by the trusted root
|
|
|
--MOZ_REQUIRE_SIGNING=0
|
|
|
--
|
|
|
--. $topsrcdir/build/win32/mozconfig.vs-latest
|
|
|
--
|
|
|
--# Package js shell
|
|
|
--export MOZ_PACKAGE_JSSHELL=1
|
|
|
--
|
|
|
--# Set up mapi includes (must be done after visual studio setup)
|
|
|
--export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
--mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug-symbols
|
|
|
-+ac_add_options --disable-tests
|
|
|
-diff --git a/suite/config/mozconfigs/win32/common b/suite/config/mozconfigs/win32/common
|
|
|
-new file mode 100644
|
|
|
---- /dev/null
|
|
|
-+++ b/suite/config/mozconfigs/win32/common
|
|
|
-@@ -0,0 +1,12 @@
|
|
|
-+# Common statements that are applicable to Windows x86 releases.
|
|
|
-+CLANG_DIR=`cd "/e/builds/tools/clang/bin" ; pwd`
|
|
|
-+export PATH="${CLANG_DIR}:${PATH}"
|
|
|
-+
|
|
|
-+export CC="clang-cl $FLAGS"
|
|
|
-+export CXX="clang-cl $FLAGS"
|
|
|
-+export LINKER="lld-link.exe"
|
|
|
-+
|
|
|
-+ac_add_options --target=i686-pc-mingw32
|
|
|
-+
|
|
|
-+export WIN32_REDIST_DIR=/c/builds/vs2019runtime/vc/redist/x86/Microsoft.VC142.CRT
|
|
|
-+export WIN_UCRT_REDIST_DIR=/c/builds/vs2019runtime/ucrt/DLLs/x86
|
|
|
diff --git a/suite/config/mozconfigs/win32/debug b/suite/config/mozconfigs/win32/debug
|
|
|
+deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win32/debug
|
|
|
-+++ b/suite/config/mozconfigs/win32/debug
|
|
|
-@@ -1,24 +1,5 @@
|
|
|
++++ /dev/null
|
|
|
+@@ -1,24 +0,0 @@
|
|
|
-. "$topsrcdir/build/mozconfig.win-common"
|
|
|
-. "$topsrcdir/build/mozconfig.common"
|
|
|
-. "$topsrcdir/build/mozconfig.stylo"
|
|
@@ -1031,10 +1199,7 @@ diff --git a/suite/config/mozconfigs/win32/debug b/suite/config/mozconfigs/win32
|
|
|
-
|
|
|
-# Needed to enable breakpad in application.ini
|
|
|
-export MOZILLA_OFFICIAL=1
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win32/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.release"
|
|
|
-
|
|
|
+-
|
|
|
-# Disable checking that add-ons are signed by the trusted root
|
|
|
-MOZ_ADDON_SIGNING=0
|
|
|
-# Disable enforcing that add-ons are signed by the trusted root
|
|
@@ -1048,7 +1213,6 @@ diff --git a/suite/config/mozconfigs/win32/debug b/suite/config/mozconfigs/win32
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug
|
|
|
diff --git a/suite/config/mozconfigs/win32/l10n-mozconfig b/suite/config/mozconfigs/win32/l10n-mozconfig
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
|
|
@@ -1078,6 +1242,85 @@ deleted file mode 100644
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
+diff --git a/suite/config/mozconfigs/win32/make-beta-x86.sh b/suite/config/mozconfigs/win32/make-beta-x86.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win32/make-beta-x86.sh
|
|
|
+@@ -0,0 +1,20 @@
|
|
|
++export SOURCEDIR="/e/builds/beta-253/comm-release"
|
|
|
++export MOZ_OBJDIR=e:/builds/obj/TODOOO/obj-i686-pc-mingw32
|
|
|
++export PACKAGE=$(<$SOURCEDIR/comm/suite/config/version_package.txt)
|
|
|
++export L10NSHIPPED=$SOURCEDIR/comm/suite/locales/shipped-locales
|
|
|
++export SIGNPSWD=$(</e/builds/data/sign.pass)
|
|
|
++export SIGNKEY="e:\builds\data\seamonkey_code_signing.pfx"
|
|
|
++export ARCH=win32
|
|
|
++export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64:/e/builds/beta-253"
|
|
|
++export GECKO_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++export COMM_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++
|
|
|
++export MACH_USE_SYSTEM_PYTHON=1
|
|
|
++
|
|
|
++rustup default 1.73.0-x86_64-pc-windows-msvc
|
|
|
++# rustup default stable-x86_64-pc-windows-msvc
|
|
|
++rustup target add i686-pc-windows-msvc
|
|
|
++
|
|
|
++cp -p -f /e/builds/beta-253/mozconfigs/mozconfig-beta.x86cl $SOURCEDIR/.mozconfig
|
|
|
++
|
|
|
++./make-release.sh
|
|
|
+diff --git a/suite/config/mozconfigs/win32/make-release-x86.sh b/suite/config/mozconfigs/win32/make-release-x86.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win32/make-release-x86.sh
|
|
|
+@@ -0,0 +1,20 @@
|
|
|
++export SOURCEDIR="/e/builds/rel-253/comm-release"
|
|
|
++export MOZ_OBJDIR=e:/builds/obj/TODOOO/obj-i686-pc-mingw32
|
|
|
++export PACKAGE=$(<$SOURCEDIR/comm/suite/config/version_package.txt)
|
|
|
++export L10NSHIPPED=$SOURCEDIR/comm/suite/locales/shipped-locales
|
|
|
++export SIGNPSWD=$(</e/builds/data/sign.pass)
|
|
|
++export SIGNKEY="e:\builds\data\seamonkey_code_signing.pfx"
|
|
|
++export ARCH=win32
|
|
|
++export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64:/e/builds/rel-253"
|
|
|
++export GECKO_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++export COMM_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++
|
|
|
++export MACH_USE_SYSTEM_PYTHON=1
|
|
|
++
|
|
|
++rustup default 1.73.0-x86_64-pc-windows-msvc
|
|
|
++# rustup default stable-x86_64-pc-windows-msvc
|
|
|
++rustup target add i686-pc-windows-msvc
|
|
|
++
|
|
|
++cp -p -f /e/builds/rel-253/mozconfigs/mozconfig-release.x86cl $SOURCEDIR/.mozconfig
|
|
|
++
|
|
|
++./make-release.sh
|
|
|
+diff --git a/suite/config/mozconfigs/win32/mozconfig-beta.x86cl b/suite/config/mozconfigs/win32/mozconfig-beta.x86cl
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win32/mozconfig-beta.x86cl
|
|
|
+@@ -0,0 +1,9 @@
|
|
|
++ac_add_options --with-l10n-base=e:/builds/beta-253/l10n-release
|
|
|
++
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-common
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-common-beta
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.clang-all-compile
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-compile
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-beta
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-x86-redist
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-x86-common
|
|
|
+diff --git a/suite/config/mozconfigs/win32/mozconfig-release.x86cl b/suite/config/mozconfigs/win32/mozconfig-release.x86cl
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win32/mozconfig-release.x86cl
|
|
|
+@@ -0,0 +1,10 @@
|
|
|
++ac_add_options --with-l10n-base=e:/builds/rel-253/l10n-release
|
|
|
++
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-common
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-common-release
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.clang-all-compile
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-compile
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-release
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-x86-redist
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-x86-common
|
|
|
++
|
|
|
diff --git a/suite/config/mozconfigs/win32/nightly b/suite/config/mozconfigs/win32/nightly
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win32/nightly
|
|
@@ -1111,9 +1354,10 @@ deleted file mode 100644
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
diff --git a/suite/config/mozconfigs/win32/release b/suite/config/mozconfigs/win32/release
|
|
|
+deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win32/release
|
|
|
-+++ b/suite/config/mozconfigs/win32/release
|
|
|
-@@ -1,27 +1,6 @@
|
|
|
++++ /dev/null
|
|
|
+@@ -1,27 +0,0 @@
|
|
|
-. "$topsrcdir/build/mozconfig.win-common"
|
|
|
-. "$topsrcdir/build/mozconfig.common"
|
|
|
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
|
|
@@ -1127,10 +1371,7 @@ diff --git a/suite/config/mozconfigs/win32/release b/suite/config/mozconfigs/win
|
|
|
-
|
|
|
-# Needed to enable breakpad in application.ini
|
|
|
-export MOZILLA_OFFICIAL=1
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win32/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.release"
|
|
|
-
|
|
|
+-
|
|
|
-# Disable checking that add-ons are signed by the trusted root
|
|
|
-MOZ_ADDON_SIGNING=0
|
|
|
-# Disable enforcing that add-ons are signed by the trusted root
|
|
@@ -1144,8 +1385,6 @@ diff --git a/suite/config/mozconfigs/win32/release b/suite/config/mozconfigs/win
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug-symbols
|
|
|
-+ac_add_options --disable-tests
|
|
|
diff --git a/suite/config/mozconfigs/win32/release-l10n b/suite/config/mozconfigs/win32/release-l10n
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win32/release-l10n
|
|
@@ -1175,64 +1414,18 @@ deleted file mode 100644
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
-diff --git a/suite/config/mozconfigs/win64/release b/suite/config/mozconfigs/win64/beta
|
|
|
-copy from suite/config/mozconfigs/win64/release
|
|
|
-copy to suite/config/mozconfigs/win64/beta
|
|
|
---- a/suite/config/mozconfigs/win64/release
|
|
|
-+++ b/suite/config/mozconfigs/win64/beta
|
|
|
-@@ -1,30 +1,6 @@
|
|
|
--. "$topsrcdir/build/mozconfig.win-common"
|
|
|
--. "$topsrcdir/build/mozconfig.common"
|
|
|
--. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
|
|
|
--. "$topsrcdir/build/mozconfig.stylo"
|
|
|
--
|
|
|
--ac_add_options --target=x86_64-pc-mingw32
|
|
|
--ac_add_options --host=x86_64-pc-mingw32
|
|
|
--
|
|
|
--ac_add_options --enable-application=suite
|
|
|
--ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
|
|
--ac_add_options --enable-official-branding
|
|
|
--ac_add_options --enable-jemalloc
|
|
|
--ac_add_options --enable-calendar
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win64/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.beta"
|
|
|
-
|
|
|
--# Needed to enable breakpad in application.ini
|
|
|
--export MOZILLA_OFFICIAL=1
|
|
|
--
|
|
|
--# Disable checking that add-ons are signed by the trusted root
|
|
|
--MOZ_ADDON_SIGNING=0
|
|
|
--# Disable enforcing that add-ons are signed by the trusted root
|
|
|
--MOZ_REQUIRE_SIGNING=0
|
|
|
--
|
|
|
--. $topsrcdir/build/win32/mozconfig.vs-latest
|
|
|
--
|
|
|
--# Package js shell
|
|
|
--export MOZ_PACKAGE_JSSHELL=1
|
|
|
--
|
|
|
--# Set up mapi includes (must be done after visual studio setup)
|
|
|
--export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
--mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug-symbols
|
|
|
-+ac_add_options --disable-tests
|
|
|
-diff --git a/suite/config/mozconfigs/win64/common b/suite/config/mozconfigs/win64/common
|
|
|
+diff --git a/suite/config/mozconfigs/win64-aarch64/dummy.txt b/suite/config/mozconfigs/win64-aarch64/dummy.txt
|
|
|
new file mode 100644
|
|
|
--- /dev/null
|
|
|
-+++ b/suite/config/mozconfigs/win64/common
|
|
|
-@@ -0,0 +1,8 @@
|
|
|
-+# Common statements that are applicable to Windows x64 releases.
|
|
|
-+ac_add_options --with-visual-studio-version=2019
|
|
|
-+
|
|
|
-+ac_add_options --target=x86_64-pc-mingw32
|
|
|
-+ac_add_options --host=x86_64-pc-mingw32
|
|
|
-+
|
|
|
-+export WIN32_REDIST_DIR=/c/builds/vs2019runtime/vc/redist/x64/Microsoft.VC142.CRT
|
|
|
-+export WIN_UCRT_REDIST_DIR=/c/builds/vs2019runtime/ucrt/DLLs/x64
|
|
|
++++ b/suite/config/mozconfigs/win64-aarch64/dummy.txt
|
|
|
+@@ -0,0 +1,1 @@
|
|
|
++this config intentionally left blank
|
|
|
+\ No newline at end of file
|
|
|
diff --git a/suite/config/mozconfigs/win64/debug b/suite/config/mozconfigs/win64/debug
|
|
|
+deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win64/debug
|
|
|
-+++ b/suite/config/mozconfigs/win64/debug
|
|
|
-@@ -1,27 +1,5 @@
|
|
|
++++ /dev/null
|
|
|
+@@ -1,27 +0,0 @@
|
|
|
-. "$topsrcdir/build/mozconfig.win-common"
|
|
|
-. "$topsrcdir/build/mozconfig.common"
|
|
|
-. "$topsrcdir/build/mozconfig.stylo"
|
|
@@ -1246,10 +1439,7 @@ diff --git a/suite/config/mozconfigs/win64/debug b/suite/config/mozconfigs/win64
|
|
|
-
|
|
|
-# Needed to enable breakpad in application.ini
|
|
|
-export MOZILLA_OFFICIAL=1
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win64/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.release"
|
|
|
-
|
|
|
+-
|
|
|
-# Disable checking that add-ons are signed by the trusted root
|
|
|
-MOZ_ADDON_SIGNING=0
|
|
|
-# Disable enforcing that add-ons are signed by the trusted root
|
|
@@ -1263,7 +1453,6 @@ diff --git a/suite/config/mozconfigs/win64/debug b/suite/config/mozconfigs/win64
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug
|
|
|
diff --git a/suite/config/mozconfigs/win64/l10n-mozconfig b/suite/config/mozconfigs/win64/l10n-mozconfig
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win64/l10n-mozconfig
|
|
@@ -1296,6 +1485,82 @@ deleted file mode 100644
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
+diff --git a/suite/config/mozconfigs/win64/make-beta-x64.sh b/suite/config/mozconfigs/win64/make-beta-x64.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win64/make-beta-x64.sh
|
|
|
+@@ -0,0 +1,19 @@
|
|
|
++export SOURCEDIR="/e/builds/beta-253/comm-release"
|
|
|
++export MOZ_OBJDIR=e:/builds/obj/TODOOOO/obj-x86_64-pc-mingw32
|
|
|
++export PACKAGE=$(<$SOURCEDIR/comm/suite/config/version_package.txt)
|
|
|
++export L10NSHIPPED=$SOURCEDIR/comm/suite/locales/shipped-locales
|
|
|
++export SIGNPSWD=$(</e/builds/data/sign.pass)
|
|
|
++export SIGNKEY="e:\builds\data\seamonkey_code_signing.pfx"
|
|
|
++export ARCH=win64
|
|
|
++export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64:/e/builds/beta-253"
|
|
|
++export GECKO_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++export COMM_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++
|
|
|
++export MACH_USE_SYSTEM_PYTHON=1
|
|
|
++
|
|
|
++rustup default 1.73.0-x86_64-pc-windows-msvc
|
|
|
++# rustup default stable-x86_64-pc-windows-msvc
|
|
|
++
|
|
|
++cp -p -f /e/builds/beta-253/mozconfigs/mozconfig-beta.x6419 $SOURCEDIR/.mozconfig
|
|
|
++
|
|
|
++./make-release.sh
|
|
|
+diff --git a/suite/config/mozconfigs/win64/make-release-x64.sh b/suite/config/mozconfigs/win64/make-release-x64.sh
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win64/make-release-x64.sh
|
|
|
+@@ -0,0 +1,19 @@
|
|
|
++export SOURCEDIR="/e/builds/rel-253/comm-release"
|
|
|
++export MOZ_OBJDIR=e:/builds/obj/TODOOOO/obj-x86_64-pc-mingw32
|
|
|
++export PACKAGE=$(<$SOURCEDIR/comm/suite/config/version_package.txt)
|
|
|
++export L10NSHIPPED=$SOURCEDIR/comm/suite/locales/shipped-locales
|
|
|
++export SIGNPSWD=$(</e/builds/data/sign.pass)
|
|
|
++export SIGNKEY="e:\builds\data\seamonkey_code_signing.pfx"
|
|
|
++export ARCH=win64
|
|
|
++export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64:/e/builds/rel-253"
|
|
|
++export GECKO_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++export COMM_HEAD_REV=$(<$SOURCEDIR/comm/suite/config/version_source.txt)
|
|
|
++
|
|
|
++export MACH_USE_SYSTEM_PYTHON=1
|
|
|
++
|
|
|
++rustup default 1.73.0-x86_64-pc-windows-msvc
|
|
|
++# rustup default stable-x86_64-pc-windows-msvc
|
|
|
++
|
|
|
++cp -p -f /e/builds/rel-253/mozconfigs/mozconfig-release.x6419 $SOURCEDIR/.mozconfig
|
|
|
++
|
|
|
++./make-release.sh
|
|
|
+diff --git a/suite/config/mozconfigs/win64/mozconfig-beta.x6419 b/suite/config/mozconfigs/win64/mozconfig-beta.x6419
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win64/mozconfig-beta.x6419
|
|
|
+@@ -0,0 +1,9 @@
|
|
|
++ac_add_options --with-l10n-base=e:/builds/beta-253/l10n-release
|
|
|
++
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-common
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-common-beta
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.vs2019-all-compile
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-compile
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-all-beta
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-x64-redist
|
|
|
++. /e/builds/beta-253/mozconfigs/mozconfig.build-x64-common
|
|
|
+diff --git a/suite/config/mozconfigs/win64/mozconfig-release.x6419 b/suite/config/mozconfigs/win64/mozconfig-release.x6419
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/suite/config/mozconfigs/win64/mozconfig-release.x6419
|
|
|
+@@ -0,0 +1,9 @@
|
|
|
++ac_add_options --with-l10n-base=e:/builds/rel-253/l10n-release
|
|
|
++
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-common
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-common-release
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.vs2019-all-compile
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-compile
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-all-release
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-x64-redist
|
|
|
++. /e/builds/rel-253/mozconfigs/mozconfig.build-x64-common
|
|
|
diff --git a/suite/config/mozconfigs/win64/nightly b/suite/config/mozconfigs/win64/nightly
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win64/nightly
|
|
@@ -1332,9 +1597,10 @@ deleted file mode 100644
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
diff --git a/suite/config/mozconfigs/win64/release b/suite/config/mozconfigs/win64/release
|
|
|
+deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win64/release
|
|
|
-+++ b/suite/config/mozconfigs/win64/release
|
|
|
-@@ -1,30 +1,6 @@
|
|
|
++++ /dev/null
|
|
|
+@@ -1,30 +0,0 @@
|
|
|
-. "$topsrcdir/build/mozconfig.win-common"
|
|
|
-. "$topsrcdir/build/mozconfig.common"
|
|
|
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
|
|
@@ -1348,10 +1614,7 @@ diff --git a/suite/config/mozconfigs/win64/release b/suite/config/mozconfigs/win
|
|
|
-ac_add_options --enable-official-branding
|
|
|
-ac_add_options --enable-jemalloc
|
|
|
-ac_add_options --enable-calendar
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.win.builder"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/win64/common"
|
|
|
-+. "$commtopsrcdir/suite/config/mozconfigs/mozconfig.release"
|
|
|
-
|
|
|
+-
|
|
|
-# Needed to enable breakpad in application.ini
|
|
|
-export MOZILLA_OFFICIAL=1
|
|
|
-
|
|
@@ -1368,8 +1631,6 @@ diff --git a/suite/config/mozconfigs/win64/release b/suite/config/mozconfigs/win
|
|
|
-# Set up mapi includes (must be done after visual studio setup)
|
|
|
-export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
|
|
|
-mk_export_correct_style INCLUDE
|
|
|
-+ac_add_options --enable-debug-symbols
|
|
|
-+ac_add_options --disable-tests
|
|
|
diff --git a/suite/config/mozconfigs/win64/release-l10 b/suite/config/mozconfigs/win64/release-l10
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/config/mozconfigs/win64/release-l10
|