From a4e1ceabcd5228309dd2dd60e00fb452bfbd5302 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Wed, 30 Nov 2011 17:14:44 +0000 Subject: [PATCH] DFCH: Important changes in the script --- .../install_generate_thirdparty.bat_TEMPLATE | 23 +++++------- .../install_thirdparty.bat_TEMPLATE | 36 ------------------- ...install_thirdparty_dlls_cmake.bat_TEMPLATE | 32 ----------------- ...ll_thirdparty_libraries_cmake.bat_TEMPLATE | 32 ----------------- .../move_thirdparty_dlls.bat_TEMPLATE | 33 ----------------- .../move_thirdparty_libraries.bat_TEMPLATE | 32 ----------------- .../scripts/generateThirdPartyLibExe.bat | 13 +++++++ .../scripts/generateThirdPartydllsExe.bat | 13 +++++++ .../scripts/install_thirdparty.bat | 10 ++++++ 9 files changed, 44 insertions(+), 180 deletions(-) delete mode 100644 Install_ThirdParty/install_thirdparty.bat_TEMPLATE delete mode 100644 Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE delete mode 100644 Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE delete mode 100644 Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE delete mode 100644 Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE create mode 100644 Install_ThirdParty/scripts/generateThirdPartyLibExe.bat create mode 100644 Install_ThirdParty/scripts/generateThirdPartydllsExe.bat create mode 100644 Install_ThirdParty/scripts/install_thirdparty.bat diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE index 007de6e..8fb233e 100644 --- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE +++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE @@ -20,31 +20,24 @@ echo ----------------------------------- cd scripts -echo Calling install_thirdparty_all.bat +echo Calling install_thirdparty.bat -call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% >> install_generate_thirdparty.log 2>&1 +start /wait install_thirdparty.bat %thirdpartyGeneration% %buildType% -echo Calling move_thirdparty_dlls.bat +echo Calling generateThirdPartydllsExe.bat -call move_thirdparty_dlls.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 +start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% -echo Calling move_thirdparty_libraries.bat +echo Calling generateThirdPartyLibExe.bat -call move_thirdparty_libraries.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 +start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% -echo Calling install_thirdparty_libraries_cmake.bat - -call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 - -echo Calling install_thirdparty_dlls_cmake.bat - -call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1 - -cd .. +cd.. echo ----------------------------------- echo -------End of the Script----------- echo ----------------------------------- pause + exit \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty.bat_TEMPLATE deleted file mode 100644 index 5e6d1d0..0000000 --- a/Install_ThirdParty/install_thirdparty.bat_TEMPLATE +++ /dev/null @@ -1,36 +0,0 @@ -@echo off - -echo ----------------------------------- -echo ---Setting Environment Variables--- -echo ----------------------------------- - -set thirdpartyGeneration= -set buildType= - - -echo thirdpartyGeneration=%thirdpartyGeneration% -echo buildType=%buildType% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -cd scripts - -echo Calling install_thirdparty_all.bat - -call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% >> install.log 2>&1 - -cd .. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -pause - -exit diff --git a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE deleted file mode 100644 index 747e7c2..0000000 --- a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE +++ /dev/null @@ -1,32 +0,0 @@ -@echo off - -echo ----------------------------------- -echo ---Setting Environment Variables--- -echo ----------------------------------- - -set thirdpartyGeneration= - -echo thirdpartyGeneration=%thirdpartyGeneration% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -cd scripts - -echo Calling install_thirdparty_dlls_cmake.bat - -call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> install_thirdparty_dlls_cmake.log 2>&1 - -cd .. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -pause -exit \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE deleted file mode 100644 index 7cf1ccb..0000000 --- a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE +++ /dev/null @@ -1,32 +0,0 @@ -@echo off - -echo ----------------------------------- -echo ---Setting Environment Variables--- -echo ----------------------------------- - -set thirdpartyGeneration= - -echo thirdpartyGeneration=%thirdpartyGeneration% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -cd scripts - -echo Calling install_thirdparty_libraries_cmake.bat - -call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> install_thirdparty_libraries_cmake.log 2>&1 - -cd .. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -pause -exit \ No newline at end of file diff --git a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE deleted file mode 100644 index 962fe23..0000000 --- a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE +++ /dev/null @@ -1,33 +0,0 @@ -@echo off - -echo ----------------------------------- -echo ---Setting Environment Variables--- -echo ----------------------------------- - -set thirdpartyGeneration= - -echo thirdpartyGeneration=%thirdpartyGeneration% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -cd scripts - -echo Calling move_thirdparty_dlls.bat - -call move_thirdparty_dlls.bat %thirdpartyGeneration% >> move_thirdparty_dlls.log 2>&1 - -cd .. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -pause -exit - diff --git a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE deleted file mode 100644 index cb7329c..0000000 --- a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE +++ /dev/null @@ -1,32 +0,0 @@ -@echo off - -echo ----------------------------------- -echo ---Setting Environment Variables--- -echo ----------------------------------- - -set thirdpartyGeneration= - -echo thirdpartyGeneration=%thirdpartyGeneration% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -cd scripts - -echo Calling move_thirdparty_libraries.bat - -call move_thirdparty_libraries.bat %thirdpartyGeneration% >> move_thirdparty_libraries.log 2>&1 - -cd .. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -pause -exit \ No newline at end of file diff --git a/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat new file mode 100644 index 0000000..2f7c752 --- /dev/null +++ b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat @@ -0,0 +1,13 @@ +@echo off + +set thirdpartyGeneration=%1 + +echo Calling move_thirdparty_libraries.bat + +call move_thirdparty_libraries.bat %thirdpartyGeneration% >> generateThirdpartyLibExe.log 2>&1 + +echo Calling install_thirdparty_libraries_cmake.bat + +call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> generateThirdpartyLibExe.log 2>&1 + +exit \ No newline at end of file diff --git a/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat new file mode 100644 index 0000000..5a51ef3 --- /dev/null +++ b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat @@ -0,0 +1,13 @@ +@echo off + +set thirdpartyGeneration=%1 + +echo Calling move_thirdparty_dlls.bat + +call move_thirdparty_dlls.bat %thirdpartyGeneration% >> generateThirdpartydllsExe.log 2>&1 + +echo Calling install_thirdparty_dlls_cmake.bat + +call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> generateThirdpartydllsExe.log 2>&1 + +exit \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty.bat b/Install_ThirdParty/scripts/install_thirdparty.bat new file mode 100644 index 0000000..0c09b9f --- /dev/null +++ b/Install_ThirdParty/scripts/install_thirdparty.bat @@ -0,0 +1,10 @@ +@echo off + +set thirdpartyGeneration=%1 +set buildType=%2 + +echo Calling install_thirdparty_all.bat + +call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% >> installThirdParty.log 2>&1 + +exit -- 2.45.1