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

Limit the influence of flavour more strictly to autoconf format.

Browse Source 
Remove '-' and '.' from the $release tag for non autoconf platform.
This may like slightly finer tuning than that for some people.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-26 08:46:55 +00:00
parent cc3388ae63
commit a1bf307a46
147 changed files with 1155 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
build/bakefiles/common.bkl
View File

@@ -22,12 +22,18 @@
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
<set var="WX_VERSION" make_var="1">
$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</set>
<set var="WX_RELEASE" make_var="1">
$(WXVER_MAJOR).$(WXVER_MINOR)
</set>
<set var="WX_RELEASE_NODOT" make_var="1">
$(WXVER_MAJOR)$(WXVER_MINOR)
</set>
<set var="WX_VERSION" make_var="1">
$(WX_RELEASE).$(WXVER_RELEASE)
</set>
<set var="WX_VERSION_NODOT" make_var="1">
$(WX_RELEASE_NODOT)$(WXVER_RELEASE)
</set>
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
@@ -37,8 +43,8 @@
</set>
<set var="WXMACVERSION">$(WX_VERSION)</set>
<set var="WXWIN32DLLVERSION">
<if cond="WX_STABLE_BRANCH=='1'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
<if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
</set>
@@ -90,14 +96,14 @@
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
<set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">
wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
</set>
<set var="WXNAMEPREFIXGUI">
wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
@@ -263,7 +269,12 @@
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
<libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
<if cond="FORMAT=='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
</if>
<if cond="FORMAT!='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)</libname>
</if>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWidgets; otherwise they are embedded in shared libs:
@@ -504,22 +515,14 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">
$(WXVER_MAJOR).$(WXVER_MINOR)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)
</if>
<if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">
$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
</if>
<if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
</set>
</if>
<set var="PLUGVERDELIM">

2
build/bakefiles/common_contrib.bkl
View File

@@ -33,6 +33,6 @@
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
<install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)$(WX_FLAVOUR)</install-to>
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
</template>
</makefile>

13
build/bakefiles/expat.bkl
View File

@@ -3,13 +3,20 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_EXPAT"/>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_EXPAT">builtin</set>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
</set>
<set var="INC_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
</set>

15
build/bakefiles/jpeg.bkl
View File

@@ -3,15 +3,20 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBJPEG"/>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBJPEG">builtin</set>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
</set>

15
build/bakefiles/png.bkl
View File

@@ -3,15 +3,20 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBPNG"/>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBPNG">builtin</set>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
</set>

20
build/bakefiles/regex.bkl
View File

@@ -5,6 +5,11 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">
@@ -12,17 +17,24 @@
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<libname>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
<libname cond="FORMAT=='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</libname>
<libname cond="FORMAT!='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<define>__WX$(TOOLKIT)__</define>

15
build/bakefiles/tiff.bkl
View File

@@ -3,6 +3,11 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBTIFF"/>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBTIFF">
@@ -10,12 +15,12 @@
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
</set>

6
build/bakefiles/wx.bkl
View File

@@ -53,11 +53,11 @@
<data-files-tg id="install-afm" cond="USE_GUI=='1'">
<files>misc/afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)$(WX_FLAVOUR)/afm</install-to>
<install-to>$(DATADIR)/wx/$(WX_RELEASE)$(WX_FLAVOUR)/afm</install-to>
</data-files-tg>
<data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
<files>misc/gs_afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)$(WX_FLAVOUR)/gs_afm</install-to>
<install-to>$(DATADIR)/wx/$(WX_RELEASE)$(WX_FLAVOUR)/gs_afm</install-to>
</data-files-tg>
<action id="install-wxconfig">
@@ -80,7 +80,7 @@
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
<install-to>
$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)$(WX_FLAVOUR)
$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
</install-to>
</headers>

13
build/bakefiles/zlib.bkl
View File

@@ -3,13 +3,20 @@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_ZLIB"/>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">
wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_ZLIB">builtin</set>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">
wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>
</set>