Changeset 801a296 in sasview

Timestamp:

Aug 11, 2016 3:51:21 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

deddda1

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (08/11/16 03:50:57)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (08/11/16 03:51:21)

Message:

Don't flash the cmd window at start

Files:

• build_tools/jenkins_win_build.bat (modified) (1 diff)
• sasview/__init__.py (modified) (1 diff)

build_tools/jenkins_win_build.bat

@@ -16 +16 @@
 
 :: SET SASVIEW GITHASH ################################################
-:: cd %WORKSPACE%
-:: cd sasview\sasview
-:: git rev-parse HEAD > tmpFile_githash
-:: SET /p githash= < tmpFile_githash
-:: DEL tmpFile_githash
-:: %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py
+cd %WORKSPACE%
+cd sasview\sasview
+git rev-parse HEAD > tmpFile_githash
+SET /p githash= < tmpFile_githash
+DEL tmpFile_githash
+%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py
 
 

sasview/__init__.py

@@ -3 +3 @@
 try:
     import subprocess
-    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+    import os
+    FNULL = open(os.devnull, 'w')
+    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                    stderr=FNULL,
+                    shell=True)
     __build__ = str(git_revision).strip()
 except: