jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up use of gen_extra flag. Adjust whitespace in create_extra_files().

Browse source 
Emit the s_header contents after writing final comment.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7402 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Kevin Ruland 2005-08-29 11:57:35 +00:00
commit d18e6de5e5
1 changed files with 497 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SWIG/Source/Modules/php4.cxx
View file

@ -331,7 +331,6 @@ public:
// also withincs and withlibs only take one name each now // also withincs and withlibs only take one name each now
// the code they generate should be adapted to take multiple lines // the code they generate should be adapted to take multiple lines
if(gen_extra) {
/* Write out Makefile.in */ /* Write out Makefile.in */
f_extra = NewFile(makefilein, "w"); f_extra = NewFile(makefilein, "w");
if (!f_extra) { if (!f_extra) {
@ -511,7 +510,6 @@ public:
Printf(f_extra, "%s\n", module); Printf(f_extra, "%s\n", module);
Close(f_extra); Close(f_extra);
} }
}
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* top() * top()
@ -791,13 +789,11 @@ public:
* function really needs totally redoing. * function really needs totally redoing.
*/ */
Printv(f_runtime, s_header, NIL);
Printf(s_header, "/* end header section */\n"); Printf(s_header, "/* end header section */\n");
Printf(s_wrappers, "/* end wrapper section */\n"); Printf(s_wrappers, "/* end wrapper section */\n");
Printf(s_vdecl, "/* end vdecl subsection */\n"); Printf(s_vdecl, "/* end vdecl subsection */\n");
Printv(f_runtime, s_vdecl, s_wrappers, s_init, NIL); Printv(f_runtime, s_header, s_vdecl, s_wrappers, s_init, NIL);
Delete(s_header); Delete(s_header);
Delete(s_wrappers); Delete(s_wrappers);
Delete(s_init); Delete(s_init);
@ -806,10 +802,12 @@ public:
Printf(f_phpcode, "%s\n%s\n?>\n", pragma_incl, pragma_code); Printf(f_phpcode, "%s\n%s\n?>\n", pragma_incl, pragma_code);
Close(f_phpcode); Close(f_phpcode);
if ( gen_extra ) {
create_extra_files(outfile); create_extra_files(outfile);
}
if(!gen_extra && gen_make) else if( gen_make ) {
create_simple_make(); create_simple_make();
}
return SWIG_OK; return SWIG_OK;
} }