From 3762a45974dcca8e72f9c4954604ac54c2515d7e Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 19 Mar 2014 12:30:25 -0500 Subject: [PATCH] more cleanup logic in web2py build --- Makefile | 8 +++++--- VERSION | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8a42949f..a16cbc3b 100644 --- a/Makefile +++ b/Makefile @@ -62,11 +62,12 @@ mdp: make win app: python2.7 -c 'import compileall; compileall.compile_dir("gluon/")' + rm ../web2py_osx/site-packages.zip #python web2py.py -S welcome -R __exit__.py #cd ../web2py_osx/site-packages/; unzip ../site-packages.zip - #find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \; - #cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip * - #mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7 + find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \; + cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip * + mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7 find gluon -path '*.py' -exec cp -R {} ../web2py_osx/web2py/web2py.app/Contents/Resources/{} \; cp README.markdown ../web2py_osx/web2py/web2py.app/Contents/Resources cp NEWINSTALL ../web2py_osx/web2py/web2py.app/Contents/Resources @@ -85,6 +86,7 @@ app: mv ../web2py_osx/web2py_osx.zip . win: python2.7 -c 'import compileall; compileall.compile_dir("gluon/")' + rm ../web2py_win/library.zip #cd ../web2py_win/library/; unzip ../library.zip find gluon -path '*.pyc' -exec cp -R {} ../web2py_win/library/{} \; cd ../web2py_win/library/; zip -r ../library.zip * diff --git a/VERSION b/VERSION index 921fb206..a3d4b554 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.5-stable+timestamp.2014.03.15.21.24.06 +Version 2.9.5-stable+timestamp.2014.03.19.12.29.20