1 --- bakefile-0.1.1.20030922/src/writer.py.wiget 2003-09-13 21:55:35.000000000 +0200
2 +++ bakefile-0.1.1.20030922/src/writer.py 2003-09-22 16:35:10.000000000 +0200
4 return (rulesdir, template)
6 def invoke_em(writer, file, method):
12 rulesdir, template = __findWriter(writer)
13 filename = tempfile.mktemp('bakefile')
14 - empy.em.invoke(['-I','mk',
15 + em.invoke(['-I','mk',
19 --- bakefile-0.1.1.20030922/output/_hdr_makefile.empy.wiget 2003-06-10 23:56:50.000000000 +0200
20 +++ bakefile-0.1.1.20030922/output/_hdr_makefile.empy 2003-09-22 16:29:11.000000000 +0200
22 -@[ if 'HeaderIncluded' not in locals() :@
23 +@[if 'HeaderIncluded' not in locals()]
24 # =========================================================================
25 # This makefile was generated by
26 # Bakefile @BAKEFILE_VERSION (http://bakefile.sourceforge.net)
27 # Do not modify, all changes will be overwritten!
28 # =========================================================================
32 --- bakefile-0.1.1.20030922/output/autoconf-macros.empy.wiget 2003-08-09 12:55:54.000000000 +0200
33 +++ bakefile-0.1.1.20030922/output/autoconf-macros.empy 2003-09-22 16:29:11.000000000 +0200
35 dnl Bakefile @BAKEFILE_VERSION (http://bakefile.sourceforge.net)
36 dnl Do not modify, all changes will be overwritten!
38 -@[ for check in AUTOCONF_CHECKS.split() :@
39 +@[for check in AUTOCONF_CHECKS.split()]@
40 dnl ### begin block 0_@check ###
47 -@[ for cond in conditions :@
48 +@[for cond in conditions]@
49 dnl ### begin block 1_COND_@cond.name ###
51 if test @utils.condition2string(cond, utils.CONDSTR_UNIXTEST) ; then
54 AC_SUBST(COND_@cond.name)
57 --- bakefile-0.1.1.20030922/output/autoconf.empy.wiget 2003-07-26 21:57:22.000000000 +0200
58 +++ bakefile-0.1.1.20030922/output/autoconf.empy 2003-09-22 16:29:11.000000000 +0200
60 specialOptions = ['prefix', 'exec_prefix', 'INSTALL']
61 normalOptions = [x for x in options if x.name not in specialOptions]
63 -@[ for o in specialOptions :@
64 +@[for o in specialOptions]@
67 -@[ for o in normalOptions :@
69 +@[for o in normalOptions]@
76 -@[ for v in make_vars :@
77 +@[for v in make_vars]@
78 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
82 ### Conditionally set variables: ###
84 -@[ for c in cond_vars :@
85 -@[ for v in c.values :@
86 -@[if len(v.value) < 75:@
87 +@[for c in cond_vars]@
88 +@[for v in c.values]@
89 +@[if len(v.value) < 75]@
90 @utils.wrapLongLine('@COND_%s@%s = ' % (v.cond.name, c.name), v.value, ' \\', indent='@COND_%s@\t' % v.cond.name, variable=v.cond.name)
92 -@[if len(v.value) >= 75:@
94 +@[if len(v.value) >= 75]@
95 @utils.wrapLongLine('COND_%s_%s = ' % (v.cond.name, c.name), v.value, ' \\', variable=c.name)
96 @@COND_@v.cond.name@@@c.name = $(COND_@(v.cond.name)_@c.name)
105 -@[ for t in targets :
106 +@[for t in targets]@
108 if t.cond == None: condstr=''
109 else: condstr='@COND_%s@' % t.cond.name
111 @condstr@t.__targetdir@t.__targetname: @t.__deps
112 -@[ for cmd in t.__command.splitlines():@
113 +@[for cmd in t.__command.splitlines()]@
114 @condstr@\t@cmd.strip()
120 -@[ for f in fragments :
121 +@[for f in fragments]@
126 # Include dependency info, if present:
127 @@IF_GNU_MAKE@@-include .deps/*.d
128 --- bakefile-0.1.1.20030922/output/borland-opts.empy.wiget 2003-07-31 13:48:47.000000000 +0200
129 +++ bakefile-0.1.1.20030922/output/borland-opts.empy 2003-09-22 16:29:11.000000000 +0200
131 # These are configurable options:
132 # -------------------------------------------------------------------------
134 -@[ for o in options :@
135 +@[for o in options]@
136 # @o.descStr.replace('\n','\n# ') @o.valuesStr
138 @o.name = @o.defaultStr
143 --- bakefile-0.1.1.20030922/output/borland.empy.wiget 2003-08-08 13:09:32.000000000 +0200
144 +++ bakefile-0.1.1.20030922/output/borland.empy 2003-09-22 16:29:11.000000000 +0200
146 BCCDIR = $(MAKEDIR)\..
149 -@[if OPTIONS_FILE != '':!include @OPTIONS_FILE
151 -@[if OPTIONS_FILE == '':@
152 +@[if OPTIONS_FILE != '']!include @OPTIONS_FILE@[end if]@
153 +@[if OPTIONS_FILE == '']@
154 @empy.include(os.path.join(RULESDIR, 'borland-opts.empy'))
158 # -------------------------------------------------------------------------
159 # Do not modify the rest of this file!
164 -@[ for v in make_vars :@
165 +@[for v in make_vars]@
166 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
170 ### Conditionally set variables: ###
172 -@[ for c in cond_vars :@
173 -@[ for v in c.values :@
174 +@[for c in cond_vars]@
175 +@[for v in c.values]@
176 !if @utils.condition2string(v.cond, utils.CONDSTR_MSVC)
177 @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
184 -@[ if BUILDDIR != '.' :
185 +@[if BUILDDIR != '.']
188 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
193 -@[ for t in targets :
194 -@[ if t.cond != None :@
195 +@[for t in targets]@
196 +@[if t.cond != None]@
197 !if @utils.condition2string(t.cond, utils.CONDSTR_MSVC)
200 @t.__targetdir@t.__targetname: @t.__deps
201 -@[ for cmd in t.__command.splitlines():@
202 +@[for cmd in t.__command.splitlines()]@
203 @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
205 -@[ if t.cond != None :@
207 +@[if t.cond != None]@
213 --- bakefile-0.1.1.20030922/output/mingw-opts.empy.wiget 2003-07-31 13:48:47.000000000 +0200
214 +++ bakefile-0.1.1.20030922/output/mingw-opts.empy 2003-09-22 16:29:11.000000000 +0200
216 # These are configurable options:
217 # -------------------------------------------------------------------------
219 -@[ for o in options :@
220 +@[for o in options]@
221 # @o.descStr.replace('\n','\n# ') @o.valuesStr
222 @o.name = @o.defaultStr
226 --- bakefile-0.1.1.20030922/output/mingw.empy.wiget 2003-08-08 13:09:32.000000000 +0200
227 +++ bakefile-0.1.1.20030922/output/mingw.empy 2003-09-22 16:29:11.000000000 +0200
231 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
232 -@[if OPTIONS_FILE != '':include @OPTIONS_FILE
234 -@[if OPTIONS_FILE == '':@
235 +@[if OPTIONS_FILE != '']include @OPTIONS_FILE
237 +@[if OPTIONS_FILE == '']@
238 @empy.include(os.path.join(RULESDIR, 'mingw-opts.empy'))
242 # -------------------------------------------------------------------------
243 # Do not modify the rest of this file!
248 -@[ for v in make_vars :@
249 +@[for v in make_vars]@
250 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
254 ### Conditionally set variables: ###
256 -@[ for c in cond_vars :@
257 -@[ for v in c.values :@
258 +@[for c in cond_vars]@
259 +@[for v in c.values]@
260 @makeCondBegin(v.cond)
261 @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
268 -@[ if BUILDDIR != '.' :
269 +@[if BUILDDIR != '.']
272 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
277 -@[ for t in targets :
278 -@[ if t.cond != None :@makeCondBegin(t.cond)
281 +@[if t.cond != None]makeCondBegin(t.cond)
283 @t.__targetdir@t.__targetname: @t.__deps
284 -@[ for cmd in t.__command.splitlines():@
285 +@[for cmd in t.__command.splitlines()]@
286 @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
288 -@[ if t.cond != None :@makeCondEnd(t.cond)
292 +@[if t.cond != None]makeCondEnd(t.cond)
296 .PHONY: @(' '.join([t.__targetdir+t.__targetname for t in targets if t.__is_phony=='1']))
297 --- bakefile-0.1.1.20030922/output/msvc-opts.empy.wiget 2003-07-31 13:48:47.000000000 +0200
298 +++ bakefile-0.1.1.20030922/output/msvc-opts.empy 2003-09-22 16:29:11.000000000 +0200
300 # These are configurable options:
301 # -------------------------------------------------------------------------
303 -@[ for o in options :@
304 +@[for o in options]@
305 # @o.descStr.replace('\n','\n# ') @o.valuesStr
306 @o.name = @o.defaultStr
310 --- bakefile-0.1.1.20030922/output/msvc.empy.wiget 2003-07-26 21:57:22.000000000 +0200
311 +++ bakefile-0.1.1.20030922/output/msvc.empy 2003-09-22 16:29:11.000000000 +0200
313 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
314 -@[if OPTIONS_FILE != '':!include <@OPTIONS_FILE>
316 -@[if OPTIONS_FILE == '':@
317 +@[if OPTIONS_FILE != '']!include <@OPTIONS_FILE>
319 +@[if OPTIONS_FILE == '']@
320 @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
324 # -------------------------------------------------------------------------
325 # Do not modify the rest of this file!
330 -@[ for v in make_vars :@
331 +@[for v in make_vars]@
332 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
336 ### Conditionally set variables: ###
338 -@[ for c in cond_vars :@
339 -@[ for v in c.values :@
340 +@[for c in cond_vars]@
341 +@[for v in c.values]@
342 !if @utils.condition2string(v.cond, utils.CONDSTR_MSVC)
343 @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
350 -@[ if BUILDDIR != '.' :
351 +@[if BUILDDIR != '.']
354 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
359 -@[ for t in targets :
360 -@[ if t.cond != None :@
362 +@[if t.cond != None]@
363 !if @utils.condition2string(t.cond, utils.CONDSTR_MSVC)
366 @t.__targetdir@t.__targetname: @t.__deps
367 -@[ for cmd in t.__command.splitlines():@
368 +@[for cmd in t.__command.splitlines()]@
369 @(cmd.strip()[:2]=='<<' ? '<<' : '\t'+cmd.strip())
371 -@[ if t.cond != None :@
373 +@[if t.cond != None]@
379 --- bakefile-0.1.1.20030922/output/watcom-opts.empy.wiget 2003-07-31 13:48:47.000000000 +0200
380 +++ bakefile-0.1.1.20030922/output/watcom-opts.empy 2003-09-22 16:29:11.000000000 +0200
382 # These are configurable options:
383 # -------------------------------------------------------------------------
385 -@[ for o in options :@
386 +@[for o in options]@
387 # @o.descStr.replace('\n','\n# ') @o.valuesStr
388 @o.name = @o.defaultStr
392 --- bakefile-0.1.1.20030922/output/watcom.empy.wiget 2003-08-08 13:09:32.000000000 +0200
393 +++ bakefile-0.1.1.20030922/output/watcom.empy 2003-09-22 16:29:11.000000000 +0200
397 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
398 -@[if OPTIONS_FILE != '':!include @OPTIONS_FILE
400 -@[if OPTIONS_FILE == '':@
401 +@[if OPTIONS_FILE != '']!include @OPTIONS_FILE
403 +@[if OPTIONS_FILE == '']@
404 @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
408 # -------------------------------------------------------------------------
409 # Do not modify the rest of this file!
412 ### Conditionally set variables: ###
414 -@[ for c in cond_vars :@
415 +@[for c in cond_vars]@
417 -@[ for v in c.values :@
418 +@[for v in c.values]@
419 @makeCondBegin(v.cond)
420 @utils.wrapLongLine('%s = ' % c.name, v.value, ' &', variable=c.name)
429 -@[ for v in make_vars :@
430 +@[for v in make_vars]@
431 @utils.wrapLongLine('%s = ' % v.name, v.value, ' &', variable=v.name)
435 -@[ if BUILDDIR != '.' :
436 +@[if BUILDDIR != '.']
439 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
444 -@[ for t in targets :
445 -@[ if t.cond != None :@makeCondBegin(t.cond)
447 -@t.__targetdir@t.__targetname : @[if t.__is_phony=='1':.SYMBOLIC] @t.__deps
448 -@[ for cmd in t.__command.splitlines():@
450 +@[if t.cond != None]makeCondBegin(t.cond)
452 +@t.__targetdir@t.__targetname : @[if t.__is_phony=='1'].SYMBOLIC@[end if] @t.__deps
453 +@[for cmd in t.__command.splitlines()]@
454 @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
456 -@[ if t.cond != None :@makeCondEnd(t.cond)
460 +@[if t.cond != None]makeCondEnd(t.cond)