Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1343 from hunbernd/fix/deprecatedversinioningscript

Browse Source 
Warn builders about the deprecated version_detail script instead of running it
This commit is contained in:
G10h4ck 2018-09-15 19:44:25 +02:00 committed by GitHub
commit dde9acb40a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/libretroshare.pro
View File

@ -228,16 +228,8 @@ linux-g++-64 {
} }
version_detail_bash_script { version_detail_bash_script {
linux-* { warning("Version detail script is deprecated.")
QMAKE_EXTRA_TARGETS += write_version_detail warning("Remove references to version_detail_bash_script from all of your build scripts!")
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = $$PWD/version_detail.sh
}
win32-* {
QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = $$PWD/version_detail.bat
}
} }
#################### Cross compilation for windows under Linux #################### #################### Cross compilation for windows under Linux ####################

13
retroshare-gui/src/retroshare-gui.pro
View File

@ -105,17 +105,8 @@ linux-g++-64 {
} }
version_detail_bash_script { version_detail_bash_script {
linux-* { warning("Version detail script is deprecated.")
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO warning("Remove references to version_detail_bash_script from all of your build scripts!")
QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = $$PWD/version_detail.sh
}
win32-* {
QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = $$PWD/version_detail.bat
}
} }
#################### Cross compilation for windows under Linux ################### #################### Cross compilation for windows under Linux ###################