Commit Graph

570 Commits

Author SHA1 Message Date
Wez Furlong
f5e4590fd5 tweak snap build 2004-01-07 23:11:54 +00:00
Wez Furlong
48b96c10d2 glob-ify lib checks; this simplifies writing of config.w32 files a little. 2004-01-07 20:06:32 +00:00
Wez Furlong
9720a31bd6 A more general check for dirs under Release or Debug. 2003-12-23 17:20:50 +00:00
Wez Furlong
5d5f2619b3 Proper check for resolv.lib 2003-12-23 16:01:41 +00:00
Wez Furlong
03d426f6a6 implement our own tiny little dependcy tracker and use
it to build distros.
2003-12-23 15:33:13 +00:00
Wez Furlong
8f3f09f315 Attempt to work around apparent problems with WshShell.CurrentDirectory.
# Andi, please try this now
2003-12-23 13:10:54 +00:00
Wez Furlong
b8978cad26 Better implementation of the prefix thing 2003-12-23 12:40:41 +00:00
Frank M. Kromann
835f6beab8 Adding install target that follows the prefix 2003-12-23 05:43:19 +00:00
Wez Furlong
475821225d Implement a glob() function for use by win32 configure. 2003-12-23 01:55:33 +00:00
Wez Furlong
482ae86d1f win32 buildconf now honours extension dependencies and will
try its best to ensure that the config.w32 files are amalgamated
in such a way that modules are processed before their dependents.
2003-12-23 01:54:07 +00:00
Frank M. Kromann
86c302f590 Use a variable name so this actually works. 2003-12-23 00:36:32 +00:00
Frank M. Kromann
3a6a3dd816 Fix build when both a path and the keyword shared is given
Now works for both <path>,shared and shared,<path>
2003-12-23 00:17:15 +00:00
Wez Furlong
4b76493f1e Don't annoy people building snaps/dists using VC6 2003-12-22 22:48:29 +00:00
Wez Furlong
fc292fc259 For GD, build the extension as php_gd2.dll instead of php_gd.dll.
Thanks again Frank :-)
2003-12-22 22:33:43 +00:00
Wez Furlong
42ed91f94c Fix bug #26692; Could not find GetLongPathNameA under NT4.
This fix relies on you having the Platform SDK headers.
Using the new build system, the NewAPIs.h header will be detected
automatically, however, for people building using .dsp files,
you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project
if you have those newer headers.
2003-12-22 15:01:05 +00:00
Wez Furlong
113165bd95 Add --enable-snapshot-build configure option for win32 build.
Using it will attempt to switch on any configure options that
were left to their default value of "no".

Add a "snap" target to the makefile which will run a sub-process
to make each SAPI and EXT independently, so that the whole process
does not bail out if a particular extension is broken.

Add a way to specify dependencies between extensions in the
config.w32 files so that the makefile will include appropriate rules
and linkage.
2003-12-22 13:13:39 +00:00
Wez Furlong
deb3bff21a Forgot to add embed config.w32, and tweak version resource when CREDITS file is missing. 2003-12-19 23:19:19 +00:00
Wez Furlong
4084ed9edf Export flock for win32 2003-12-19 23:18:14 +00:00
Wez Furlong
331dc79254 More things for the new build system.
Pi3Web and aolserver build untested (no headers and libs for those here)
2003-12-19 20:39:04 +00:00
Wez Furlong
9ecd238b6b don't overwrite internal_functions.c if the content did not change;
this saves re-linking php*.dll when you add shared extensions to
your config.
2003-12-19 16:55:59 +00:00
Wez Furlong
ee44dd3d79 "Real" cvsclean, works as the unix version does 2003-12-19 12:51:19 +00:00
Wez Furlong
a3075773ee Refinements for new build system:
- Add major + minor version to .dll and .exe headers during linking
- Handle pecl build dir correctly when pecl is a sibling of php-src
- try and guess where your cygwin utils are installed (if you have them)
  so that we can detect bison, flex etc.
