Commit 17bfa4b2 authored by Manuel Cortez's avatar Manuel Cortez

Test a 64 bits build

parent 73f1a9c3
Pipeline #622 passed with stages
in 4 minutes and 9 seconds
......@@ -67,7 +67,7 @@ alpha32:
- '%PYTHON3-32% setup.py build'
- cd ..
- cd scripts
- '%PYTHON3-32% prepare_zipversion_cxfreeze.py'
- '%PYTHON3-32% prepare_zipversion.py'
- call genpot_interface.bat
- call genpot_doc.bat
- cd ..
......@@ -84,47 +84,11 @@ alpha32:
name: socializer_alpha
expire_in: 1 day
alpha:
type: deploy
tags:
- windows10
before_script:
- '%PYTHON3-32% -V'
- '%PYTHON3-32% -m pip install --upgrade pip cx_freeze'
- '%PYTHON3-32% -m pip install --upgrade -r requirements.txt'
- '%PYTHON3-32% -m pip uninstall enum34 -y'
script:
- copy changelog.md doc\changelog.md
- cd doc
- '%PYTHON3-32% documentation_importer.py'
- cd ..\src
- '%PYTHON3-32% ..\doc\generator.py'
- '%PYTHON3-32% write_version_data.py'
- '%PYTHON3-32% setup.py build'
- cd ..
- cd scripts
- '%PYTHON3-32% prepare_zipversion_cxfreeze.py'
- call genpot_interface.bat
- call genpot_doc.bat
- cd ..
- move src\socializer.zip socializer.zip
- move scripts\socializer.pot socializer.pot
- move scripts\socializer-documentation.pot socializer-documentation.pot
only:
- schedules
artifacts:
paths:
- socializer.zip
- socializer.pot
- socializer-documentation.pot
name: socializer_alpha
expire_in: 1 day
### This is commented because there is no 64 bits version of enchant, thus pyenchant will not work.
### I will reenable this when we will get rid of enchant, probably in favour of symspellpy
# Creates a version built with Python 3.7 and cx-freeze
# this is going to be the current alpha version after november 27.
.alpha64:
alpha64:
type: deploy
tags:
- windows10
......@@ -143,7 +107,7 @@ alpha:
- '%PYTHON3-64% setup.py build'
- cd ..
- cd scripts
- '%PYTHON3-64% prepare_zipversion_cxfreeze.py'
- '%PYTHON3-64% prepare_zipversion.py'
- call genpot_interface.bat
- call genpot_doc.bat
- cd ..
......
......@@ -6,10 +6,7 @@ import sys
def create_archive():
os.chdir("..\\src")
print("Creating zip archive...")
if sys.version[0] == "3":
folder = "dist/main"
else:
folder = "dist"
folder = "dist"
shutil.make_archive("socializer", "zip", folder)
# if os.path.exists("dist"):
# shutil.rmtree("dist")
......
#! /usr/bin/env python# -*- coding: iso-8859-1 -*-
import shutil
import os
import sys
def create_archive():
os.chdir("..\\src")
print("Creating zip archive...")
folder = "dist"
shutil.make_archive("socializer", "zip", folder)
# if os.path.exists("dist"):
# shutil.rmtree("dist")
if os.path.exists("build"):
shutil.rmtree("build")
os.chdir("..\\scripts")
create_archive()
\ No newline at end of file
......@@ -31,7 +31,7 @@ if sys.platform == 'win32':
build_exe_options = dict(
build_exe="dist",
optimize=2,
optimize=1,
include_msvcr=True,
zip_include_packages=["accessible_output2", "sound_lib", "arrow"],
include_files=["session.defaults", "cacert.pem", "app-configuration.defaults", "locales", "sounds", "documentation", "../windows-dependencies/x86/oggenc2.exe", "../windows-dependencies/x86/bootstrap.exe", "../windows-dependencies/dictionaries", find_sound_lib_datafiles(), find_accessible_output2_datafiles()],
......
......@@ -75,11 +75,11 @@ def find_version_data(update_type, current_version, available_update):
return (False, False, False)
available_description = available_update["message"]
# ToDo: simplify this so it can be reused in other projects.
import application
if application.is_pyinstaller():
update_url = "https://code.manuelcortez.net/manuelcortez/socializer/-/jobs/artifacts/master/raw/socializer.zip?job=alpha_python3"
else:
import platform
if platform.architecture()[0][:2] == "32":
update_url = "https://code.manuelcortez.net/manuelcortez/socializer/-/jobs/artifacts/master/raw/socializer_x86.zip?job=alpha32"
else:
update_url = "https://code.manuelcortez.net/manuelcortez/socializer/-/jobs/artifacts/master/raw/socializer_x64.zip?job=alpha64"
return (available_version, available_description, update_url)
def download_update(update_url, update_destination, requests_session, progress_callback=None, chunk_size=io.DEFAULT_BUFFER_SIZE):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment