Commit Graph

63 Commits

Author SHA1 Message Date
Kevin Ollivier
19beefa6f3 On Mac, ensure that the library path and dependencies point to the right location whether or not the library is installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 16:07:56 +00:00
Vadim Zeitlin
b158f13e16 avoid bakefile warnings about actions unsupported in MSVS formats by not using them in this case (this doesn't change the generated project files anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-25 18:49:29 +00:00
Václav Slavík
aa163cb549 removed a warning that should only be a FIXME
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-12 13:03:53 +00:00
Vadim Zeitlin
7da8bfe30d add VC9 project files (closes #9960)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-08 16:42:00 +00:00
Francesco Montorsi
417f513723 add wx_xrc.bkl bakefile wxpreset to the list of files to install; set Id in the svn:keyword for that file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-07 17:51:13 +00:00
Vadim Zeitlin
98a04b4a2a test for utils/wxrc/Makefile existence and not utils/wxrc which always exists when building in source directory (#9928)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-31 16:29:11 +00:00
Václav Slavík
bad4a10f24 silence warnings about <headers>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 11:29:35 +00:00
Václav Slavík
2275c73268 updated bakefiles to take advantage of Bakefile 0.2.3 (now required)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 12:04:13 +00:00
Václav Slavík
7a4fa5692d Added support for Visual C++ 2003 project files (still disabled until Bakefile 0.2.3 release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 21:54:54 +00:00
Václav Slavík
1ff18f49b9 added support for Bakefile's upcoming msvs2005prj format (not enabled by default yet, would fail with the latest released version otherwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:03:23 +00:00
Václav Slavík
710526dea5 fixed wx-config symlink creation with non-empty DESTDIR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-15 15:46:11 +00:00
Václav Slavík
09abe5d47d fixed makefiles to fail if building wxrc fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-28 10:38:22 +00:00
David Elliott
891ace0538 Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS).
Don't check for windres as bakefile.m4 now does it properly.
Rename MACRESCOMP to POSTLINK_COMMAND.
Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND.
Use newest bakefile.m4 (with similar changes).
Add --rezflags option back to wx-config so existing user Makefiles don't break.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 04:51:08 +00:00
Michael Wetherell
58b59bb7d5 rcdefs.h is a real file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 15:36:33 +00:00
Włodzimierz Skiba
2a4d2d4680 'rcdefs.h' action has to be phony, otherwise it is expected to be file existing after action execution.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 19:59:29 +00:00
Michael Wetherell
47bff9ff8b Correct the directory rcdefs.h installs to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 00:10:31 +00:00
Michael Wetherell
c8d5853155 Add rcdefs.h and support for automatic manifests on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:49:46 +00:00
Michael Wetherell
2f5e790cb1 Restore ALL_BASE_HEADERS to its previous meaning of 'all for a given port' as
it is used in this sense in rpmspec.bkl, add ALL_PORTS_BASE_HEADERS for
'make dist', and rebake.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 20:50:46 +00:00
Włodzimierz Skiba
712593b003 More ports in non autoconf formats.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 13:54:37 +00:00
Michael Wetherell
2b5e2b5847 Fix for 'make dist' to include headers for all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 16:22:31 +00:00
Václav Slavík
9f0ff522c7 fixed presets installation for scrdir!=. case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 19:00:24 +00:00
Vadim Zeitlin
abc1acc90d removed stray ^Ms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 14:27:02 +00:00
Václav Slavík
07910a9a7e install bakefile presets (patch 1253143)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 19:20:18 +00:00
Michael Wetherell
4d931bcca0 Translate '&Help' to '&' for italian Windows only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 15:29:57 +00:00
Włodzimierz Skiba
1dba7b4c69 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:30:41 +00:00
Robin Dunn
a4297f6a8c Remove rules for building resource files on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-13 22:57:18 +00:00
Václav Slavík
7b3dba4927 fixed wxrc's dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-09 23:01:35 +00:00
Julian Smart
e2ac17aa7a Further AFM removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-15 13:20:19 +00:00
Ron Lee
10f206ad20 For autoconf/unix builds update the hardcoded afm dir too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 07:50:21 +00:00
Václav Slavík
f9e1c3c501 fixed wxrc installation and cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 12:53:00 +00:00
Václav Slavík
92a50a3990 fixed AFM metrics installation so that PostScript printing works again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 16:26:51 +00:00
Václav Slavík
c62d80605f don't cd into utils/xrc if USE_XRC=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 21:55:11 +00:00
Václav Slavík
e30fbc5234 build and install wxrc by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:20:34 +00:00
Ron Lee
148e141b23 Enable concurrent installs of runtime packages after a soname change.
Add a common package for afm metrics, and other 'static' data and utilities.
Remove the version/flavour from afm installs on unix as discussed with Vaclav,
these files really do never change.
Mention --static along with other selection options in --help.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 14:47:08 +00:00
Ron Lee
a1bf307a46 Limit the influence of flavour more strictly to autoconf format.
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
2004-09-26 08:46:55 +00:00
Ron Lee
ceec2216bd wx-config2.6
Designed to be resiliant against future cut and paste coders.  Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble.  In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs.  Functions now all have api
descriptions.  If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.

Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer.  Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future.  In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied.  If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested.  At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.

Removed references to --gl-libs in --help.  It still exists, but if
its deprecated, no need to fill space in a compact help summary.  It
will remain documented (as deprecated) in the man page.

Removed references to arcane order rules for arguments.  Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.

Removed references to --inplace, it doesn't need to be in the summary
help either.  It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly.  When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case).  If you do type it when you don't need it, bad things will
probably happen just like they always would have.

Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging.  If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.

Command line input is now controlled by a small generic parser.  You
define what options you want and what groups you want them in by
initialising them as lists.  It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.

Added a validator for it to check yes/no options.

Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.

Made --list more user friendly.  It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix.  Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called.  We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.

Delegation.  Too big a topic to remark on in depth here, see the code
for a fuller description.  With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified.  This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.

Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.

Added the inplace-config tweak for use in the build tree.  This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed.  It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with.  In that event, it will try to delegate as per the
normal rules.

The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs.  It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)

Enabled full support for static builds again, promoted --static to a
full feature option.  Fixed --ld to return something for them too.

Added --flavour, similar to the existing --vendor, but for autoconf
builds.  These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.

Fix bit rot in make-dist due to new/deleted files.

Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution.  Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about.  Remove extra files and symlinks added for the two
part wx-config version.

Removed the debian -contrib packages.  We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required.  This means the retained contribs will
now get __WXDEBUG__ versions packaged too.

Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.

Added support for flavoured debs as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
Václav Slavík
a92d711e45 ABX's changes to support MGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-14 20:22:23 +00:00
Václav Slavík
4b167aca0c moved wx-config to wx-config-VERSION (with symlink), to satisfy Debian packagers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-11 20:37:33 +00:00
Václav Slavík
166bcebb8e install headers in prefix/include/wx-version/wx/ instead of prefix/include/wx/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 08:28:28 +00:00
Václav Slavík
48112931db fixes to wx-config config name matching
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-21 10:17:51 +00:00
Václav Slavík
8708fa7618 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-18 11:19:34 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Václav Slavík
af594ecaf1 added support for building eVC projects (not yet tested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 20:20:57 +00:00
David Elliott
bdcc580c3d Update Rez command to reflect new location for .r files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-31 20:49:39 +00:00
Václav Slavík
c79241a238 changes to make building plugins possible; build wxSound SDL plugin on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:31:54 +00:00
Václav Slavík
5d1000e7f1 generate build.cfg file on Windows, with information about settings used to build the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 23:33:24 +00:00
Václav Slavík
004779cd73 added DESTDIR support to make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 21:00:27 +00:00
Václav Slavík
d424f5ae6d more visible banner after installation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:07:58 +00:00
Václav Slavík
ee929bcff4 change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:20:32 +00:00
Václav Slavík
065a32a58f install locales
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:11:21 +00:00