Changeset 6eb02a5 in sasview for installers

Timestamp:

Jan 15, 2018 6:11:57 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e110cb0

Parents:

a40e913 (diff), a0f4768 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (01/15/18 18:11:57)

git-committer:

GitHub <noreply@…> (01/15/18 18:11:57)

Message:

Merge pull request #133 from SasView?/ticket-993

ticket 993
closes #993

Location:

installers

Files:

• installer_generator.py (modified) (3 diffs)
• sasview.spec (modified) (1 prop)
• version.txt (modified) (1 prop)

installers/installer_generator.py

@@ -9 +9 @@
 import sys
 import string
+
+is_64bit = sys.maxsize > 2**32
 
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -25 +27 @@
 AppSupportURL = local_config._homepage
 AppUpdatesURL = local_config._homepage
+ArchitecturesInstallIn64BitMode = 'x64'
 ChangesEnvironment = 'true'
 DefaultDirName = os.path.join("{pf}" , AppName+Dev)
@@ -343 +346 @@
     TEMPLATE += "AppSupportURL=%s\n" % str(AppSupportURL)
     TEMPLATE += "AppUpdatesURL=%s \n" % str(AppUpdatesURL)
+    if is_64bit:
+        TEMPLATE += "ArchitecturesInstallIn64BitMode=%s \n" % str(ArchitecturesInstallIn64BitMode)
     TEMPLATE += "ChangesEnvironment=%s \n" % str(ChangesEnvironment)
     TEMPLATE += "DefaultDirName=%s\n" % str(DefaultDirName)