- other little refinements
2003-12-19 12:50:11 +00:00
Wez Furlong
7027baee22 this should be an int 2003-12-19 12:44:22 +00:00
Wez Furlong
33ed73cb51 make it totally safe again 2003-12-18 11:32:19 +00:00
Wez Furlong
8959c7bc0d make sure this is initialized to NULL as we don't check the return
value of the FormatMessage function; we could end up using a stale
pointer.
2003-12-18 11:16:16 +00:00
Marcus Boerger
e649692565 Leak for b3 and find a better solution until RC1 2003-12-18 11:05:20 +00:00
Marcus Boerger
490fd0eaf2 Fix a memleak: A second call to *nix version of dlerror() frees the error
string. This behavior is also adapted to the win build so that the buffer
returned by FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER) can be freed too.
2003-12-17 11:20:35 +00:00
Ilia Alshanetsky
c3043fb2e4 Removed unused variable. 2003-12-15 03:15:50 +00:00
Frank M. Kromann
819b2e56f9 Exporting symbols used in the imap extension 2003-12-08 22:10:42 +00:00
Rob Richards
c821c5b189 export libxml2 and iconv symbols
extensions no longer link against either of those
2003-12-08 12:56:47 +00:00
Wez Furlong
72f73b7785 tweak build so that it mirrors the source filesystem layout under the build dir. This allows GD extension to build. 2003-12-07 02:58:56 +00:00
Wez Furlong
3be2b8d7e4 Add dist target to makefile that will generate the file layout for
a win32 binary distro under build_dir/_dist_.
This isn't finalized yet, and you need Edin's distro template.
2003-12-06 16:14:03 +00:00
Wez Furlong
fcdda2e8f8 Fix a problem resolving the php.ini path under win32 terminal services environment.
Remove config-file-path option from configure under win32; it is not used except to display what might have been chosen, so lets default to the getenv() thingy.
2003-12-06 16:04:34 +00:00
Wez Furlong
6b679cd6ef fix ipv6 stuff under vc6 2003-12-06 10:32:35 +00:00
Wez Furlong
dbb152b96a Detect and enable IPv6 support under win32.
The ws2tcpip.h header links to IPv6 functions dynamically
and the generated binary will run on win98 and later.
2003-12-06 00:00:31 +00:00
Wez Furlong
190d8e85b5 2003, not 2002. 2003-12-05 23:13:57 +00:00
Frank M. Kromann
29e47dc7e4 Move the echo off statement to the top of the file. This removes commens from the final def file 2003-12-05 19:51:52 +00:00
Wez Furlong
9ec9ffece8 convert to DOS line endings to solve win98 issues 2003-12-05 17:45:15 +00:00
Wez Furlong
6201a56070 use /Ox flag for release build (all optimizations on).
If no php_build dir is specified, then look for either of the two
"standard" things in reasonable locations.
Allow CHECK_LIB to search for the "same" library using a ; separated
list of alternatives.
Tweak nsapi config and remove redundant or unused flags.
Add ZTS checks for both isapi and nsapi configs.
2003-12-05 02:41:00 +00:00
Wez Furlong
a93d20b443 Avoid killing files that we didn't generate when making clean. 2003-12-04 17:28:08 +00:00
Frank M. Kromann
d0624948ff fix remaining ext/ 2003-12-04 17:03:20 +00:00
foobar
2438b43eff - remove non-existing files 2003-12-04 15:14:03 +00:00
foobar
e095ae8629 - remove non-existing files 2003-12-04 15:02:48 +00:00
foobar
f1bf598edb - remove non-existing modules 2003-12-04 14:53:27 +00:00
Wez Furlong
a5cf836260 Fix libxml to use static lib if found.
Disable apache and isapi by default.
Add some smarts so that we can really build extensions and SAPI found in php-src/pecl and/or php-src/../pecl.
Only include a logo in the resources if we are building an .exe.
2003-12-04 13:38:47 +00:00
Rob Richards
c561f2f722 return status of have so extra libs return correct status 2003-12-04 12:34:29 +00:00
Wez Furlong
1635a2bdf5 put PHPDLL objects into BUILD_DIR/php so that it is a little
easier to see the main outputs (sapi and extensions)
2003-12-04 02:24:23 +00:00
Wez Furlong
7e73ae1b5e fix a couple of buglets and set version number on DLLs to whatever the PHP major version is. 2003-12-04 02:12:36 +00:00
Wez Furlong
90fe3fbf7f be safe... 2003-12-04 01:59:46 +00:00
Wez Furlong
fb84259217 Search for pecl extensions under php-src/pecl as a convenience for
pecl developers.
Add automatic version info resource generation for SAPI and extension
modules, based on PHP version numbers and info found in the CREDITS file.
As a nice side effect, this lets us add a logo icon to .exe files.
2003-12-04 01:37:52 +00:00
Frank M. Kromann
ca6502866b copy and paste error 2003-12-03 23:48:02 +00:00
Wez Furlong
4ffdb4253a This should solve a few problems with static vs. shared builds for extensions (such as mssql) that require certain CFLAGS to be defined, but not pull in other flags that would affect DLL linkage.
Also fix the iconv file; MSVC doesn't seem to like the #include SYMBOL syntax.
2003-12-03 22:59:48 +00:00
Wez Furlong
883815a9ec VC stores lib path in LIB not LIBS.
Add --with-extra-includes and --with-extra-libs to be able to specify
general additions to those paths from the environment.
2003-12-03 18:31:04 +00:00
Wez Furlong
03afe54c44 avoid breaking paths with spaces when we generate the makefile, and ensure that libs found in the default path are added to the link line 2003-12-03 17:04:30 +00:00
Wez Furlong
c2bd62fcd7 add rule for parsedate 2003-12-03 16:51:23 +00:00
Wez Furlong
1653fbfff6 fix typo 2003-12-03 14:58:05 +00:00
Wez Furlong
93bce45485 Propogate LDFLAGS from extensions to PHPDLL when building them statically.
Move ZendEngine2 to Zend while running buildconf
2003-12-03 14:55:03 +00:00
Wez Furlong
ad84dfa937 Build adjustments. 2003-12-03 14:29:45 +00:00
Wez Furlong
34df2ae239 some tweaks for Frank 2003-12-03 02:47:45 +00:00
Wez Furlong
86c8a87283 avoid vs.net specific option for now 2003-12-03 01:10:03 +00:00
Wez Furlong
68f77f37ba Avoid death when wrapping null/undefined values 2003-12-03 00:56:14 +00:00
Wez Furlong
5b7e8bb4f6 make help more useful 2003-12-03 00:46:40 +00:00
Wez Furlong
2d0eaa3989 Clarify a little. 2003-12-03 00:15:10 +00:00
Wez Furlong
05b9b20ed8 Add new (optional!) win32 build infrastructure.
Will follow up to internals@ shortly.
2003-12-02 23:17:04 +00:00
Wez Furlong
7a7713eaeb Fix build for new usleep implementation.
NB: we now depend on windows 98 and later;
windows 95 does not have these timing functions.
2003-11-29 22:59:33 +00:00
Wez Furlong
dd60413c61 implement usleep for win32 2003-11-29 22:48:42 +00:00
Sebastian Bergmann
fe93c2ac09 Add dom_iterators.c to project. 2003-11-29 20:55:18 +00:00
foobar
ee50f6034e - remove non-existing servlet entry 2003-11-29 05:12:23 +00:00
Wez Furlong
2a9d2d5f73 re-implement the win32 select code.
The old code implicitly set any sockets into non-blocking mode,
and since there is no way to probe a socket to determine its
blocking status using the win32 API, this was a real pain in the ass.

