From: daid303 Date: Mon, 1 Oct 2012 09:46:33 +0000 (+0200) Subject: Update version number to reflect the current month X-Git-Tag: 13.03~314 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=798ca343621a8eeb6fc30f74e8890fc112fabdac;p=cura.git Update version number to reflect the current month --- 798ca343621a8eeb6fc30f74e8890fc112fabdac diff --cc package.sh index 391e5108,2b8c5623..369de450 --- a/package.sh +++ b/package.sh @@@ -84,15 -70,35 +84,16 @@@ f if [ $BUILD_TARGET = "win32" ]; then #Get portable python for windows and extract it. (Linux and Mac need to install python themselfs) - if [ ! -f "PortablePython_${WIN_PORTABLE_PY_VERSION}.exe" ]; then - curl -L -O http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_${WIN_PORTABLE_PY_VERSION}.exe - fi - if [ ! -f pyserial-${WIN_PYSERIAL_VERSION}.exe ]; then - curl -L -O http://sourceforge.net/projects/pyserial/files/pyserial/${WIN_PYSERIAL_VERSION}/pyserial-${WIN_PYSERIAL_VERSION}.win32.exe/download - mv download pyserial-${WIN_PYSERIAL_VERSION}.exe - fi - if [ ! -f PyOpenGL-3.0.1.win32.exe ]; then - curl -L -O http://sourceforge.net/projects/pyopengl/files/PyOpenGL/3.0.1/PyOpenGL-3.0.1.win32.exe - fi - if [ ! -f numpy-1.6.2-win32-superpack-python2.7.exe ]; then - curl -L -O http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe - fi - if [ ! -f VideoCapture-0.9-5.zip ]; then - curl -L -O http://videocapture.sourceforge.net/VideoCapture-0.9-5.zip - fi - if [ ! -f ffmpeg-20120927-git-13f0cd6-win32-static.7z ]; then - curl -L -O http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z - fi + downloadURL http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_${WIN_PORTABLE_PY_VERSION}.exe + downloadURL http://sourceforge.net/projects/pyserial/files/pyserial/${WIN_PYSERIAL_VERSION}/pyserial-${WIN_PYSERIAL_VERSION}.win32.exe + downloadURL http://sourceforge.net/projects/pyopengl/files/PyOpenGL/3.0.1/PyOpenGL-3.0.1.win32.exe + downloadURL http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe + downloadURL http://videocapture.sourceforge.net/VideoCapture-0.9-5.zip ++ downloadURL http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z #Get pypy - if [ ! -f "pypy-${PYPY_VERSION}-win32.zip" ]; then - curl -L -O https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip - # curl -L -O http://buildbot.pypy.org/nightly/trunk/pypy-${PYPY_VERSION}-win32.zip - fi + downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip else - if [ ! -f "pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2" ]; then - curl -L -O https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 - # curl -L -O http://buildbot.pypy.org/nightly/trunk/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 - fi + downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 fi #Get our own version of Printrun