Skip to content

Commit

Permalink
do not rename libs on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
fpelliccioni committed Apr 14, 2021
1 parent 462e388 commit 4c53078
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
48 changes: 24 additions & 24 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,29 @@ def find(name, path):
if name in files:
return os.path.join(root, name)

def replace_boost_lib_names_on_windows(path):
# print('replace_boost_lib_names_on_windows')
# print(platform)
if platform != "win32":
return

# print('replace_boost_lib_names_on_windows')

for root, dirs, files in os.walk(path):
# print(files)

for file in files:
newfile = re.sub(r"-\d_\d\d", "", file)
newfile = re.sub(r"-vc\d\d\d-mt", "", newfile)

# print(file)
# print(newfile)
if file != newfile:
file = os.path.join(path, file)
newfile = os.path.join(path, newfile)
print(file)
print(newfile)
os.rename(file, newfile)
# def replace_boost_lib_names_on_windows(path):
# # print('replace_boost_lib_names_on_windows')
# # print(platform)
# if platform != "win32":
# return

# # print('replace_boost_lib_names_on_windows')

# for root, dirs, files in os.walk(path):
# # print(files)

# for file in files:
# newfile = re.sub(r"-\d_\d\d", "", file)
# newfile = re.sub(r"-vc\d\d\d-mt", "", newfile)

# # print(file)
# # print(newfile)
# if file != newfile:
# file = os.path.join(path, file)
# newfile = os.path.join(path, newfile)
# print(file)
# print(newfile)
# os.rename(file, newfile)

def exec_conan(args_param):
print("----------------------------------------------------")
Expand Down Expand Up @@ -135,7 +135,7 @@ def run_conan(reference, march_id, debug_build):
print("----------------------------------------------------")

print('run_conan - END')
replace_boost_lib_names_on_windows('../deps/lib')
# replace_boost_lib_names_on_windows('../deps/lib')

def get_march(arch):
march_id = os.getenv("KTH_MARCHID", "4fZKi37a595hP")
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@knuth/bch-native",
"version": "0.25.0",
"version": "0.26.0",
"description": "Foundation library for @knuth/bch (Bitcoin Cash development platform for Javascript applications)",
"repository": {
"type": "git",
Expand Down

0 comments on commit 4c53078

Please sign in to comment.