The New implementation will hand off any sockets to winsock and
use the WaitForObject API in win32 to probe other types of handle.
2003-11-27 18:01:12 +00:00
Uwe Schindler
26b5772455 change names to php5_xxx in NSAPI 2003-11-18 09:04:31 +00:00
foobar
ee997ddbfa fix the docs 2003-11-18 00:06:37 +00:00
Uwe Schindler
614fec8dbb remove unix crap 2003-11-05 08:33:46 +00:00
Uwe Schindler
c22ddad21e SunONE servers 2003-11-04 09:02:56 +00:00
Andi Gutmans
bb12ffe41f - Move uuencode to the right place (ext/standard) 2003-10-30 09:58:52 +00:00
Andi Gutmans
b29686a6e5 - Add uuencode.c to the project 2003-10-27 15:49:11 +00:00
Gabor Hojtsy
6345a7aa7b The web server user name starts with IUSR_ and not ISUR_,
and some clarifications from Phil Driscoll
2003-10-23 09:53:31 +00:00
Shane Caraveo
399095e7a5 Add libxml extension for common code that is needed to be shared between
various xml extensions.  currently the only implemented support is the
addition of the streams support for libxml.  One new function,
libxml_set_streams_context, which allows a streams context to bet set
prior to loading or writing documents.  This works transparently with any
extension that uses libxml.  All ini settings that effect streams will
also now effect the loading and writing of xml documents.

