From bc202cbcf8014c9fc61f100d16a6290160a88afe Mon Sep 17 00:00:00 2001 From: Andrew Jackson Date: Sun, 26 Jul 2015 22:41:01 +0200 Subject: [PATCH 1/3] Fixing build script --- build_tools/jenkins_osx_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/jenkins_osx_build.sh b/build_tools/jenkins_osx_build.sh index 0c8995a81c..d4e44e22da 100755 --- a/build_tools/jenkins_osx_build.sh +++ b/build_tools/jenkins_osx_build.sh @@ -46,4 +46,4 @@ cd $WORKSPACE/sasview python setup_mac.py py2app 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 SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version"` From 0aa3a1bd961bad44a2feaf62b1544999f8259ee4 Mon Sep 17 00:00:00 2001 From: Andrew Jackson Date: Sun, 26 Jul 2015 22:56:42 +0200 Subject: [PATCH 2/3] Fixing build script --- build_tools/jenkins_osx_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/jenkins_osx_build.sh b/build_tools/jenkins_osx_build.sh index d4e44e22da..c4895bd0e6 100755 --- a/build_tools/jenkins_osx_build.sh +++ b/build_tools/jenkins_osx_build.sh @@ -46,4 +46,4 @@ cd $WORKSPACE/sasview python setup_mac.py py2app cd $WORKSPACE/sasview/dist -tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version"` +tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version)"` From e9e3e38b882d3d5b555083662d2209607426c67f Mon Sep 17 00:00:00 2001 From: Andrew Jackson Date: Sun, 26 Jul 2015 23:10:19 +0200 Subject: [PATCH 3/3] Giving up with tar.gz and disabling. Only egg and DMG output now. --- build_tools/jenkins_osx_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/jenkins_osx_build.sh b/build_tools/jenkins_osx_build.sh index c4895bd0e6..9579dc8772 100755 --- a/build_tools/jenkins_osx_build.sh +++ b/build_tools/jenkins_osx_build.sh @@ -45,5 +45,5 @@ python setup.py bdist_egg --skip-build cd $WORKSPACE/sasview python setup_mac.py py2app -cd $WORKSPACE/sasview/dist -tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version)"` +#cd $WORKSPACE/sasview/dist +#tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version)"`