[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/build/genif.sh branches/PHP_5_4/build/genif.sh trunk/build/genif.sh

2011-08-09 Thread Scott MacVicar
scottmac Tue, 09 Aug 2011 18:12:06 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=314686

Log:
Fix building of pure C++ extensions as static

Changed paths:
U   php/php-src/branches/PHP_5_3/build/genif.sh
U   php/php-src/branches/PHP_5_4/build/genif.sh
U   php/php-src/trunk/build/genif.sh

Modified: php/php-src/branches/PHP_5_3/build/genif.sh
===
--- php/php-src/branches/PHP_5_3/build/genif.sh 2011-08-09 16:05:19 UTC (rev 
314685)
+++ php/php-src/branches/PHP_5_3/build/genif.sh 2011-08-09 18:12:06 UTC (rev 
314686)
@@ -24,7 +24,7 @@
 module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk`

 for ext in ${1+$@} ; do
-   header_list=$header_list ext/$ext/*.h
+   header_list=$header_list ext/$ext/*.h*
 done

 includes=`$awk -f ./build/print_include.awk $header_list`

Modified: php/php-src/branches/PHP_5_4/build/genif.sh
===
--- php/php-src/branches/PHP_5_4/build/genif.sh 2011-08-09 16:05:19 UTC (rev 
314685)
+++ php/php-src/branches/PHP_5_4/build/genif.sh 2011-08-09 18:12:06 UTC (rev 
314686)
@@ -24,7 +24,7 @@
 module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk`

 for ext in ${1+$@} ; do
-   header_list=$header_list ext/$ext/*.h
+   header_list=$header_list ext/$ext/*.h*
 done

 includes=`$awk -f ./build/print_include.awk $header_list`

Modified: php/php-src/trunk/build/genif.sh
===
--- php/php-src/trunk/build/genif.sh2011-08-09 16:05:19 UTC (rev 314685)
+++ php/php-src/trunk/build/genif.sh2011-08-09 18:12:06 UTC (rev 314686)
@@ -24,7 +24,7 @@
 module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk`

 for ext in ${1+$@} ; do
-   header_list=$header_list ext/$ext/*.h
+   header_list=$header_list ext/$ext/*.h*
 done

 includes=`$awk -f ./build/print_include.awk $header_list`

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/build/build.mk branches/PHP_5_4/build/build.mk trunk/build/build.mk

2011-07-13 Thread Jérôme Loyet
fat  Wed, 13 Jul 2011 23:28:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313218

Log:
find option '-not' is not POSIX compliant

Changed paths:
U   php/php-src/branches/PHP_5_3/build/build.mk
U   php/php-src/branches/PHP_5_4/build/build.mk
U   php/php-src/trunk/build/build.mk

Modified: php/php-src/branches/PHP_5_3/build/build.mk
===
--- php/php-src/branches/PHP_5_3/build/build.mk 2011-07-13 22:51:39 UTC (rev 
313217)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2011-07-13 23:28:48 UTC (rev 
313218)
@@ -68,7 +68,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


Modified: php/php-src/branches/PHP_5_4/build/build.mk
===
--- php/php-src/branches/PHP_5_4/build/build.mk 2011-07-13 22:51:39 UTC (rev 
313217)
+++ php/php-src/branches/PHP_5_4/build/build.mk 2011-07-13 23:28:48 UTC (rev 
313218)
@@ -67,7 +67,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


Modified: php/php-src/trunk/build/build.mk
===
--- php/php-src/trunk/build/build.mk2011-07-13 22:51:39 UTC (rev 313217)
+++ php/php-src/trunk/build/build.mk2011-07-13 23:28:48 UTC (rev 313218)
@@ -67,7 +67,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
rasmus   Wed, 18 May 2011 17:27:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

Log:
Fix autoconf version check script to make sure people are
not using 2.60 or higher here. It might actually work up to
2.62 or 2.64. If someone could verify that these versions
still work I can massage this further.

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 16:58:31 UTC 
(rev 311201)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 17:27:41 UTC 
(rev 311202)
@@ -42,14 +42,21 @@
 echoYou need autoconf version 2.13 or newer installed
 echoto build PHP from SVN.
 exit 1
+fi
+
+if test $1 = 2 -a $2 -gt 59; then
+  echo buildconf: You need autoconf 2.59 or lower to build this version of 
PHP.
+  echoYou are currently trying to use $ac_version
+  echoMost distros have separate autoconf 2.13 or 2.59 packages.
+  echoOn Debian/Ubuntu both autoconf2.13 and autoconf2.59 
packages exist.
+  echoInstall autoconf2.13 and set the PHP_AUTOCONF env var to 
+  echoautoconf2.13and try again.
+  exit 1
 else
-echo buildconf: autoconf version $ac_version (ok)
+  echo buildconf: autoconf version $ac_version (ok)
 fi

-if test $1 = 2  test $2 -ge 50; then
-  echo buildconf: Your version of autoconf likely contains buggy cache code.
-  echoRunning vcsclean for you.
-  echoTo avoid this, install autoconf-2.13.
+if test $1 = 2 -a $2 -ge 50; then
   ./vcsclean
   stamp=
 fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:

 rasmus   Wed, 18 May 2011 17:27:41 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

 Log:
 Fix autoconf version check script to make sure people are
 not using 2.60 or higher here. It might actually work up to
 2.62 or 2.64. If someone could verify that these versions
 still work I can massage this further.


debian squeeze has 2.64 and 2.67, so it should be easy to test it.
if nobody else are up for it, I can check this also.
should be ./configure --disable-all --enable-cli  make  make test enough
to verify this?

Tyrael


Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
 On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
 rasmus   Wed, 18 May 2011 17:27:41 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

 Log:
 Fix autoconf version check script to make sure people are
 not using 2.60 or higher here. It might actually work up to
 2.62 or 2.64. If someone could verify that these versions
 still work I can massage this further.


 debian squeeze has 2.64 and 2.67, so it should be easy to test it.
 if nobody else are up for it, I can check this also.
 should be ./configure --disable-all --enable-cli  make  make test enough
 to verify this?

Yes, ./buildconf (with my check removed or modified to allow those
versions) and then try to run your configure line. 2.65-2.67 definitely
don't work, so no need to test those.

-Rasmus

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:45 PM, Rasmus Lerdorf ras...@lerdorf.com wrote:

 On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
  On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
  rasmus   Wed, 18 May 2011 17:27:41 +
 
  Revision: http://svn.php.net/viewvc?view=revisionrevision=311202
 
  Log:
  Fix autoconf version check script to make sure people are
  not using 2.60 or higher here. It might actually work up to
  2.62 or 2.64. If someone could verify that these versions
  still work I can massage this further.
 
 
  debian squeeze has 2.64 and 2.67, so it should be easy to test it.
  if nobody else are up for it, I can check this also.
  should be ./configure --disable-all --enable-cli  make  make test
 enough
  to verify this?

 Yes, ./buildconf (with my check removed or modified to allow those
 versions) and then try to run your configure line. 2.65-2.67 definitely
 don't work, so no need to test those.


it works AFAIK:

tyrael@thor:~/checkouts/php/src/php/php-src/trunk$ PHP_AUTOCONF=autoconf2.64
PHP_AUTOHEADER=autoheader2.64 ./buildconf
buildconf: checking installation...
buildconf: autoconf version 2.64 (ok)
rebuilding aclocal.m4
rebuilding configure
rebuilding main/php_config.h.in
tyrael@thor:~/checkouts/php/src/php/php-src/trunk$ ./configure --disable-all
--enable-cli
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for a sed that does not truncate output... /bin/sed
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for cc... cc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether cc accepts -g... yes
checking for cc option to accept ISO C89... none needed
checking how to run the C preprocessor... cc -E
checking for icc... no
checking for suncc... no
checking whether cc understands -c and -o together... yes
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking whether ln -s works... yes
checking for system library directory... lib
checking whether to enable runpaths... yes
checking if compiler supports -R... no
checking if compiler supports -Wl,-rpath,... yes
checking for gawk... gawk
checking for bison... bison -y
checking for bison version... 2.4.1 (ok)
checking for re2c... no
configure: WARNING: You will need re2c 0.13.4 or later if you want to
regenerate PHP parsers.
checking whether to enable computed goto gcc extension with re2c... no
checking whether to force non-PIC code in shared modules... no
checking whether /dev/urandom exists... yes
checking for pthreads_cflags... -pthread
checking for pthreads_lib...

Configuring SAPI modules
checking for AOLserver support... no
checking for Apache 1.x module support via DSO through APXS... no
checking for Apache 1.x module support... no
checking whether to enable Apache charset compatibility option... no
checking for Apache 2.0 filter-module support via DSO through APXS... no
checking for Apache 2.0 handler-module support via DSO through APXS... no
checking for Apache 1.x (hooks) module support via DSO through APXS... no
checking for Apache 1.x (hooks) module support... no
checking whether to enable Apache charset compatibility option... no
checking for Caudium support... no
checking for CLI build... yes
checking for Continuity support... no
checking for embedded SAPI library support... no
checking for FPM build... no
checking for Zeus ISAPI support... no
checking for LiteSpeed support... no
checking for Milter support... no
checking for NSAPI support... no
checking for PHTTPD support... no
checking for Pi3Web support... no
checking whether Roxen module is build using ZTS... no
checking for Roxen/Pike support...
checking for thttpd... no
checking for TUX... no
checking for webjames... no
checking for CGI build... yes
checking for socklen_t in sys/socket.h... yes
checking for sun_len in sys/un.h... no
checking whether cross-process locking is required by accept()... no
checking for chosen SAPI module... none
checking for executable SAPI binaries...  cli cgi

Running system checks
checking for sendmail... /usr/sbin/sendmail
checking whether system uses EBCDIC... no
checking whether byte ordering is 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
rasmus   Wed, 18 May 2011 19:55:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311203

Log:
Fix typo

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 17:27:41 UTC 
(rev 311202)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 19:55:34 UTC 
(rev 311203)
@@ -50,7 +50,7 @@
   echoMost distros have separate autoconf 2.13 or 2.59 packages.
   echoOn Debian/Ubuntu both autoconf2.13 and autoconf2.59 
packages exist.
   echoInstall autoconf2.13 and set the PHP_AUTOCONF env var to 
-  echoautoconf2.13and try again.
+  echoautoconf2.13 and try again.
   exit 1
 else
   echo buildconf: autoconf version $ac_version (ok)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:45 PM, Rasmus Lerdorf ras...@lerdorf.com wrote:

 On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
  On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
  rasmus   Wed, 18 May 2011 17:27:41 +
 
  Revision: http://svn.php.net/viewvc?view=revisionrevision=311202
 
  Log:
  Fix autoconf version check script to make sure people are
  not using 2.60 or higher here. It might actually work up to
  2.62 or 2.64. If someone could verify that these versions
  still work I can massage this further.
 
 
  debian squeeze has 2.64 and 2.67, so it should be easy to test it.
  if nobody else are up for it, I can check this also.
  should be ./configure --disable-all --enable-cli  make  make test
 enough
  to verify this?

 Yes, ./buildconf (with my check removed or modified to allow those
 versions) and then try to run your configure line. 2.65-2.67 definitely
 don't work, so no need to test those.

 -Rasmus

 --
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php


just noticed that I've tested this on trunk, when you patched the 5.3
branch. :/
to be able to run the buildconf with autoconf2.64 I had to change the
build/buildcheck.sh and replace the 59 with 64 in the version check
obviously.
here is the result:

tyrael@chronos:~/checkouts/php/src/php/php-src/branches/PHP_5_3$
PHP_AUTOCONF=autoconf2.64 PHP_AUTOHEADER=autoheader2.64 ./buildconf
buildconf: checking installation...
buildconf: autoconf version 2.64 (ok)
rebuilding aclocal.m4
rebuilding configure
ext/pdo_dblib/config.m4:56: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2039: AC_CACHE_CHECK is expanded from...
aclocal.m4:2747: PHP_CHECK_PDO_INCLUDES is expanded from...
ext/pdo_firebird/config.m4:48: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_mysql/config.m4:138: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_oci/config.m4:211: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_odbc/config.m4:44: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_pgsql/config.m4:107: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_sqlite/config.m4:16: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/sqlite/config.m4:50: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
rebuilding acconfig.h
rebuilding main/php_config.h.in
autoheader2.64: WARNING: Using auxiliary files such as `acconfig.h',
`config.h.bot'
autoheader2.64: WARNING: and `config.h.top', to define templates for `
config.h.in'
autoheader2.64: WARNING: is deprecated and discouraged.
autoheader2.64:
autoheader2.64: WARNING: Using the third argument of `AC_DEFINE' and
autoheader2.64: WARNING: `AC_DEFINE_UNQUOTED' allows one to define a
template without
autoheader2.64: WARNING: `acconfig.h':
autoheader2.64:
autoheader2.64: WARNING:   AC_DEFINE([NEED_FUNC_MAIN], 1,
autoheader2.64: [Define if a function `main' is needed.])
autoheader2.64:
autoheader2.64: WARNING: More sophisticated templates can also be produced,
see the
autoheader2.64: WARNING: documentation.
ext/pdo_dblib/config.m4:56: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2039: AC_CACHE_CHECK is expanded from...
aclocal.m4:2747: PHP_CHECK_PDO_INCLUDES is expanded from...
ext/pdo_firebird/config.m4:48: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_mysql/config.m4:138: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_oci/config.m4:211: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_odbc/config.m4:44: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_pgsql/config.m4:107: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_sqlite/config.m4:16: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/sqlite/config.m4:50: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached

I saw some discussion about this on irc, so I think that you are already
aware of this.

Tyrael


[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ build/build.mk buildconf.bat cvsclean.bat ext/mbstring/libmbfl/mksbcc32.bat ext/session/mod_files.bat ext/standard/tests/file/windows_acls/tiny.bat svnclea

2009-07-15 Thread Gwynne Raskind
gwynne  Thu, 16 Jul 2009 04:50:06 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284173

Changed paths:
U   php/php-src/branches/PHP_5_3/build/build.mk
_U  php/php-src/branches/PHP_5_3/buildconf.bat
D   php/php-src/branches/PHP_5_3/cvsclean.bat
_U  php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mksbcc32.bat
_U  php/php-src/branches/PHP_5_3/ext/session/mod_files.bat
_U  
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_acls/tiny.bat
D   php/php-src/branches/PHP_5_3/svnclean
_U  php/php-src/branches/PHP_5_3/svnclean.bat
A   php/php-src/branches/PHP_5_3/vcsclean
_U  php/php-src/branches/PHP_5_3/win32/EngineSelect.bat
_U  php/php-src/branches/PHP_5_3/win32/build/configure.bat
_U  php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
_U  php/php-src/branches/PHP_5_3/win32/builddef.bat

Log:
MFH: dropped some more mime types, svnclean - clean for multiple VCS

Modified: php/php-src/branches/PHP_5_3/build/build.mk
===
--- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 04:43:18 UTC (rev 
284172)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 04:50:06 UTC (rev 
284173)
@@ -71,8 +71,11 @@
done

 svnclean-work:
-   for i in `find . -type d -and -not -path '*/.svn/*'`; do \
-   (cd `dirname $$i` 2/dev/null  svn propget svn:ignore $i | 
xargs rm -rf  rm -rf *.o *.a .libs || true); \
+   @for i in `find . -type d -and -not -path '*/.svn/*'`; do \
+   (cd `dirname $$i` 2/dev/null  svn propget svn:ignore $$i | 
xargs rm -rf  rm -rf *.o *.a .libs || true);\
done

+gitclean-work:
+   @echo We don't know how to clean Git checkouts yet.
+
 .PHONY: $(ALWAYS) snapshot


Property changes on: php/php-src/branches/PHP_5_3/buildconf.bat
___
Deleted: svn:mime-type
   - application/x-msdownload

Deleted: php/php-src/branches/PHP_5_3/cvsclean.bat
===
(Binary files differ)


Property changes on: 
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mksbcc32.bat
___
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: php/php-src/branches/PHP_5_3/ext/session/mod_files.bat
___
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_acls/tiny.bat
___
Deleted: svn:mime-type
   - application/x-msdownload

Deleted: php/php-src/branches/PHP_5_3/svnclean
===
--- php/php-src/branches/PHP_5_3/svnclean   2009-07-16 04:43:18 UTC (rev 
284172)
+++ php/php-src/branches/PHP_5_3/svnclean   2009-07-16 04:50:06 UTC (rev 
284173)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work


Property changes on: php/php-src/branches/PHP_5_3/svnclean.bat
___
Deleted: svn:mime-type
   - application/x-msdownload

Copied: php/php-src/branches/PHP_5_3/vcsclean (from rev 284084, 
php/php-src/branches/PHP_5_3/svnclean)
===
--- php/php-src/branches/PHP_5_3/vcsclean   (rev 0)
+++ php/php-src/branches/PHP_5_3/vcsclean   2009-07-16 04:50:06 UTC (rev 
284173)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if test -d 'CVS'; then
+${MAKE:-make} -f build/build.mk cvsclean-work
+elif test -d '.svn'; then
+${MAKE:-make} -f build/build.mk svnclean-work
+elif test -d '.git'; then
+${MAKE:-make} -f build/build.mk gitclean-work
+else
+echo Can't figure out your VCS, not cleaning.
+fi


Property changes on: php/php-src/branches/PHP_5_3/win32/EngineSelect.bat
___
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: php/php-src/branches/PHP_5_3/win32/build/configure.bat
___
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
___
Deleted: svn:mime-type
   - application/javascript


Property changes on: php/php-src/branches/PHP_5_3/win32/builddef.bat
___
Deleted: svn:mime-type
   - application/x-msdownload

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/php-src/branches/PHP_5_3/build/

2009-07-13 Thread Rasmus Lerdorf
rasmus  Mon, 13 Jul 2009 17:36:49 +

ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=284021

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Log:
svn propdel svn:mime-type build/buildcheck.sh
cvs-svn


Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2009-07-13 17:17:19 UTC 
(rev 284020)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2009-07-13 17:36:49 UTC 
(rev 284021)
@@ -33,14 +33,14 @@
 if test -z $ac_version; then
 echo buildconf: autoconf not found.
 echoYou need autoconf version 2.13 or newer installed
-echoto build PHP from CVS.
+echoto build PHP from SVN.
 exit 1
 fi
 IFS=.; set $ac_version; IFS=' '
 if test $1 = 2 -a $2 -lt 13 || test $1 -lt 2; then
 echo buildconf: autoconf version $ac_version found.
 echoYou need autoconf version 2.13 or newer installed
-echoto build PHP from CVS.
+echoto build PHP from SVN.
 exit 1
 else
 echo buildconf: autoconf version $ac_version (ok)
@@ -48,9 +48,9 @@

 if test $1 = 2  test $2 -ge 50; then
   echo buildconf: Your version of autoconf likely contains buggy cache code.
-  echoRunning cvsclean for you.
+  echoRunning svnclean for you.
   echoTo avoid this, install autoconf-2.13.
-  ./cvsclean
+  ./svnclean
   stamp=
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php