svn: /gtk/php-gtk/trunk/generator/ lineoutput.php

[Bob Majdak Jr]

bmajdak Fri, 25 Jun 2010 18:23:51 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300750

Log:
fix in the generator for compiling on macos. slightly cheeky, but working for now.

Changed paths:
U gtk/php-gtk/trunk/generator/lineoutput.php

Modified: gtk/php-gtk/trunk/generator/lineoutput.php
===================================================================
--- gtk/php-gtk/trunk/generator/lineoutput.php 2010-06-25 18:05:53 UTC (rev 300749)
+++ gtk/php-gtk/trunk/generator/lineoutput.php 2010-06-25 18:23:51 UTC (rev 300750)
@@ -69,7 +69,17 @@
}
$filename = substr($this->filename, 0, -2) . $string . '.c';
$files .= ' ' . basename($filename);
- file_put_contents($filename, $this->header . $this->body[$id]);
+
+ $header = $this->header;
+
+ // this is a cheeky fix for the link sysem failing on MacOS when these
+ // files get broken into multiple files.
+ // bob - 20100625
+ if(PHP_OS == "Darwin" && $id > 0) {
+ $header = preg_replace('/^PHP_GTK_EXPORT_CE\(.+?\);$/ms','',$header);
+ }
+
+ file_put_contents($filename, $header . $this->body[$id]);
}
file_put_contents('php://stdout', $files, FILE_APPEND);
}

[Christian Weiske]

Hello Bob,

Post by Bob Majdak Jr
bmajdak Fri, 25 Jun 2010 18:23:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300750
fix in the generator for compiling on macos. slightly cheeky, but working for now.

Please fix your editor settings and use spaces instead of tabs.

Post by Bob Majdak Jr
U gtk/php-gtk/trunk/generator/lineoutput.php
Modified: gtk/php-gtk/trunk/generator/lineoutput.php
===================================================================
--- gtk/php-gtk/trunk/generator/lineoutput.php 2010-06-25
18:05:53 UTC (rev 300749) +++
gtk/php-gtk/trunk/generator/lineoutput.php 2010-06-25 18:23:51
$filename = substr($this->filename, 0, -2) . $string .
'.c'; $files .= ' ' . basename($filename);
- file_put_contents($filename, $this->header .
$this->body[$id]); +
+ $header = $this->header;
+
+ // this is a cheeky fix for the link sysem
failing on MacOS when these
+ // files get broken into multiple files.
+ // bob - 20100625
+ if(PHP_OS == "Darwin" && $id > 0) {
+ $header =
preg_replace('/^PHP_GTK_EXPORT_CE\(.+?\);$/ms','',$header);
+ }
+
+ file_put_contents($filename, $header . $this->body[$id]);
}
file_put_contents('php://stdout', $files, FILE_APPEND);
}