Changeset a91bc5d in sasview


Ignore:
Timestamp:
Sep 25, 2014 9:10:47 PM (10 years ago)
Author:
pkienzle
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:
38a8c4c
Parents:
3241dd2
Message:

partial revert of windows build changes

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build_tools/jenkins_win32_build.bat

    r0571738 ra91bc5d  
    1616RD /S /Q build 
    1717 
    18 %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1 
    19 %PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0 
    20 %PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
    21 %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 
     18rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1 
     19rem %PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0 
     20rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
     21rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 
    2222 
    2323%PYTHON% setup.py build -cmingw32 
  • sansview/setup_exe.py

    r72cdbec ra91bc5d  
    2222from distutils.util import get_platform 
    2323root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
    24 sys.path.insert(0, os.path.abspath(os.path.join(root, 'sasview-install'))) 
    2524platform = '%s-%s'%(get_platform(),sys.version[:3]) 
    2625build_path = os.path.join(root, 'build','lib.'+platform) 
Note: See TracChangeset for help on using the changeset viewer.