Bug 1030016 - Port |Bug 598615 - HAVE_64BIT_OS changed to HAVE_64BIT_BUILD| to SeaMonkey. r=jcranmer on a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 30 Jun 2014 10:23:48 +0800
changeset 20410 34de533112268eafdb3d107c80cf02fd989d7b75
parent 20409 cb73a677170449d6dc7686756645ae1a2eb74f44
child 20411 ca6ee1b01aeed23fabad78dec7558f660fe51185
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1030016, 598615
Bug 1030016 - Port |Bug 598615 - HAVE_64BIT_OS changed to HAVE_64BIT_BUILD| to SeaMonkey. r=jcranmer on a CLOSED TREE
suite/configure.in
suite/installer/windows/nsis/defines.nsi.in
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/nsis/uninstaller.nsi
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -118,17 +118,17 @@ if test -n "$COMPILE_ENVIRONMENT" -a -n 
                 mkdir "ldap/sdks"
             fi
             mkdir "ldap/sdks/c-sdk"
         fi
         mkdir "ldap/sdks/c-sdk/ldap"
     fi
 
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
-    if test -n "$HAVE_64BIT_OS"; then
+    if test -n "$HAVE_64BIT_BUILD"; then
         dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$LIBXUL_SDK"; then
         ac_configure_args="$ac_configure_args --with-nspr=$LIBXUL_DIST"
     fi
 
     dnl The cache file needs to be an absolute path to work properly.
--- a/suite/installer/windows/nsis/defines.nsi.in
+++ b/suite/installer/windows/nsis/defines.nsi.in
@@ -16,18 +16,18 @@
 !define DDEApplication        "SeaMonkey"
 
 !define AppRegName            "SeaMonkey"
 !define AppRegNameMail        "SeaMonkey (Mail)"
 !define AppRegNameNews        "SeaMonkey (News)"
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
-#ifdef HAVE_64BIT_OS
-!define HAVE_64BIT_OS
+#ifdef HAVE_64BIT_BUILD
+!define HAVE_64BIT_BUILD
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows Vista x64"
 #else
 !define ARCH "x86"
 !define MinSupportedVer "Microsoft Windows XP SP2"
 #endif
 
 # File details shared by both the installer and uninstaller
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -98,17 +98,17 @@ VIAddVersionKey "OriginalFilename" "setu
 !insertmacro InstallStartCleanupCommon
 !insertmacro LeaveDirectoryCommon
 !insertmacro LeaveOptionsCommon
 !insertmacro OnEndCommon
 !insertmacro PreDirectoryCommon
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 !else
   InstallDir "$PROGRAMFILES32\${BrandFullName}\"
 !endif
 ShowInstDetails nevershow
 
 ################################################################################
 # Modern User Interface - MUI
--- a/suite/installer/windows/nsis/uninstaller.nsi
+++ b/suite/installer/windows/nsis/uninstaller.nsi
@@ -110,17 +110,17 @@ VIAddVersionKey "OriginalFilename" "help
 !insertmacro OnEndCommon
 !insertmacro UninstallOnInitCommon
 
 !insertmacro un.OnEndCommon
 !insertmacro un.UninstallUnOnInitCommon
 
 Name "${BrandFullName}"
 OutFile "helper.exe"
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 !else
   InstallDir "$PROGRAMFILES32\${BrandFullName}\"
 !endif
 ShowUnInstDetails nevershow
 
 ################################################################################
 # Modern User Interface - MUI