Unify binaries search paths

Signed-off-by: Maxime Gervais <[email protected]>
a-j-albert · Jul 8, 2016 · f6afdca · f6afdca
1 parent 0c8176f
commit f6afdca
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 18 deletions.
diff --git a/Release/Release_All_Windows_i386.bat b/Release/Release_All_Windows_i386.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+@rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_All_Windows_i386.zip
 rmdir MediaInfo_All_Windows_i386 /S /Q
@@ -28,14 +37,14 @@ xcopy MediaInfo_GUI_Windows_i386\*.* MediaInfo_All_Windows_i386\ /S /Y
 xcopy MediaInfo_CLI_Windows_i386\*.* MediaInfo_All_Windows_i386\ /S /Y
 xcopy ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_i386\*.* MediaInfo_All_Windows_i386\ /S /Y
 
-rem --- Compressing Archive ---
+@rem --- Compressing Archive ---
 cd MediaInfo_All_Windows_i386\
-..\..\..\Shared\Binary\7z a -r -t7z -mx9 ..\MediaInfo_All_Windows_i386.7z *
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_All_Windows_i386.7z *
 cd ..
 
 
 @rem --- Clean up ---
 rmdir MediaInfo_All_Windows_i386\ /S /Q
 rmdir MediaInfo_GUI_Windows_i386\ /S /Q
 rmdir MediaInfo_CLI_Windows_i386\ /S /Q
-rmdir ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_i386\ /S /Q
+rmdir ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_i386\ /S /Q
diff --git a/Release/Release_All_Windows_x64.bat b/Release/Release_All_Windows_x64.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_All_Windows_x64.zip
 rmdir MediaInfo_All_Windows_x64 /S /Q
@@ -30,12 +39,12 @@ xcopy ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_x64\*.* MediaInfo_All_Wind
 
 rem --- Compressing Archive ---
 cd MediaInfo_All_Windows_x64\
-..\..\..\Shared\Binary\7z a -r -t7z -mx9 ..\MediaInfo_All_Windows_x64.7z *
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_All_Windows_x64.7z *
 cd ..
 
 
 @rem --- Clean up ---
 rmdir MediaInfo_All_Windows_x64\ /S /Q
 rmdir MediaInfo_GUI_Windows_x64\ /S /Q
 rmdir MediaInfo_CLI_Windows_x64\ /S /Q
-rmdir ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_x64\ /S /Q
+rmdir ..\..\MediaInfoLib\Release\MediaInfoDLL_Windows_x64\ /S /Q
diff --git a/Release/Release_CLI_GNU_Prepare.bat b/Release/Release_CLI_GNU_Prepare.bat
@@ -6,6 +6,15 @@
 
 @echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 rem --- Clean up ---
 del MediaInfo_CLI_GNU_Prepare.7z
 rmdir MediaInfo_CLI_GNU_Prepare /S /Q
@@ -67,7 +76,7 @@ xcopy ..\..\Shared\Project\WxWidgets\*.sh MediaInfo_CLI_GNU_Prepare\Shared\Proje
 
 rem --- Compressing Archive ---
 if "%2"=="SkipCompression" goto SkipCompression
-..\..\Shared\Binary\Windows_i386\7-Zip\7z a -r -t7z -mx9 MediaInfo_CLI_GNU_Prepare.7z MediaInfo_CLI_GNU_Prepare\*
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 MediaInfo_CLI_GNU_Prepare.7z MediaInfo_CLI_GNU_Prepare\*
 :SkipCompression
 
 rem --- Clean up ---

diff --git a/Release/Release_CLI_Windows_i386.bat b/Release/Release_CLI_Windows_i386.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_CLI_Windows_i386.zip
 rmdir MediaInfo_CLI_Windows_i386 /S /Q
@@ -28,7 +37,7 @@ copy ..\Contrib\CLI_Help.doc MediaInfo_CLI_Windows_i386\Contrib\
 
 rem --- Compressing Archive ---
 cd MediaInfo_CLI_Windows_i386\
-..\..\..\..\MediaArea-Utils-Binaries\Windows\7-Zip\7z a -r -tzip ..\MediaInfo_CLI_Windows_i386.zip *
+%BPATH%\Windows\7-Zip\7z a -r -tzip ..\MediaInfo_CLI_Windows_i386.zip *
 cd ..
 
 rem --- Clean up ---

diff --git a/Release/Release_CLI_Windows_x64.bat b/Release/Release_CLI_Windows_x64.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_CLI_Windows_x64.zip
 rmdir MediaInfo_CLI_Windows_x64 /S /Q
@@ -25,7 +34,7 @@ copy Readme_CLI_Windows.txt MediaInfo_CLI_Windows_x64\ReadMe.txt
 
 rem --- Compressing Archive ---
 cd MediaInfo_CLI_Windows_x64\
-..\..\..\..\MediaArea-Utils-Binaries\Windows\7-Zip\7z a -r -tzip ..\MediaInfo_CLI_Windows_x64.zip *
+%BPATH%\Windows\7-Zip\7z a -r -tzip ..\MediaInfo_CLI_Windows_x64.zip *
 cd ..
 
 rem --- Clean up ---

