Patch-Request: Detection of MS VS.NET 2008 & Fixes for confutils.js
| From: | Thomas Worm | Date: | Sat, 16 Jan 2010 21:20:26 +0000 |
| Subject: | Patch-Request: Detection of MS VS.NET 2008 & Fixes for confutils.js | ||
| Groups: | php.gtk.dev | ||
| Request: | Send a blank email to php-gtk-dev+get-4393@lists.php.net to get a copy of this message | ||
Hello,
because my attachment got stripped of here the two patches again with .txt
extension:
* php-gtk_configure-js_msvsnet2008.txt
This patches config.in.w32 to correctly detect Microsoft VS.NET 2008 (VC9)
+ php-gtk_confutils-js_fix.txt
This patches confutils.js to write a line break to the end of
Makefile.extensions (because of an aborting error if the file is completely
empty) and to write !ENDIF always after the always written !IF to the
Makefile.
Best Regards,
Thomas
--
Mit freundlichen Grüßen,
Thomas Worm
******************************
Thomas Worm
Handel & Dienstleistung
Postfach 2207
D-90009 Nürnberg
Hausanschrift:
Hintere Cramergasse 3
D-90478 Nürnberg
******************************
Telefon: +49 1803 030505000
Telefax: +49 1803 030505050
Allgemeiner Kontakt:
info@thomas-worm.de
Buchhaltung:
buchhaltung@thomas-worm.de
******************************
Geschäftsführer: Thomas Worm
thomas.worm@thomas-worm.de
Kontoverbindung:
Inhaber: Thomas Worm H. u. D.
Kontonummer: 38 56 38
Bankleitzahl: 760 606 18
Kreditinstitut: Volksbank-Raiffeisenbank Nürnberg eG
Steuernummer: 240-290-21429
USt-ID: DE250745940
ISBN-Verlagsnummer: 3-86749
******************************
diff -ruN php-gtk.orig/win32/config.w32.in php-gtk/win32/config.w32.in --- php-gtk.orig/win32/config.w32.in 2010-01-16 19:02:31.074820100 +0100 +++ php-gtk/win32/config.w32.in 2010-01-16 19:05:17.334329600 +0100 @@ -40,6 +40,9 @@ if (VCVERS == 14) { msversion = "Microsoft VS.NET 2005"; } + if (VCVERS == 15) { + msversion = "Microsoft VS.NET 2008"; + } STDOUT.WriteLine("Detected compiler version: " + msversion); } else { diff -Nur php-gtk.orig/win32/confutils.js php-gtk/win32/confutils.js --- php-gtk.orig/win32/confutils.js 2010-01-16 19:02:31.068819700 +0100 +++ php-gtk/win32/confutils.js 2010-01-16 20:08:36.402623800 +0100 @@ -991,6 +991,7 @@ function generate_makefile() { + MFE.WriteLine(""); // To avoid errer if MFE will be complete empty MFE.Close(); // Makefile.extensions is now complete MFO.Close(); // Makefile.objects is now complete var MF = FSO.CreateTextFile("Makefile", true); @@ -1022,8 +1023,8 @@ if (make_builds.length > 1) { MF.WriteLine("!ELSE"); MF.WriteLine("!MESSAGE Note: $(PHPGTKLIB) must be created before PHP-GTK extensions can be built"); - MF.WriteLine("!ENDIF"); } + MF.WriteLine("!ENDIF"); MF.WriteLine("build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)"); MF.WriteBlankLines(1);
diff -ruN php-gtk.orig/win32/config.w32.in php-gtk/win32/config.w32.in --- php-gtk.orig/win32/config.w32.in 2010-01-16 19:02:31.074820100 +0100 +++ php-gtk/win32/config.w32.in 2010-01-16 19:05:17.334329600 +0100 @@ -40,6 +40,9 @@ if (VCVERS == 14) { msversion = "Microsoft VS.NET 2005"; } + if (VCVERS == 15) { + msversion = "Microsoft VS.NET 2008"; + } STDOUT.WriteLine("Detected compiler version: " + msversion); } else { diff -Nur php-gtk.orig/win32/confutils.js php-gtk/win32/confutils.js --- php-gtk.orig/win32/confutils.js 2010-01-16 19:02:31.068819700 +0100 +++ php-gtk/win32/confutils.js 2010-01-16 20:08:36.402623800 +0100 @@ -991,6 +991,7 @@ function generate_makefile() { + MFE.WriteLine(""); // To avoid errer if MFE will be complete empty MFE.Close(); // Makefile.extensions is now complete MFO.Close(); // Makefile.objects is now complete var MF = FSO.CreateTextFile("Makefile", true); @@ -1022,8 +1023,8 @@ if (make_builds.length > 1) { MF.WriteLine("!ELSE"); MF.WriteLine("!MESSAGE Note: $(PHPGTKLIB) must be created before PHP-GTK extensions can be built"); - MF.WriteLine("!ENDIF"); } + MF.WriteLine("!ENDIF"); MF.WriteLine("build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)"); MF.WriteBlankLines(1);