From 057b1392c0410dad8971212b1f263854746d2e51 Mon Sep 17 00:00:00 2001 From: Winlin Date: Mon, 21 Nov 2022 14:32:26 +0800 Subject: [PATCH] Windows: Refine cygwin pipeline (#3260) 1. When cleanup, remove srs.exe 2. Refine NSIS command. --- trunk/configure | 2 +- trunk/packaging/nsis/srs.nsi | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/trunk/configure b/trunk/configure index b9338b715..099b67687 100755 --- a/trunk/configure +++ b/trunk/configure @@ -525,7 +525,7 @@ help: @echo " make help" doclean: - (cd ${SRS_OBJS} && rm -rf srs srs_utest $__mcleanups) + (cd ${SRS_OBJS} && rm -rf srs srs_utest srs.exe srs_utest.exe $__mcleanups) (cd ${SRS_OBJS} && rm -rf src/* include lib) (mkdir -p ${SRS_OBJS}/utest && cd ${SRS_OBJS}/utest && rm -rf *.o *.a) diff --git a/trunk/packaging/nsis/srs.nsi b/trunk/packaging/nsis/srs.nsi index 681ab017f..62b8dd4a1 100644 --- a/trunk/packaging/nsis/srs.nsi +++ b/trunk/packaging/nsis/srs.nsi @@ -2,8 +2,7 @@ ; See https://nsis.sourceforge.io/Download ; "C:\Program Files (x86)\NSIS\makensis.exe" /DSRS_VERSION=5.0.89 /DCYGWIN_DIR="C:\tools\cygwin" srs.nsi ; "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" /DSRS_VERSION=5.0.89 /DCYGWIN_DIR="C:\cygwin64" srs.nsi -; "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" /DSRS_VERSION=$(../../objs/srs -v 2>&1) /DCYGWIN_DIR="C:\cygwin64" srs.nsi -; "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" /DSRS_VERSION=$(./objs/srs -v 2>&1) /DCYGWIN_DIR="C:\cygwin64" packaging/nsis/srs.nsi +; "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" /DSRS_VERSION=$(./objs/srs.exe -v 2>&1) /DCYGWIN_DIR="C:\cygwin64" packaging/nsis/srs.nsi ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "SRS"