TODO: linux support, not sure if config.m4 will work right.
2003-10-19 21:48:46 +00:00
Stanislav Malyshev
e8e0c6fb41 fix wrong string length for registry values 2003-10-19 13:47:35 +00:00
Stanislav Malyshev
405361f7ea fix compilation 2003-10-19 10:36:36 +00:00
Stanislav Malyshev
3e828db413 Add function for getting php.ini path from registry 2003-10-19 10:22:21 +00:00
Wez Furlong
d8d1ca3f3b add com iterator support 2003-10-17 20:52:18 +00:00
foobar
8c52344418 Nuke compile warnings 2003-09-20 03:22:36 +00:00
Derick Rethans
a4f4e9aed4 - Fixed typo 2003-09-19 12:24:06 +00:00
Ilia Alshanetsky
a439221d6e Fixed bug #25333 (Possible body corruption & crash in win32 mail()). 2003-09-08 22:36:59 +00:00
foobar
f62239c444 renamed http.h -> php_http.h 2003-09-06 13:09:04 +00:00
Sebastian Bergmann
755eca693e Add ext/standard/http.{c|h}. 2003-09-06 07:57:10 +00:00
Sebastian Bergmann
4d06f166c4 Add xsl. 2003-09-01 06:14:24 +00:00
foobar
a1adc61939 - added mcve to the modules workspace 2003-08-28 17:25:34 +00:00
Rob Richards
2fea999468 fix debug build. use libxml dynamic linking until it can re-export symbols 2003-08-25 10:11:26 +00:00
Wez Furlong
ec8a5e7b8d provide general hook for exporting symbols from php4ts.dll 2003-08-22 21:45:58 +00:00
Wez Furlong
7881c6e0b6 Might help to have the COM stuff actually build... 2003-08-14 17:58:58 +00:00
Ilia Alshanetsky
93bcd55eaf emalloc -> safe_emalloc 2003-08-12 00:58:52 +00:00
Ilia Alshanetsky
5790626881 Fixed bug #22947 (Ack() inside win32/sendmail.c may stall in certain
situations).
2003-08-11 18:03:24 +00:00
Ilia Alshanetsky
6d8305a2d3 Fixed bug #25037 (Possible infinite loop inside SendText()) 2003-08-11 16:37:32 +00:00
Zeev Suraski
fd8c67e644 Fix library linkage 2003-08-04 08:55:44 +00:00
Zeev Suraski
76e26c8e99 Add missing library path 2003-08-04 08:54:40 +00:00
Rob Richards
d326b80998 add xpath.c to DOM source files 2003-07-24 13:20:59 +00:00
Ilia Alshanetsky
9826911139 Fixed bug #23798 (Spaces were not being stripped from Bcc header)
Fixed bug #24663 (\n. sequences were not being escaped)
2003-07-23 16:03:10 +00:00
Edin Kadribasic
9c717b33a6 Add sqlite session handler to win32 build 2003-07-01 13:26:02 +00:00
Zeev Suraski
77037dcea4 Add missing sqlite references 2003-07-01 08:19:11 +00:00
Derick Rethans
a62928a3e8 - Fix win32 install instructions 2003-06-30 20:29:52 +00:00
Zeev Suraski
8dd84b7b98 Conform to the sqlite.dsp updates 2003-06-30 11:43:14 +00:00
Zeev Suraski
a6d06bea94 Remove unnecessary elements, internationalize 2003-06-30 11:27:03 +00:00
Sebastian Bergmann
10ec176f69 Buckle your seatbelt, Dorothy, 'cause Aggregation is going bye-bye. 2003-06-28 05:38:52 +00:00
Rob Richards
d50554ebae fix the libxml linking warnings 2003-06-27 21:59:53 +00:00
Edin Kadribasic
ecf58cf895 Missing part of SQLite enabling on windows. 2003-06-27 14:34:06 +00:00
Edin Kadribasic
94b7050bc0 Enabled sqlite by default on Windows.
# Also added iconv.lib to the build since it is a dependency of
# the precompiled libxml. This will be removed later.
2003-06-27 14:32:59 +00:00
Sascha Schumann
d6e84b639c Committing engine select project
This is a noop in an already setup tree.

