diff --git a/Makefile b/Makefile index 15fccd39..9c2dca75 100644 --- a/Makefile +++ b/Makefile @@ -104,6 +104,63 @@ win: mv ../web2py_win/web2py/_ssl.pyd ../web2py_win/web2py/_ssl.pyd.legacy | echo 'done' cd ../web2py_win; zip -r web2py_win.zip web2py mv ../web2py_win/web2py_win.zip . +binaries: + echo '' > NEWINSTALL + cp VERSION ../web2py_win_py27/web2py/ + cp README.markdown ../web2py_win_py27/web2py/ + cp NEWINSTALL ../web2py_win_py27/web2py/ + cp LICENSE ../web2py_win_py27/web2py/ + cp CHANGELOG ../web2py_win_py27/web2py/ + rm -rf ../web2py_win_py27/web2py/gluon + cp -r gluon ../web2py_win_py27/web2py/gluon + rm -rf ../web2py_win_py27/web2py/applications/* + cp -r applications/__init__.py ../web2py_win_py27/web2py/applications/ + cp -r applications/admin ../web2py_win_py27/web2py/applications/ + cp -r applications/welcome ../web2py_win_py27/web2py/applications/ + cp -r applications/examples ../web2py_win_py27/web2py/applications/ + cd ../web2py_win_py27; zip -r web2py_win_py27.zip web2py + + cp VERSION ../web2py_win_py37/web2py/ + cp README.markdown ../web2py_win_py37/web2py/ + cp NEWINSTALL ../web2py_win_py37/web2py/ + cp LICENSE ../web2py_win_py37/web2py/ + cp CHANGELOG ../web2py_win_py37/web2py/ + rm -rf ../web2py_win_py37/web2py/gluon + cp -r gluon ../web2py_win_py37/web2py/gluon + rm -rf ../web2py_win_py37/web2py/applications/* + cp -r applications/__init__.py ../web2py_win_py37/web2py/applications/ + cp -r applications/admin ../web2py_win_py37/web2py/applications/ + cp -r applications/welcome ../web2py_win_py37/web2py/applications/ + cp -r applications/examples ../web2py_win_py37/web2py/applications/ + cd ../web2py_win_py37; zip -r web2py_win_py37.zip web2py + + cp VERSION ../web2py_osx_py27/web2py.app/Contents/MacOS/ + cp README.markdown ../web2py_osx_py27/web2py.app/Contents/MacOS/ + cp NEWINSTALL ../web2py_osx_py27/web2py.app/Contents/MacOS/ + cp LICENSE ../web2py_osx_py27/web2py.app/Contents/MacOS/ + cp CHANGELOG ../web2py_osx_py27/web2py.app/Contents/MacOS/ + rm -rf ../web2py_osx_py27/web2py.app/Contents/MacOS/gluon + cp -r gluon ../web2py_osx_py27/web2py.app/Contents/MacOS/gluon + rm -rf ../web2py_osx_py27/web2py.app/Contents/MacOS/applications/* + cp -r applications/__init__.py ../web2py_osx_py27/web2py.app/Contents/MacOS/applications/ + cp -r applications/admin ../web2py_osx_py27/web2py.app/Contents/MacOS/applications/ + cp -r applications/welcome ../web2py_osx_py27/web2py.app/Contents/MacOS/applications/ + cp -r applications/examples ../web2py_osx_py27/web2py.app/Contents/MacOS/applications/ + cd ../web2py_osx_py27; zip -r web2py_osx_py27.zip web2py.app + + cp VERSION ../web2py_osx_py37/web2py.app/Contents/MacOS/ + cp README.markdown ../web2py_osx_py37/web2py.app/Contents/MacOS/ + cp NEWINSTALL ../web2py_osx_py37/web2py.app/Contents/MacOS/ + cp LICENSE ../web2py_osx_py37/web2py.app/Contents/MacOS/ + cp CHANGELOG ../web2py_osx_py37/web2py.app/Contents/MacOS/ + rm -rf ../web2py_osx_py37/web2py.app/Contents/MacOS/gluon + cp -r gluon ../web2py_osx_py37/web2py.app/Contents/MacOS/gluon + rm -rf ../web2py_osx_py37/web2py.app/Contents/MacOS/applications/* + cp -r applications/__init__.py ../web2py_osx_py37/web2py.app/Contents/MacOS/applications/ + cp -r applications/admin ../web2py_osx_py37/web2py.app/Contents/MacOS/applications/ + cp -r applications/welcome ../web2py_osx_py37/web2py.app/Contents/MacOS/applications/ + cp -r applications/examples ../web2py_osx_py37/web2py.app/Contents/MacOS/applications/ + cd ../web2py_osx_py37; zip -r web2py_osx_py37.zip web2py.app run: python2.7 web2py.py -a hello commit: diff --git a/gluon/packages/dal b/gluon/packages/dal index c1c8621b..975a909f 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit c1c8621bcb9acb33b3c997d3a44c8c837c3dcf75 +Subproject commit 975a909f114a2710e807b5fb0ce4f2ff0c94bf90 diff --git a/gluon/packages/yatl b/gluon/packages/yatl index 5deb403a..10682bfc 160000 --- a/gluon/packages/yatl +++ b/gluon/packages/yatl @@ -1 +1 @@ -Subproject commit 5deb403a9e45f617588f02cd8f7682b3f98571b4 +Subproject commit 10682bfc7c7859754305245c8dee9748fec666e4