Changes in / [c95a1a5:44d20af] in sasview

Files:

• build_tools/dmgpack.sh (deleted)
• build_tools/jenkins_osx_build.sh (modified) (1 diff)
• sasview.latestversion (modified) (1 diff)
• sasview/README.txt (modified) (1 diff)
• sasview/__init__.py (modified) (1 diff)
• sasview/setup_mac.py (modified) (3 diffs)

build_tools/jenkins_osx_build.sh

@@ -47 +47 @@
 
 cd $WORKSPACE/sasview/dist
-tar -czf `python -c "import pkg_resources;print '%s.tar.gz' % pkg_resources.get_distribution('sasview').egg_name()"` `python -c "import sasview; print 'SasView-%s.app' % sasview.__version__"`
+tar -czf `python -c "import pkg_resources;print '%s.tar.gz' % pkg_resources.get_distribution('sasview').egg_name()"` sasview.app

sasview.latestversion

@@ -1 @@
-3.1.1
+3.1.0

sasview/README.txt

@@ -4 +4 @@
 1- Features
 ===========
-
-   - New in Version 3.1.1
-     --------------------
-     - Fixes bug #457 that prevented SasView from starting if the user was not
-       connected to the internet, or was behind a proxy server.
 
    - New in Version 3.1.0

sasview/__init__.py

@@ -1 @@
-__version__ = "3.1.1"
+__version__ = "3.1.0"
 __build__ = "1"

sasview/setup_mac.py

@@ -116 +116 @@
                                    CFBundleTypeRole="Shell" )],)
 
-#Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ)
-import __init__ as sasviewver
-
-VERSION = sasviewver.__version__
-APPNAME = "SasView "+VERSION
-DMGNAME = "SasView-"+VERSION
-
 APP = ['sasview.py']
 DATA_FILES += ['images','test','media']
@@ -140 +133 @@
            }
 setup(
-    name=APPNAME,
+    name="sasview",
     app=APP,
     data_files=DATA_FILES,
@@ -147 +140 @@
     setup_requires=['py2app'],
 )
-
-#Build dmg
-DMG="dist/%s.dmg"%DMGNAME
-if os.path.exists(DMG): os.unlink(DMG)
-os.system('cd dist && ../../build_tools/dmgpack.sh "%s" "%s.app"'%(DMGNAME,APPNAME))
-os.system('chmod a+r "%s"'%DMG)
-