When necessary, it renames ZendEngine2 to Zend permanently.
This occurs only after a fresh checkout (not after an update!).
2003-06-26 19:19:44 +00:00
Sebastian Bergmann
9f9a1d4d3a Leftovers. 2003-06-26 15:57:03 +00:00
Zeev Suraski
94c8f5624e libxml work
use static libxml library
2003-06-26 15:31:48 +00:00
Sebastian Bergmann
7305930c80 Remove MySQL leftovers. 2003-06-26 15:16:56 +00:00
Sebastian Bergmann
39b0d384e6 Sync. 2003-06-26 14:57:48 +00:00
Zeev Suraski
ff52e95cbb - Add libxml directory
- Add zlib to configurations where it was missing
- Remove libmysql linkage
2003-06-26 14:19:42 +00:00
Sebastian Bergmann
4434c8e0d6 Add ext/dom and ext/simplexml to the Win32 default build. #Apart from a linker error when HAVE_SIMPLEXML=1 is set this already works. More research, after a good night's sleep, is required ;-) 2003-06-25 21:37:50 +00:00
Sebastian Bergmann
a10e5b6381 Remove ext/rpc references from Windows build. 2003-06-25 04:54:23 +00:00
Sebastian Bergmann
4ee26b390f Remove references to bundled libmysql. 2003-06-23 04:27:11 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Sebastian Bergmann
f53360616e Leftover. 2003-05-25 06:22:35 +00:00
Sebastian Bergmann
d1cb228bf1 Get rid of references to expat in MSVC project files. For now this expects libxml2 (library and includes) in one of the MSVC default include/library directories. Right now it doesn't link, dunno why -- working on it. 2003-05-24 08:03:38 +00:00
Sebastian Bergmann
80824a3d3a Leftovers. 2003-05-19 17:33:33 +00:00
Sebastian Bergmann
88cb80020a First try at getting the Windows build working again after libxml2 got unbundled. 2003-05-19 16:28:08 +00:00
Sebastian Bergmann
ab393a9b0c Adjust path to bundled expat sources for Win32 build. 2003-05-03 08:44:53 +00:00
Sebastian Bergmann
2dd1affcab Leftover. 2003-03-26 06:31:26 +00:00
Sebastian Bergmann
bb16a92ccd Leftover. 2003-03-25 13:04:27 +00:00
Wez Furlong
349ce76f96 Tidy up stupid signed/unsigned issues with win32 by introducing a php_socket_t typedef. 2003-02-28 21:03:36 +00:00
Wez Furlong
493ef36299 Update win32 build.
Since msvc sucks, I had to rename ext/standard/streams.c to ext/standed/streamsfuncs.c
2003-02-27 22:43:51 +00:00
Wez Furlong
5def83df0b Move streams specific stuff from ext/standard/file.c -> ext/standard/streams.c
Move win32 select implementation into win32/.
Will update win32 build in a moment.
2003-02-27 22:23:39 +00:00
Wez Furlong
203068d055 Fixup build for win32 2003-02-27 18:06:31 +00:00
Wez Furlong
c1bdf163ed Add comment about thread-safety of gethostbyname on win32.
Set the correct path to the win32 config.h file in the .dsp file.
2003-02-21 14:06:55 +00:00
Zeev Suraski
7240050243 Commit missing stuff 2003-02-18 13:34:52 +00:00
foobar
7e9fb9f21f - Cleaned this mess a bit:
. Centralized the functions sunrise/sunset to php_sunrise_sunset
    to lessen duplicate code.
  . Made wrapper function php_do_date_sunrise_sunset() to lessen
    duplicate code.
  . Coding style fixes.
  . renamed sunfuncs.h -> php_sunfuncs.h
