Added OS folders

Author: michaelboth

packaging/buildLinuxPackage.bash

@@ -20,7 +20,8 @@ echo "qt_folder = ${qt_folder}"
 mkdir ${output_folder}
 mkdir ${output_folder}/inc
 mkdir ${output_folder}/visualizer
-mkdir ${output_folder}/visualizer/platforms
+mkdir ${output_folder}/visualizer/linux
+mkdir ${output_folder}/visualizer/linux/platforms
 
 # Copy the relevant files
 cp ../LICENSE ${output_folder}
@@ -34,25 +35,25 @@ cp -r ../inc ${output_folder}
 cd ../visualizer
 qmake
 make -j8
-cp UnikornViewer ../packaging/${output_folder}/visualizer
+cp UnikornViewer ../packaging/${output_folder}/visualizer/linux
 make distclean
 cd ../packaging
-cp UnikornViewer.sh ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/plugins/platforms/libqxcb.so ${output_folder}/visualizer/platforms
-cp ${qt_folder}/gcc_64/lib/libQt5Core.so.5 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libQt5Gui.so.5 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libQt5Widgets.so.5 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libQt5XcbQpa.so.5 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libQt5DBus.so.5 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libicui18n.so.56 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libicuuc.so.56 ${output_folder}/visualizer
-cp ${qt_folder}/gcc_64/lib/libicudata.so.56 ${output_folder}/visualizer
+cp UnikornViewer.sh ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/plugins/platforms/libqxcb.so ${output_folder}/visualizer/linux/platforms
+cp ${qt_folder}/gcc_64/lib/libQt5Core.so.5 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libQt5Gui.so.5 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libQt5Widgets.so.5 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libQt5XcbQpa.so.5 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libQt5DBus.so.5 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libicui18n.so.56 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libicuuc.so.56 ${output_folder}/visualizer/linux
+cp ${qt_folder}/gcc_64/lib/libicudata.so.56 ${output_folder}/visualizer/linux
 
 # Compress package
 tar cvf ${output_folder}-linux-x64.tar ${output_folder}
 gzip ${output_folder}-linux-x64.tar
 #zip -r ${output_folder}-linux-x64.zip ${output_folder}
 
-echo "Packaging created"
+echo "Unikorn Linux package created"
 
 exit 0

packaging/buildMacPackage.bash

@@ -20,6 +20,7 @@ echo "qt_folder = ${qt_folder}"
 mkdir ${output_folder}
 mkdir ${output_folder}/inc
 mkdir ${output_folder}/visualizer
+mkdir ${output_folder}/visualizer/mac
 
 # Copy the relevant files
 cp ../LICENSE ${output_folder}
@@ -33,17 +34,17 @@ cp -r ../inc ${output_folder}
 cd ../visualizer
 qmake
 make -j8
-cp -r UnikornViewer.app ../packaging/${output_folder}/visualizer
+cp -r UnikornViewer.app ../packaging/${output_folder}/visualizer/mac
 make distclean
-cd ../packaging/${output_folder}/visualizer
+cd ../packaging/${output_folder}/visualizer/mac
 ${qt_folder}/clang_64/bin/macdeployqt UnikornViewer.app
-cd ../..
+cd ../../..
 
 # Compress package
 tar cvf ${output_folder}-osx.tar ${output_folder}
 gzip ${output_folder}-osx.tar
 #zip -r ${output_folder}-mac.zip ${output_folder}
 
-echo "Packaging created"
+echo "Unikorn Mac package created"
 
 exit 0

packaging/buildWindowsPackage.bat

@@ -27,6 +27,8 @@ mkdir %output_folder%
 if %ERRORLEVEL% neq 0 ( echo "Failed to create folder" & GOTO:done )
 mkdir %output_folder%\visualizer
 if %ERRORLEVEL% neq 0 ( echo "Failed to create folder" & GOTO:done )
+mkdir %output_folder%\visualizer\windows
+if %ERRORLEVEL% neq 0 ( echo "Failed to create folder" & GOTO:done )
 
 rem Copy the relevant files
 copy ..\LICENSE %output_folder%
@@ -42,20 +44,20 @@ qmake
 if %ERRORLEVEL% neq 0 ( echo "Failed to qmake visualizer" & GOTO:done )
 nmake
 if %ERRORLEVEL% neq 0 ( echo "Failed to build visualizer" & GOTO:done )
-copy release\UnikornViewer.exe ..\packaging\%output_folder%\visualizer
+copy release\UnikornViewer.exe ..\packaging\%output_folder%\visualizer\windows
 if %ERRORLEVEL% neq 0 ( echo "Failed to copy visualizer" & GOTO:done )
 nmake distclean
 if %ERRORLEVEL% neq 0 ( echo "Failed to clean visualizer" & GOTO:done )
 cd ..\packaging
 
 rem Add support files for UnikornViewer.exe
-%qt_folder%\msvc2019_64\bin\windeployqt %output_folder%\visualizer
+%qt_folder%\msvc2019_64\bin\windeployqt %output_folder%\visualizer\windows
 
 rem Compress package
 powershell Compress-Archive %output_folder% %output_folder%-win64.zip
 if %ERRORLEVEL% neq 0 ( echo "Failed to zip package" & GOTO:done )
 
-echo "Packaging created"
+echo "Unikorn Windows package created"
 
 :done
 endlocal