From 527051e29b28bad9b287b87d80473c429ca3aaf2 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 27 Jun 2020 16:39:27 +0200 Subject: [PATCH] remove binary nsProcess.dll from the repository --- .gitignore | 1 + windows/deploy_windows.bat | 13 +++++++++++++ windows/nsProcess.dll | Bin 4608 -> 0 bytes 3 files changed, 14 insertions(+) delete mode 100644 windows/nsProcess.dll diff --git a/.gitignore b/.gitignore index 7f034c10..22d4d929 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ src/res/qrc_resources.cpp windows/ASIOSDK2 windows/VC_redist.x64.exe windows/vc_redist.x86.exe +windows/nsProcess.dll debug/ release/ build/ diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat index 41979c1b..5a3ce836 100755 --- a/windows/deploy_windows.bat +++ b/windows/deploy_windows.bat @@ -35,9 +35,18 @@ set NSIS_PATH=%PROGRAMFILES(x86)%\NSIS set VS_REDIST32_EXE=vc_redist.x86.exe set VS_REDIST64_EXE=VC_redist.x64.exe +rem check for environment if "%VSINSTALLDIR%" == "" goto vsenvproblem if "%QTDIR32%" == "" goto qtdirproblem if "%QTDIR64%" == "" goto qtdirproblem + +rem check for needed NSIS plugin +if not exist nsProcess.dll ( + echo nsProcess.dll not found. Trying to download the 7z file containing the dll in NsProcess\Plugin. + powershell -Command "Invoke-WebRequest https://nsis.sourceforge.io/mediawiki/images/1/18/NsProcess.zip -OutFile nsProcess.7z" + goto nsispluginproblem +) + cd .. @@ -92,4 +101,8 @@ goto endofskript echo The QTDIR32 and QTDIR64 is not set, please set these environment variables correclty before calling this script goto endofskript +:nsispluginproblem +echo Required NSIS plugin not found. Unzip the nsProcess.dll and copy it in the windows directory before calling this script +goto endofskript + :endofskript diff --git a/windows/nsProcess.dll b/windows/nsProcess.dll deleted file mode 100644 index 4ce012103f940e219f1b48eebd923e2b9c05ad01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKZ){sv6+d>I#_iI^8Z{~?&{r?8O022v=Za==i?igV4RzbsI<-Tae~$gq_p;~r z!uyjZD1lavJGrkO6{>&_(WcP}5bQ$*Ekx6_g_bERq9DQ4RmueYFibU)Wh&IYY$X(x4^mO z5yx79HK=iyvA0pb2+^vglSUF_rJIck+h!f| znij$6TT5oZPz-;~WX%xm7Fso3OQFur6&18dumP#2MJS#o$SNBCjq0%mwjGVLrbPgr zsu3R!|Bn^8$}U8%G{O<IAjKwX}ortqbG11}j0P%XL|7!c+ji>YGN`7FqZJ^QUC~zyh*nm$Q z@$xv|Hn3`JD{%MddW|UO7K~4wnz>hp50B{)=N|#U3Aa6A)?1vX_-G6jE?a@3S!Zz@ z6N^BfHR8o1?HL+8cJ1nsg4}Zc)Sb8SI3`$9;9lYLGyVCQzWmJaBKOL9+c;bTT{qv4 zR<{$_WoLfvjKz(O$Q@0y>k)H)fX=mH_bNmH#5d5#`UCOqM4so;?Tf~k_!5qJ;tkoV zUR3RgTRZ$HCCH8T#Uduh^D$zIWA)@nueF*Z#urc`-Y3xH6u}26^R&oV`;JKTQNh{j@~3l)XJx%UY< zG)DMXjCfnnjhIFuN0k^NgK}=c+#Jbs{cYT&$rQL@zQFbI#GED*UCTTEK}hzO9%~IE zy6Wy0FI3~a-GJcY9L4iCV{hHe52V}w*fjfBETy%B<}RMZE=F#M|rk(lkq7E4g=@W-n5{)HM4;9(dJumVeKS!xpKYPt^?>*x_`Ch-dVizF7SF_z{ul|wjeUpp-~yBeFC7U^dJjqkH7b&P+PYPiJTPsOl?J)s&qXcA#*S3Ql%m@YqoH zb@|#=tEo`Q=SmgTV&| zh?f8y@#S~#(R2{tEmS=?fR_R|#t`6g1>oB@zzZ~Jd_W`FonW+Qr(0YQxBSKy%%c%2 zRsRCbjxTh(cw)5RNufJn`&b*|c{lM!P{x83>*#IchU_ki2S%Ii7tb!Z`LPJ`cF|(* zunTn;aT;yB8Z5}Ku|f0x!7DC$^_;pxYe-CYAqN<+_%;IILFq+?*_V|3^0S1HYv}N> z-KPT6TL8`=J%@A&=~qZMk={YNiv&J^MkF7SA1RFVWu$&28EG2n3=(ZWL;gFYTS(t8 z>v&B~3A)Y(50t)Bs&coa>GC#=v7r&6y$L>7*mqtx~S4m8ra7jKEOrUU~5-2 zO63E_Ayd$%VpF;yWO|fQRm&s|NmcAQ=!Gtb;;*&L0X~-oXr?)o+jnV93|?n7x;v=D zx7~f)|GGAv&?&3Bus5lsWdXLidIc>bDOiqjkpR-JL{c)kRV^kd$7SK*$e55a;C06y z!Qdt(qZ2=-tF~<2!Er&Uh(B@3x}l}Ur<4x3Y>#CDhwv9?R86L%(ukJSrci#VWS1G2 zI^b)rgp?LK#iZ7&?l)yadTPoL@Tr~~hfk^_X3x-Mi! zM2pkB=v0>DW$2pI%;f7shKB}dZu+E;A1jLMH&_K$_d%!3$*%u zyVtK{n6ROlxm@2o2r?tnewQz)_b3zU(}Lz>OsOM9@3vjO(WI;kzTM&NRqPKsSMh5sKC*gv`v+nT zZ?7he?&0l~dhX^s_>Qiwo&$UO`pSd)6N-n9g+@asLf;6T4Sg&0z0eOr7em)WZ-#KuhwWppz&`;@9Jy}*