1 |
dirtyepic 07/12/21 04:32:41 |
2 |
|
3 |
Modified: wxwidgets.eclass |
4 |
Log: |
5 |
Update documentation. |
6 |
|
7 |
Revision Changes Path |
8 |
1.24 eclass/wxwidgets.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/wxwidgets.eclass?rev=1.24&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/wxwidgets.eclass?rev=1.24&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/wxwidgets.eclass?r1=1.23&r2=1.24 |
13 |
|
14 |
Index: wxwidgets.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v |
17 |
retrieving revision 1.23 |
18 |
retrieving revision 1.24 |
19 |
diff -u -r1.23 -r1.24 |
20 |
--- wxwidgets.eclass 25 Nov 2007 14:19:39 -0000 1.23 |
21 |
+++ wxwidgets.eclass 21 Dec 2007 04:32:41 -0000 1.24 |
22 |
@@ -1,38 +1,44 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.23 2007/11/25 14:19:39 swegener Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.24 2007/12/21 04:32:41 dirtyepic Exp $ |
27 |
|
28 |
# @ECLASS: wxwidgets.eclass |
29 |
# @MAINTAINER: |
30 |
-# dirtyepic@g.o |
31 |
# wxwindows@g.o |
32 |
# @BLURB: Manages build configuration for wxGTK-using packages. |
33 |
# @DESCRIPTION: |
34 |
# The wxGTK libraries come in several different possible configurations |
35 |
-# (release/debug, ansi/unicode, etc.), most of which can be installed |
36 |
-# side-by-side. The purpose of this eclass is to give ebuilds the ability to |
37 |
-# specify what particular flavour they require to build against without |
38 |
-# interfering with the user-set system configuration. |
39 |
+# (release/debug, ansi/unicode, etc.) some of which can be installed |
40 |
+# side-by-side. The purpose of this eclass is to provide ebuilds the ability |
41 |
+# to build against a specific type without interfering with the user-set |
42 |
+# system configuration. |
43 |
# |
44 |
# Ebuilds that use wxGTK must inherit this eclass. Otherwise the system |
45 |
-# default will be used, which would be anything the user set it to. |
46 |
+# default will be used, which would be anything the user set it to through |
47 |
+# eselect-wxwidgets. |
48 |
# |
49 |
-# Ebuilds are also required to set the global variable WX_GTK_VER, containing |
50 |
-# the wxGTK SLOT the ebuild requires. Note that in order for this to work, |
51 |
-# WX_GTK_VER needs to be set before inheriting the eclass. |
52 |
+# Ebuilds are also required to set the variable WX_GTK_VER, containing |
53 |
+# the wxGTK SLOT the ebuild requires. You can either set this before the |
54 |
+# inherit line to get the default type for that SLOT, or later before calling |
55 |
+# the need-wxwidgets function. |
56 |
# |
57 |
# Simple Usage: |
58 |
# |
59 |
-# WX_GTK_VER="2.6" |
60 |
-# inherit wxwidgets |
61 |
-# DEPEND="=x11-libs/wxGTK-2.6*" |
62 |
-# RDEPEND="=x11-libs/wxGTK-2.6*" |
63 |
-# |
64 |
-# That's it. The eclass will select a sane default configuration to use. In |
65 |
-# wxGTK-2.6 the default is ansi. In wxGTK-2.8 and later it's unicode. These |
66 |
-# are the defaults because they are always guaranteed to exist. |
67 |
+# @CODE |
68 |
+# WX_GTK_VER="2.6" |
69 |
# |
70 |
-# You'll often find yourself in need of a bit more control. For that see the |
71 |
+# inherit wxwidgets |
72 |
+# |
73 |
+# DEPEND="=x11-libs/wxGTK-2.6*" (or x11-libs/wxGTK:2.6 for EAPI 1) |
74 |
+# RDEPEND="${DEPEND}" |
75 |
+# [...] |
76 |
+# @CODE |
77 |
+# |
78 |
+# The eclass will select the default configuration, which is "ansi" in 2.6 |
79 |
+# and "unicode" in >=2.8. These are the defaults because they're always |
80 |
+# guaranteed to exist. |
81 |
+# |
82 |
+# If you need more control over which version you need to use, see the |
83 |
# need-wxwidgets function below. |
84 |
|
85 |
inherit eutils multilib |
86 |
@@ -67,25 +73,28 @@ |
87 |
# @FUNCTION: need-wxwidgets |
88 |
# @USAGE: <configuration> |
89 |
# @DESCRIPTION: |
90 |
+# |
91 |
# need-wxwidgets is called with one argument, the wxGTK configuration to use. |
92 |
# |
93 |
# Available configurations are: |
94 |
# |
95 |
-# ansi |
96 |
-# unicode |
97 |
-# base-ansi |
98 |
-# base-unicode |
99 |
+# ansi |
100 |
+# unicode |
101 |
+# base-ansi |
102 |
+# base-unicode |
103 |
# |
104 |
# Note that in >=wxGTK-2.8, only the unicode versions are available. The |
105 |
-# eclass will automatically map ansi to unicode if WX_GTK_VER is set to 2.8 or |
106 |
-# later. |
107 |
-# |
108 |
-# There is one deprecated configuration, gtk2, that is equivalent to ansi. |
109 |
-# It is around for historical reasons and shouldn't be used by new ebuilds. |
110 |
+# eclass will automatically map ansi to unicode for you if WX_GTK_VER is |
111 |
+# set to 2.8 or later. |
112 |
# |
113 |
-# This function will set the variable WX_CONFIG to the path of the wx-config |
114 |
-# script to use. In most cases you shouldn't have to use it since the |
115 |
-# /usr/bin/wx-config wrapper points to ${WX_CONFIG} when called from portage. |
116 |
+# There is one deprecated configuration, "gtk2", which is equivalent to ansi. |
117 |
+# This is leftover from 2.4 when we had gtk1 and gtk2 builds and shouldn't |
118 |
+# be used by new ebuilds. |
119 |
+# |
120 |
+# This function will export the variable WX_CONFIG, containing the absolute |
121 |
+# path to the wx-config script to use. In most cases you shouldn't need to |
122 |
+# use it since the /usr/bin/wx-config wrapper will already point to that |
123 |
+# location when called from the eclass, but it's here if you do. |
124 |
|
125 |
need-wxwidgets() { |
126 |
debug-print-function $FUNCNAME $* |
127 |
@@ -161,7 +170,7 @@ |
128 |
# since we're no longer in global scope we call built_with_use instead of |
129 |
# all the crazy looping |
130 |
|
131 |
- # base can be provided by both gtk2 and base installations |
132 |
+ # wxBase can be provided by both gtk2 and base installations |
133 |
if built_with_use =x11-libs/wxGTK-${WX_GTK_VER}* X; then |
134 |
wxtoolkit="gtk2" |
135 |
else |
136 |
@@ -194,13 +203,10 @@ |
137 |
|
138 |
debug-print "Found config ${wxconf} - setting WX_CONFIG" |
139 |
|
140 |
- # This is exported as some configure scripts will check for its presence in |
141 |
- # the environment. |
142 |
export WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" |
143 |
|
144 |
debug-print "WX_CONFIG is ${WX_CONFIG}" |
145 |
|
146 |
- # TODO: Used by the wx-config wrapper |
147 |
export WX_ECLASS_CONFIG="${WX_CONFIG}" |
148 |
|
149 |
echo |
150 |
@@ -213,6 +219,7 @@ |
151 |
# @FUNCTION: check_wxuse |
152 |
# @USAGE: <USE flag> |
153 |
# @DESCRIPTION: |
154 |
+# |
155 |
# Provides a consistant way to check if wxGTK was built with a particular USE |
156 |
# flag enabled. |
157 |
|
158 |
|
159 |
|
160 |
|
161 |
-- |
162 |
gentoo-commits@g.o mailing list |