mo2/modorganizer-umbrella
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-umbrella.git synced 2026-07-27 13:58:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from Qudix/master

Browse Source 
Moving things around
This commit is contained in:
isanae
2020-11-14 06:54:09 -05:00
committed by GitHub
parent 6afa3eef10 5dd778aff0
commit 754a03c486
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefile.uni.py
+1 -1
View File
@@ -203,7 +203,7 @@ for author, git_path, path, branch, dependencies, Build in [
def python_core_collect(context):
ip = os.path.join(config["paths"]["install"], "bin")
ip = os.path.join(config["paths"]["install"], "bin/dlls")
bp = python.python['build_path']
path_segments = [bp, "PCbuild"]
if config['architecture'] == "x86_64":
unibuild/projects/boost.py
+2 -2
View File
@@ -74,7 +74,7 @@ if config.get('binary_boost', True):
vc_version.replace(".", ""),
"x64" if config['architecture'] == "x86_64" else "x86",
"_".join(boost_version.split(".")[:-1]))),
os.path.join(config["paths"]["install"], "bin"))
os.path.join(config["paths"]["install"], "bin/dlls"))
boost.depend(boost_stage)
@@ -110,7 +110,7 @@ else:
vc_version.replace(".", ""),
"x64" if config['architecture'] == "x86_64" else "x86",
"_".join(boost_version.split(".")[:-1]))),
os.path.join(config["paths"]["install"], "bin"))
os.path.join(config["paths"]["install"], "bin/dlls"))
boost.depend(boost_stage)
else:
boost_stage = boost
unibuild/projects/openssl.py
+2 -4
View File
@@ -75,11 +75,9 @@ def openssl_stage(context):
if not os.path.exists(dest_pdb):
os.makedirs(dest_pdb)
for f in glob(os.path.join(final_path, "bin", "libcrypto-1_1{}.dll".format(bitness_suffix()))):
shutil.copy(f, os.path.join(dest_bin, "libcrypto-1_1{}.dll".format(bitness_suffix())))
shutil.copy(f, os.path.join(dest_bin, "dlls", "libcrypto-1_1{}.dll".format(bitness_suffix())))
shutil.copy(f, os.path.join(dest_bin, "libcrypto-1_1{}.dll".format(bitness_suffix())))
for f in glob(os.path.join(final_path, "bin", "libssl-1_1{}.dll".format(bitness_suffix()))):
shutil.copy(f, os.path.join(dest_bin, "libssl-1_1{}.dll".format(bitness_suffix())))
shutil.copy(f, os.path.join(dest_bin, "dlls", "libssl-1_1{}.dll".format(bitness_suffix())))
shutil.copy(f, os.path.join(dest_bin, "libssl-1_1{}.dll".format(bitness_suffix())))
for f in glob(os.path.join(final_path,"bin", "libcrypto-1_1{}.pdb".format(bitness_suffix()))):
shutil.copy(f, os.path.join(dest_pdb, "libcrypto-1_1{}.pdb".format(bitness_suffix())))
for f in glob(os.path.join(final_path,"bin", "libssl-1_1{}.pdb".format(bitness_suffix()))):
unibuild/projects/python.py
+5 -5
View File
@@ -121,18 +121,18 @@ class PydCompiler(build.Builder):
def install(context):
make_sure_path_exists(os.path.join(path_install, "libs"))
make_sure_path_exists(os.path.join(context["build_path"], "libs"))
make_sure_path_exists(os.path.join(path_install, "bin"))
make_sure_path_exists(os.path.join(path_install, "bin/dlls"))
make_sure_path_exists(os.path.join(path_install, "pdb"))
path_segments = [context['build_path'], "PCbuild", bitness()]
for f in glob(os.path.join(*path_segments, "*.lib")):
shutil.copy(f, os.path.join(path_install, "libs"))
for f in glob(os.path.join(*path_segments, "*.lib")):
shutil.copy(f, os.path.join(context["build_path"], "libs"))
shutil.copy(os.path.join(*path_segments, "python{}.dll".format(python_version.replace(".", ""))), os.path.join(path_install, "bin"))
shutil.copy(os.path.join(*path_segments, "python{}.dll".format(python_version.replace(".", ""))), os.path.join(context["build_path"], "libs"))
shutil.copy(os.path.join(*path_segments, "python{}.dll".format(python_version.replace(".", ""))), os.path.join(path_install, "bin/dlls"))
shutil.copy(os.path.join(*path_segments, "python{}.dll".format(python_version.replace(".", ""))), os.path.join(context["build_path"], "libs"))
for f in glob(os.path.join(*path_segments, "libffi-*.dll")):
shutil.copy(f, os.path.join(path_install, "bin"))
shutil.copy(os.path.join(*path_segments, "python{}.pdb".format(python_version.replace(".", ""))), os.path.join(path_install, "pdb"))
shutil.copy(f, os.path.join(path_install, "bin/dlls"))
shutil.copy(os.path.join(*path_segments, "python{}.pdb".format(python_version.replace(".", ""))), os.path.join(path_install, "pdb"))
for f in glob(os.path.join(*path_segments, "_*.pdb")):
shutil.copy(f, os.path.join(path_install, "pdb"))
return True
unibuild/projects/translations.py
+2 -2
View File
@@ -70,7 +70,7 @@ def GenerateFiles(path,data, c = 1):
if os.path.isfile(i):
filepath, filename = os.path.split(i)
if filename.endswith(".ts"):
dest_dir = os.path.join(install_path, "bin", "translations")
dest_dir = os.path.join(install_path, "bin/resources", "translations")
# filepath is the directory that contains the .ts file
# in build/transifex-translations/translations, created
@@ -225,7 +225,7 @@ init_transifex_repo = build.Run("{} init --force --no-interactive"
def install_qt_translations(context):
full_install_path = os.path.join(install_path, "bin", "translations")
full_install_path = os.path.join(install_path, "bin/resources", "translations")
qt_qm_path = os.path.join(config["paths"]["qt_binary_install"], "translations")
translated_ts_path = os.path.join(build_path, "transifex-translations", "translations", "mod-organizer.organizer")
for ts_file in glob(os.path.join(translated_ts_path, "*.ts")):