diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2019-03-08 22:08:07 +0300 |
|---|---|---|
| committer | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2019-03-08 22:42:07 +0300 |
| commit | a333b1d9434bd7e68227d1d5eafb1f188c2fc712 (patch) | |
| tree | cf48e1840cabb7ea7fbf3b7abaf7ad3ca7d50b0d | |
| parent | 4e3f1d8a46b5f6718d05a3b67aeee621f14cb502 (diff) | |
Also clean up cached commit
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | mkwindows.sh | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 52cc457..4f6f424 100644 --- a/Makefile.in +++ b/Makefile.in @@ -339,7 +339,7 @@ dist: check-clean commit.h .git create_dirs .PHONY: clean-here clean-here: - rm -rf ${DIR_LIST} $(PRPL_LIBNAME) telegram-purple.nsi po/*.mo autom4te.cache AppStream/po/*.mo + rm -rf ${DIR_LIST} $(PRPL_LIBNAME) telegram-purple.nsi po/*.mo autom4te.cache AppStream/po/*.mo commit.h -include test/Makefile diff --git a/mkwindows.sh b/mkwindows.sh index 4e10452..b344cb2 100755 --- a/mkwindows.sh +++ b/mkwindows.sh @@ -56,7 +56,7 @@ MINGW_INCLUDEDIR=/usr/share/mingw-w64/include # WebP compilation WEBP_INSTALL_DIR="objs/webp-install/" -mkdir -p ${WEBP_INSTALL_DIR} +mkdir -p ${WEBP_INSTALL_DIR} # Needed for realpath WEBP_INSTALL_DIR_FULL="$(realpath ${WEBP_INSTALL_DIR})" WEBP_BUILD_DIR="objs/webp-build/" @@ -234,7 +234,7 @@ echo "===== 09: Compile telegram-purple" VERSIONINFO_OBJECTS="" if [ "y" = "${USE_VERSIONINFO}" ] then - mkdir -p objs + make objs commit.h cat <<EOFRC > objs/info.rc #include "../commit.h" 1 VERSIONINFO @@ -267,8 +267,6 @@ make -j4 bin/libtelegram.dll \ # Package it up echo "===== 10: Create installer" -VERSION=`grep -E 'PACKAGE_VERSION' config.h | sed -re 's/^.*"(.*)".*$/\1/'` -COMMIT=`grep -E 'define' commit.h | sed -re 's/^.*"(.*)".*$/\1/'` make PRPL_NAME=libtelegram.dll win-installer-deps makensis -DPLUGIN_VERSION="${VERSION}+g${COMMIT}" -DPRPL_NAME=libtelegram.dll \ -DWIN32_DEV_TOP=contrib telegram-purple.nsi |