diff --git a/Release/Release_GUI_GNU_Prepare.bat b/Release/Release_GUI_GNU_Prepare.bat
@@ -6,6 +6,15 @@
 
 @echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 rem --- Clean up ---
 del MediaInfo_GUI_GNU_Prepare.7z
 rmdir MediaInfo_GUI_GNU_Prepare /S /Q
@@ -72,7 +81,7 @@ xcopy ..\..\Shared\Project\WxWidgets\*.sh MediaInfo_GUI_GNU_Prepare\Shared\Proje
 
 rem --- Compressing Archive ---
 if "%2"=="SkipCompression" goto SkipCompression
-..\..\Shared\Binary\Windows_i386\7-Zip\7z a -r -t7z -mx9 MediaInfo_GUI_GNU_Prepare.7z MediaInfo_GUI_GNU_Prepare\*
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 MediaInfo_GUI_GNU_Prepare.7z MediaInfo_GUI_GNU_Prepare\*
 :SkipCompression
 
 rem --- Clean up ---

diff --git a/Release/Release_GUI_Windows.bat b/Release/Release_GUI_Windows.bat
@@ -6,8 +6,17 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_GUI_Windows.exe
 
 rem --- Installer ---
-..\..\..\MediaArea-Utils-Binaries\Windows\NSIS\makensis ..\Source\Install\MediaInfo_GUI_Windows.nsi
+%BPATH%\Windows\NSIS\makensis ..\Source\Install\MediaInfo_GUI_Windows.nsi
diff --git a/Release/Release_GUI_Windows_i386.bat b/Release/Release_GUI_Windows_i386.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_GUI_Windows_i386.exe
 del   MediaInfo_GUI_Windows_i386_WithoutInstaller.7z
@@ -32,10 +41,10 @@ copy ReadMe_GUI_Windows.txt MediaInfo_GUI_Windows_i386\ReadMe.txt
 
 rem --- Compressing Archive ---
 cd MediaInfo_GUI_Windows_i386\
-..\..\..\..\MediaArea-Utils-Binaries\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_GUI_Windows_i386_WithoutInstaller.7z *
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_GUI_Windows_i386_WithoutInstaller.7z *
 cd ..
 
 rem --- Clean up ---
 if "%1"=="SkipCleanUp" goto SkipCleanUp
 rmdir MediaInfo_GUI_Windows_i386\ /S /Q
-:SkipCleanUp
+:SkipCleanUp
diff --git a/Release/Release_GUI_Windows_x64.bat b/Release/Release_GUI_Windows_x64.bat
@@ -6,6 +6,15 @@
 
 @rem echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 @rem --- Clean up ---
 del   MediaInfo_GUI_Windows_x64.exe
 del   MediaInfo_GUI_Windows_x64_WithoutInstaller.7z
@@ -30,10 +39,10 @@ copy ReadMe_GUI_Windows.txt MediaInfo_GUI_Windows_x64\ReadMe.txt
 
 rem --- Compressing Archive ---
 cd MediaInfo_GUI_Windows_x64\
-..\..\..\..\MediaArea-Utils-Binaries\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_GUI_Windows_x64_WithoutInstaller.7z *
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ..\MediaInfo_GUI_Windows_x64_WithoutInstaller.7z *
 cd ..
 
 rem --- Clean up ---
 if "%1"=="SkipCleanUp" goto SkipCleanUp
 rmdir MediaInfo_GUI_Windows_x64\ /S /Q
-:SkipCleanUp
+:SkipCleanUp
diff --git a/Release/Release_Source.bat b/Release/Release_Source.bat
@@ -6,6 +6,15 @@
 
 @echo off
 
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+    echo "ERROR: binaries path not found"
+    exit /b 1
+)
+
 rem --- Clean up ---
 del mediainfo_.tar.bz2
 del MediaInfo_Source.tar
@@ -128,11 +137,11 @@ xcopy ..\..\Shared\Source\wx .\wx\ /S
 rem --- Compressing Archive ---
 if "%2"=="SkipCompression" goto SkipCompression
 move MediaInfo_Source MediaInfo
-..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -ttar -mx9 MediaInfo_Source.tar MediaInfo\*
-..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tbzip2 -mx9 mediainfo_.tar.bz2 MediaInfo_Source.tar
-..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tgzip -mx9 mediainfo_-1.tar.gz MediaInfo_Source.tar
+%BPATH%\Windows\7-zip\7z a -r -ttar -mx9 MediaInfo_Source.tar MediaInfo\*
+%BPATH%\Windows\7-zip\7z a -r -tbzip2 -mx9 mediainfo_.tar.bz2 MediaInfo_Source.tar
+%BPATH%\Windows\7-zip\7z a -r -tgzip -mx9 mediainfo_-1.tar.gz MediaInfo_Source.tar
 del MediaInfo_Source.tar
-..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -t7z -mx9 mediainfo__AllInclusive.7z MediaInfo\* MediaInfoLib\* ZenLib\* wxMSW\* zlib\*
+%BPATH%\Windows\7-zip\7z a -r -t7z -mx9 mediainfo__AllInclusive.7z MediaInfo\* MediaInfoLib\* ZenLib\* wxMSW\* zlib\*
 move MediaInfo MediaInfo_Source
 :SkipCompression