2003-02-17 06:28:07 +00:00
foobar
4e3d4e4329 - Let's be consistent with these.. 2003-02-17 03:07:33 +00:00
Wez Furlong
f0b8f6dcfb Some additional sanity. 2003-02-16 23:46:45 +00:00
Wez Furlong
83f399fed0 Add the sunfuncs to the .dsp file for Moshe. 2003-02-16 22:39:01 +00:00
Wez Furlong
8305254fe6 Update win32 project for streams juggling. 2003-02-16 22:34:40 +00:00
Wez Furlong
0a18a9d744 A add much more useful select(2) implementation than is provided by
windows sockets.  The winsock implementation will only work with sockets;
our implementation works with sockets and file descriptors.
By association, stream_select() will now operate correctly with files, pipes and sockets.

This change required linking against the winsock2 library.  In terms of
compatibility, only older versions of windows 95 do not have winsock2
installed by default.  It is available as a redistributable file, and is most likely installed by any OS patches (eg: Internet Explorer) applied by the user.

Also, add a win32 compatible pipe test when opening a stream from a pipe.  This test will only work on NT, win2k and XP platforms.  Without this test, interleaved fread() and select() calls would cause the read buffer to be clobbered.  I will be working on a fix for this issue for win9x.
2003-02-16 03:48:49 +00:00
Wez Furlong
b6c008305f Update installer so that no extensions are enabled by default. 2003-02-13 10:25:30 +00:00
Wez Furlong
1e9eeafe21 Fix php.ini customization.
Apparently, it seems that running the php script with output captured to
the log prevented it from working correctly.

Also, deletes the php.ini when uninstalled.

TODO: The defaults install and activate all extensions.  This is a problem
for those extension that require non-bundled .dlls (such as OCI).
2003-02-10 00:20:53 +00:00
Wez Furlong
3449f4f104 Check in the prototype PHP installer for win32.
# Besides looking nice and pretty, the installer is actually smaller
# than the .zip distro:
#   PHP 4.3.0 .zip distro:  5,950,222 bytes
#   PHP 4.3.0 installer:    5,426,242 bytes
2003-02-05 07:32:22 +00:00
Zeev Suraski
9f1516f556 Get rid of php4ts.dsw - replaced by php5ts.dsw 2003-01-28 11:22:44 +00:00
Edin Kadribasic
7c283f80be Adding new files to the project.
# First half of Sebastian's patch, Ilia will commit the second part shortly
2003-01-28 00:32:15 +00:00
Ilia Alshanetsky
d59d500af7 Moved the scandir code into it's own files so that it can be used by other
OSes where libc does not have a native scandir() implementation.
2003-01-27 20:39:31 +00:00
Edin Kadribasic
c7441b2379 Fixed bug #21597 (made glob() understand windows paths) 2003-01-27 16:29:47 +00:00
Shane Caraveo
82f6cef483 Fix broken build by adding scandir and alphasort for win32 2003-01-26 01:39:18 +00:00
Zeev Suraski
cee6216c4f Fix .dsp 2003-01-23 09:35:02 +00:00
Moriyoshi Koizumi
dc4cdaaf1b WS fix 2003-01-17 22:45:23 +00:00
Harald Radi
4024425e8e fix path to config.w32.h 2003-01-16 18:25:59 +00:00
Edin Kadribasic
46303d75be Added some missing modules. Removed some that are built in or moved to
ext/rpc.
2003-01-15 22:19:46 +00:00
Sebastian Bergmann
003ea0717e Add proc_open.c to project. 2003-01-15 16:48:46 +00:00
Derick Rethans
4ff9267143 s/gd/gd2 2003-01-14 13:55:00 +00:00