|
22 | 22 | # Set the version number for the installation script. |
23 | 23 | VERSION = "25.7.0" |
24 | 24 |
|
| 25 | +# UCVM_INSTALL_PATH and UCVM_SRC_PATH |
| 26 | +UCVM_SRC_PATH = os.getcwd() |
| 27 | +UCVM_INSTALL_PATH = os.getcwd() |
| 28 | + |
25 | 29 | # User defined variables. |
26 | 30 | all_flag = False |
27 | 31 | dynamic_flag = True |
@@ -775,6 +779,13 @@ def _addPROJ_LIB_python() : |
775 | 779 | except OSError as e: |
776 | 780 | eG(e, "Parsing available model list.") |
777 | 781 |
|
| 782 | + |
| 783 | +### set UCVM_SRC_PATH and UCVM_SRC_PATH from the environment string.. |
| 784 | + my_srcpath=getSpecialEnvSetting('UCVM_SRC_PATH') |
| 785 | + if(my_srcpath != None): |
| 786 | + UCVM_SRC_PATH=my_srcpath |
| 787 | + |
| 788 | + |
778 | 789 | print("\nPlease answer the following questions to install UCVM.\n") |
779 | 790 | print("Note that this install and build process may take up to an hour depending on your") |
780 | 791 | print("computer speed.") |
@@ -828,6 +839,8 @@ def _addPROJ_LIB_python() : |
828 | 839 | call(["mkdir", "-p", ucvmpath+'/work']) |
829 | 840 | call(["mkdir", "-p", ucvmpath+'/lib']) |
830 | 841 |
|
| 842 | +SRC_INSTALL_PATH = ucvmpath |
| 843 | + |
831 | 844 | ## print(config_data["models"].keys()) |
832 | 845 |
|
833 | 846 | for model in sorted(iter(config_data["models"].keys()), key=lambda k: config_data["models"][k]["Order"]): |
@@ -1020,9 +1033,9 @@ def _addPROJ_LIB_python() : |
1020 | 1033 | callAndRecord(["make"]) |
1021 | 1034 |
|
1022 | 1035 | if platform.system() == "Darwin" or platform.system() == "Linux" or dynamic_flag == True: |
1023 | | - makeBashScript(os.getcwd(), ucvmpath ,modelsToInstall, librariesToInstall) |
1024 | | - makePythonScript(os.getcwd(), ucvmpath ,modelsToInstall, librariesToInstall) |
1025 | | - makeDyLibNameChangeScript(os.getcwd(), ucvmpath, modelsToInstall, librariesToInstall) |
| 1036 | + makeBashScript(UCVM_SRC_PATH, ucvmpath ,modelsToInstall, librariesToInstall) |
| 1037 | + makePythonScript(UCVM_SRC_PATH, ucvmpath ,modelsToInstall, librariesToInstall) |
| 1038 | + makeDyLibNameChangeScript(UCVM_SRC_PATH, ucvmpath, modelsToInstall, librariesToInstall) |
1026 | 1039 |
|
1027 | 1040 | print("\nInstalling UCVM") |
1028 | 1041 | callAndRecord(["make", "install"]) |
|
0 commit comments