Merge pull request #51 from andkit/portable

Use checkout instead of installed version to build portable version
This commit is contained in:
Oskar Hahn 2012-11-22 02:19:01 -08:00
commit c815db308d
2 changed files with 8 additions and 15 deletions

View File

@ -6,17 +6,11 @@ How to create a new portable Windows distribution of OpenSlides:
easy_install -Z django django-mptt reportlab pil easy_install -Z django django-mptt reportlab pil
2.) Install OpenSlides by running in the top directory: 2.) Run in the main directory of the OpenSlides checkout:
python setup.py install
NOTE: This step must be repeated whenever you make changes to OpenSlides.
3.) Run in the main directory of the OpenSlides checkout:
python extras\win32-portable\prepare_portable.py python extras\win32-portable\prepare_portable.py
4.) The portable OpenSlides distribution is now ready as a zip archive 3.) The portable OpenSlides distribution is now ready as a zip archive
in the 'dist' directory in the 'dist' directory

View File

@ -18,8 +18,6 @@ import zipfile
import distutils.ccompiler import distutils.ccompiler
import distutils.sysconfig import distutils.sysconfig
from contextlib import nested
import pkg_resources import pkg_resources
sys.path.insert(0, os.getcwd()) sys.path.insert(0, os.getcwd())
@ -80,10 +78,7 @@ SITE_PACKAGES = {
"pil": { "pil": {
# NOTE: PIL is a special case, see copy_pil # NOTE: PIL is a special case, see copy_pil
"copy": [], "copy": [],
}, }
"openslides": {
"copy" : ["openslides"],
},
} }
PY_DLLS = [ PY_DLLS = [
@ -297,9 +292,13 @@ def main():
raise raise
os.makedirs(odir) os.makedirs(odir)
out_site_packages = os.path.join(odir, "site-packages")
collect_lib(libdir, odir) collect_lib(libdir, odir)
collect_site_packages(sitedir, os.path.join(odir, "site-packages")) collect_site_packages(sitedir, out_site_packages)
exclude = get_pkg_exclude("openslides")
copy_dir_exclude(exclude, ".", "openslides", out_site_packages)
if not compile_openslides_launcher(): if not compile_openslides_launcher():
sys.stdout.write("Using prebuild openslides.exe\n") sys.stdout.write("Using prebuild openslides.exe\n")