Mercurial > hg > xemacs-beta
annotate lib-src/config.values.sh @ 4874:4c3f5e1ecbeb
ChangeLog for previous patch: regenerate intl-auto-encap-win32.c
(fix build problems when building --with-msw=no on Cygwin)
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* make-mswin-unicode.pl:
Various fixes to get this to work when using the Cygwin header files
in /usr/include/w32api instead of the VC++ ones:
-- Use /usr/include/w32api as default; don't assume that a passed-in
directory always ends in .../include.
-- Add `const' to list of known type modifiers.
-- If function already seen, warn but don't generate twice.
-- Eliminate `extern' from return type modifiers.
-- Cosmetic: When eliminating APIENTRY, also eliminate following
whitespace.
src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* intl-auto-encap-win32.c:
* intl-auto-encap-win32.c (qxeExtractAssociatedIcon):
* intl-auto-encap-win32.c (qxeShellExecuteEx):
* intl-auto-encap-win32.c (qxeSHFileOperation):
* intl-auto-encap-win32.c (qxeSHQueryRecycleBin):
* intl-auto-encap-win32.c (qxeSHEmptyRecycleBin):
* intl-auto-encap-win32.c (qxeWNetAddConnection):
* intl-auto-encap-win32.c (qxeWNetAddConnection2):
* intl-auto-encap-win32.c (qxeWNetAddConnection3):
* intl-auto-encap-win32.c (qxeWNetCancelConnection):
* intl-auto-encap-win32.c (qxeWNetCancelConnection2):
* intl-auto-encap-win32.c (qxeWNetGetConnection):
* intl-auto-encap-win32.c (qxeWNetUseConnection):
* intl-auto-encap-win32.c (qxeWNetConnectionDialog1):
* intl-auto-encap-win32.c (qxeWNetDisconnectDialog1):
* intl-auto-encap-win32.c (qxeWNetOpenEnum):
* intl-auto-encap-win32.c (qxeWNetEnumResource):
* intl-auto-encap-win32.c (qxeWNetGetUniversalName):
* intl-auto-encap-win32.c (qxeWNetGetUser):
* intl-auto-encap-win32.c (qxeWNetGetProviderName):
* intl-auto-encap-win32.c (qxeWNetGetNetworkInformation):
* intl-auto-encap-win32.c (qxeWNetGetLastError):
* intl-auto-encap-win32.c (qxeMultinetGetConnectionPerformance):
* intl-auto-encap-win32.c (qxeAppendMenu):
* intl-auto-encap-win32.c (qxeCopyAcceleratorTable):
* intl-auto-encap-win32.c (qxeDlgDirSelectComboBoxEx):
* intl-auto-encap-win32.c (qxeEnumDesktops):
* intl-auto-encap-win32.c (qxeEnumWindowStations):
* intl-auto-encap-win32.c (qxeGetClassInfo):
* intl-auto-encap-win32.c (qxeGetClassLong):
* intl-auto-encap-win32.c (qxeGetClassName):
* intl-auto-encap-win32.c (qxeGetKeyboardLayoutName):
* intl-auto-encap-win32.c (qxeGetWindowLong):
* intl-auto-encap-win32.c (qxeGetUserObjectInformation):
* intl-auto-encap-win32.c (qxeGetWindowTextLength):
* intl-auto-encap-win32.c (qxeGrayString):
* intl-auto-encap-win32.c (qxeInsertMenu):
* intl-auto-encap-win32.c (qxeSetProp):
* intl-auto-encap-win32.c (qxeEnumICMProfiles):
* intl-auto-encap-win32.c (qxeExtTextOut):
* intl-auto-encap-win32.c (qxeSetICMProfile):
* intl-auto-encap-win32.c (qxeTextOut):
* intl-auto-encap-win32.c (qxeSHGetPathFromIDList):
* intl-auto-encap-win32.c (qxeFindText):
* intl-auto-encap-win32.c (qxeReplaceText):
* intl-auto-encap-win32.c (qxeImmInstallIME):
* intl-auto-encap-win32.c (qxeImmGetDescription):
* intl-auto-encap-win32.c (qxeImmGetIMEFileName):
* intl-auto-encap-win32.c (qxeImmGetCompositionString):
* intl-auto-encap-win32.c (qxeImmGetCandidateListCount):
* intl-auto-encap-win32.c (qxeImmGetCandidateList):
* intl-auto-encap-win32.c (qxeImmGetGuideLine):
* intl-auto-encap-win32.c (qxeImmConfigureIME):
* intl-auto-encap-win32.c (qxeImmEscape):
* intl-auto-encap-win32.c (qxeImmGetConversionList):
* intl-auto-encap-win32.c (qxeImmRegisterWord):
* intl-auto-encap-win32.c (qxeImmUnregisterWord):
* intl-auto-encap-win32.c (qxeImmEnumRegisterWord):
* intl-auto-encap-win32.c (qxesndPlaySound):
* intl-auto-encap-win32.c (qxePlaySound):
* intl-auto-encap-win32.c (qxewaveOutGetErrorText):
* intl-auto-encap-win32.c (qxewaveInGetErrorText):
* intl-auto-encap-win32.c (qxemidiOutGetErrorText):
* intl-auto-encap-win32.c (qxemidiInGetErrorText):
* intl-auto-encap-win32.c (qxemmioStringToFOURCC):
* intl-auto-encap-win32.c (qxemmioInstallIOProc):
* intl-auto-encap-win32.c (qxemmioOpen):
* intl-auto-encap-win32.c (qxemmioRename):
* intl-auto-encap-win32.c (qxemciSendCommand):
* intl-auto-encap-win32.c (qxemciSendString):
* intl-auto-encap-win32.c (qxemciGetDeviceID):
* intl-auto-encap-win32.c (qxemciGetErrorString):
* intl-auto-encap-win32.h:
* intl-auto-encap-win32.h (qxemciGetErrorString):
Regenerate these files from Cygwin headers.
* intl-encap-win32.c:
Bracket more functions in HAVE_MS_WINDOWS, to fix build problems
when building --with-msw=no on Cygwin.
Fixes for Cygwin headers:
-- Comment out IME.H, non-existent in Cygwin.
-- Make MessageBoxIndirect a `no' (don't encapsulate but generate
error if used) because it has a structure parameter that needs
to be A/W split but is declared as FOO*, and our parser can't
split this.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 15 Jan 2010 05:12:07 -0600 |
| parents | 3580ae2ce979 |
| children | e6508b64ee08 308d34e9f07d |
| rev | line source |
|---|---|
| 434 | 1 : #-*- Perl -*- |
| 2 eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge | |
| 3 if 0; | |
| 4 | |
| 428 | 5 # config.values.sh --- create config.values.in from ../configure |
| 6 | |
| 7 # Author: Martin Buchholz | |
| 8 # Maintainer: Martin Buchholz | |
| 9 # Keywords: configure elisp report-xemacs-bugs | |
| 10 | |
| 11 # This file is part of XEmacs. | |
| 12 | |
| 13 # XEmacs is free software; you can redistribute it and/or modify it | |
| 14 # under the terms of the GNU General Public License as published by | |
| 15 # the Free Software Foundation; either version 2, or (at your option) | |
| 16 # any later version. | |
| 17 | |
| 18 # XEmacs is distributed in the hope that it will be useful, but | |
| 19 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 # General Public License for more details. | |
| 22 | |
| 23 # You should have received a copy of the GNU General Public License | |
| 24 # along with XEmacs; see the file COPYING. If not, write to | |
| 25 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 # Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ### Commentary: | |
| 29 | |
| 30 ## Extract all the @foo@ configuration symbols from ../configure | |
| 31 ## to make them available to elisp later (see util/config.el) | |
| 32 ## Primarily useful for creating ridiculously verbose bug reports. | |
| 33 ## | |
| 543 | 34 ## See lisp/config.el, ../configure.in, |
| 428 | 35 ## and the Autoconf documentation on AC_OUTPUT, for more details. |
| 36 ## | |
| 37 ## This script needs only to be run occasionally (before a Net release) | |
| 38 ## by an XEmacs Maintainer (consider yourself so blessed, if you are | |
| 39 ## actually reading this commentary). | |
| 40 ## | |
| 434 | 41 |
| 42 if (! -r "./configure") { | |
| 43 chdir ".." or die "Can't chdir: $!"; | |
| 44 if (! -r "./configure") { | |
| 45 die "Can't find configure!"; | |
| 46 } | |
| 47 } | |
| 428 | 48 |
| 434 | 49 sub FileContents { |
| 50 local $/ = undef; # Slurp mode | |
| 51 open (FILE, "< $_[0]") or die "$_[0]: $!"; | |
| 52 my $contents = <FILE>; | |
| 53 close FILE or die "$_[0]: $!"; | |
| 54 return $contents; | |
| 55 } | |
| 56 | |
| 57 my $configure_contents = FileContents "./configure"; | |
| 58 my $cvi_contents = FileContents "lib-src/config.values.in"; | |
| 59 | |
| 60 my $new_cvi_contents = | |
| 61 ";;; Do not edit this file! | |
| 428 | 62 ;;; This file was automatically generated, by the config.values.sh script, |
| 63 ;;; from configure, which was itself automatically generated from configure.in. | |
| 64 ;;; | |
| 543 | 65 ;;; See lisp/config.el for details on how this file is used. |
| 428 | 66 ;;; |
| 67 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated... | |
| 68 | |
| 69 ;;; configure is created, from configure.in, by autoconf | |
| 70 ;;; config.values.in is created, from configure, by config.values.sh | |
| 71 ;;; config.values is created, from config.values.in, by configure | |
| 543 | 72 ;;; config.values is read by lisp/config.el, |
| 428 | 73 ;;; to create the (Lisp object) config-value-hash-table |
| 74 | |
| 75 ;;; Variables defined in configure by AC_SUBST follow: | |
| 76 ;;; (These are used in Makefiles) | |
| 77 | |
| 434 | 78 "; |
| 428 | 79 |
| 434 | 80 my %done; |
| 81 for my $var (sort { $a cmp $b } | |
| 82 $configure_contents =~ | |
| 2651 | 83 /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) { |
| 434 | 84 $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var}; |
| 85 $done{$var} = 1; | |
| 86 } | |
| 87 | |
| 88 $new_cvi_contents .= " | |
| 428 | 89 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow: |
| 90 ;;; (These are used in C code) | |
| 91 | |
| 434 | 92 "; |
| 93 | |
| 94 if ($cvi_contents ne $new_cvi_contents) { | |
| 95 unlink "lib-src/config.values.in"; | |
| 96 open (CVI, "> lib-src/config.values.in") | |
| 97 or die "lib-src/config.values.in: $!"; | |
| 98 print CVI $new_cvi_contents; | |
| 99 close CVI | |
| 100 or die "lib-src/config.values.in: $!"; | |
| 101 } |