com php/gtk-src: win32 build fixes: .gitignore win32/buildconf.js win32/confutils.js

Commit: 71bd020452e530e88ffcc67f31f16c08260a88a0 Author: Elizabeth M Smith <auroraeosrose@gmail.com> Mon, 6 Aug 2012 21:10:20 -0400 Parents: e30bbce3b5156adfdf1d8c74f0960b53d63e32c6 Branches: master Link: http://git.php.net/?p=php/gtk-src.git;a=commitdiff;h=71bd020452e530e88ffcc67f31f16c08260a88a0 Log: win32 build fixes buildconf needs to delete the right file, alterations to confutils so the right gtk version is picked up, and fix for regex cause of - in the name plus some missed gitignore entries Changed paths: M .gitignore M win32/buildconf.js M win32/confutils.js Diff: diff --git a/.gitignore b/.gitignore index f069f26..5507f81 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,12 @@ Makefile* # Output directories Release/ +# Generator junk +win32/logs/ +win32/temp.bat +sources.temp +source_complete.txt + # autotools config.* configure @@ -55,4 +61,5 @@ run-tests.php *.defs.cache gen_* build2/generated_lists -main/php_gtk_ext.c \ No newline at end of file +main/php_gtk_ext.c +main/php_gtk_version.h \ No newline at end of file diff --git a/win32/buildconf.js b/win32/buildconf.js index 7cdab3e..37e2b2b 100644 --- a/win32/buildconf.js +++ b/win32/buildconf.js @@ -29,8 +29,8 @@ if (FSO.FileExists('configure.js')) { if (FSO.FileExists('sources.temp')) { FSO.DeleteFile('sources.temp'); } -if (FSO.FileExists('sources_complete.txt')) { - FSO.DeleteFile('sources_complete.txt'); +if (FSO.FileExists('source_complete.txt')) { + FSO.DeleteFile('source_complete.txt'); } var C = FSO.CreateTextFile("configure.js", true); diff --git a/win32/confutils.js b/win32/confutils.js index ad27b0b..a19cf7f 100644 --- a/win32/confutils.js +++ b/win32/confutils.js @@ -732,7 +732,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) { file_list = file_list.split(new RegExp("\\s+")); file_list.sort(); - var re = new RegExp("\.[a-z0-9A-Z]+$"); + var re = new RegExp("\.[a-z0-9A-Z\-]+$"); dir = dir.replace(new RegExp("/", "g"), "\\"); var objs_line = ""; @@ -865,6 +865,8 @@ function search_paths(thing_to_find, explicit_path, env_name) { if (found && place == true) { STDOUT.WriteLine(" <in default path>"); + place = file[0]; + place = place.substr(0, place.length - thing_to_find.length - 1); } else if (found) { STDOUT.WriteLine(" " + place); } else {