Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added --version-full option to wx-config

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-08-01 22:21:54 +00:00
parent 4bd1f74663
commit 224bf05c9b
4 changed files with 335 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

919
configure vendored
View File

File diff suppressed because one or more lines are too long

2
configure.in
View File

@@ -56,6 +56,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
WX_MAJOR_VERSION_NUMBER=2 WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=5 WX_MINOR_VERSION_NUMBER=5
WX_RELEASE_NUMBER=2 WX_RELEASE_NUMBER=2
WX_SUBRELEASE_NUMBER=3
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -6136,6 +6137,7 @@ dnl global options
AC_SUBST(WX_MAJOR_VERSION_NUMBER) AC_SUBST(WX_MAJOR_VERSION_NUMBER)
AC_SUBST(WX_MINOR_VERSION_NUMBER) AC_SUBST(WX_MINOR_VERSION_NUMBER)
AC_SUBST(WX_RELEASE_NUMBER) AC_SUBST(WX_RELEASE_NUMBER)
AC_SUBST(WX_SUBRELEASE_NUMBER)
AC_SUBST(WX_LIBRARY_NAME_STATIC) AC_SUBST(WX_LIBRARY_NAME_STATIC)
AC_SUBST(WX_LIBRARY_NAME_SHARED) AC_SUBST(WX_LIBRARY_NAME_SHARED)
AC_SUBST(WX_LIBRARY_BASENAME_NOGUI) AC_SUBST(WX_LIBRARY_BASENAME_NOGUI)

3
docs/changes.txt
View File

@@ -226,7 +226,8 @@ Unix:
- wxTaskBarIcon now supports freedesktop.org System Tray protocol - wxTaskBarIcon now supports freedesktop.org System Tray protocol
- security fixes to wxSingleInstanceChecker - security fixes to wxSingleInstanceChecker
- wx-config script was modified to allow choosing from multiple installed - wx-config script was modified to allow choosing from multiple installed
builds of wxWidgets builds of wxWidgets and to return flags/libs for selected libraries only
- wx-config has new --version-full option
wxGTK: wxGTK:

6
wx-config.in
View File

@@ -9,6 +9,7 @@
WX_MAJOR_VERSION_NUMBER="@WX_MAJOR_VERSION_NUMBER@" WX_MAJOR_VERSION_NUMBER="@WX_MAJOR_VERSION_NUMBER@"
WX_MINOR_VERSION_NUMBER="@WX_MINOR_VERSION_NUMBER@" WX_MINOR_VERSION_NUMBER="@WX_MINOR_VERSION_NUMBER@"
WX_RELEASE_NUMBER="@WX_RELEASE_NUMBER@" WX_RELEASE_NUMBER="@WX_RELEASE_NUMBER@"
WX_SUBRELEASE_NUMBER="@WX_SUBRELEASE_NUMBER@"
release="@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@" release="@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@"
is_monolithic="@MONOLITHIC@" is_monolithic="@MONOLITHIC@"
cross_compiling="@cross_compiling@" cross_compiling="@cross_compiling@"
@@ -149,7 +150,7 @@ usage()
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace] Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace]
[--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]] [--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]]
[--universal[=yes|no]] [--host=HOST] [--universal[=yes|no]] [--host=HOST]
[--version[=VERSION]] [--release] [--version[=VERSION]] [--version-full] [--release]
[--list] [--basename] [--static] [--libs] [--gl-libs] [--list] [--basename] [--static] [--libs] [--gl-libs]
[--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags] [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
[--cc] [--cxx] [--ld] [LIBRARIES] [--cc] [--cxx] [--ld] [LIBRARIES]
@@ -292,6 +293,9 @@ while test $# -gt 0; do
--version) --version)
echo ${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.${WX_RELEASE_NUMBER} echo ${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.${WX_RELEASE_NUMBER}
;; ;;
--version-full)
echo ${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.${WX_RELEASE_NUMBER}.${WX_SUBRELEASE_NUMBER}
;;
--release) --release)
echo $release echo $release
;; ;;